Merge branch 'Issue/2325-fixApiTokenMerging' into 'master'

Fix: Correct roles merging

See merge request !139

src/STS/Utils/MergeUtil.cs

@@ -4,6 +4,8 @@ using Coscine.ActiveDirectory;
 using Coscine.Configuration;
 using Coscine.Database.DataModel;
 using Coscine.Database.Models;
+using Coscine.Database.Util;
+using LinqKit;
 using System.Linq;
 
 namespace Coscine.Api.STS.Utils
@@ -77,7 +79,7 @@ namespace Coscine.Api.STS.Utils
 
         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 role = _roleModel.GetById(projectRole.RoleId);
@@ -144,7 +146,16 @@ namespace Coscine.Api.STS.Utils
 
         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;
                 _resourceModel.Update(resource);