Skip to content
Snippets Groups Projects
Commit fd9055cf authored by Benedikt Heinrichs's avatar Benedikt Heinrichs Committed by Petar Hristov
Browse files

Fix: Correct roles merging

parent 9d126363
No related branches found
No related tags found
1 merge request!139Fix: Correct roles merging
...@@ -4,6 +4,8 @@ using Coscine.ActiveDirectory; ...@@ -4,6 +4,8 @@ using Coscine.ActiveDirectory;
using Coscine.Configuration; using Coscine.Configuration;
using Coscine.Database.DataModel; using Coscine.Database.DataModel;
using Coscine.Database.Models; using Coscine.Database.Models;
using Coscine.Database.Util;
using LinqKit;
using System.Linq; using System.Linq;
namespace Coscine.Api.STS.Utils namespace Coscine.Api.STS.Utils
...@@ -77,7 +79,7 @@ namespace Coscine.Api.STS.Utils ...@@ -77,7 +79,7 @@ namespace Coscine.Api.STS.Utils
private void MergeProjectRole(User mergeIntoUser, User mergeFromUser) private void MergeProjectRole(User mergeIntoUser, User mergeFromUser)
{ {
foreach (var projectRole in _projectRoleModel.GetAllWhere((entry) => entry.UserId == mergeFromUser.Id && entry.Project.Deleted == false)) foreach (var projectRole in _projectRoleModel.GetAllWhere((entry) => entry.UserId == mergeFromUser.Id))
{ {
var project = _projectModel.GetById(projectRole.ProjectId); var project = _projectModel.GetById(projectRole.ProjectId);
var role = _roleModel.GetById(projectRole.RoleId); var role = _roleModel.GetById(projectRole.RoleId);
...@@ -144,7 +146,16 @@ namespace Coscine.Api.STS.Utils ...@@ -144,7 +146,16 @@ namespace Coscine.Api.STS.Utils
private void MergeResourceOwner(User mergeIntoUser, User mergeFromUser) private void MergeResourceOwner(User mergeIntoUser, User mergeFromUser)
{ {
foreach(var resource in _resourceModel.GetAllWhere((entry) => entry.Creator == mergeFromUser.Id)) // Get every resource, also get the deleted ones
foreach (
var resource in DatabaseConnection.ConnectToDatabase((db) =>
{
return
(from tableEntry in db.Resources.AsExpandable()
where tableEntry.Creator == mergeFromUser.Id
select tableEntry).ToList();
})
)
{ {
resource.Creator = mergeIntoUser.Id; resource.Creator = mergeIntoUser.Id;
_resourceModel.Update(resource); _resourceModel.Update(resource);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment