From ba23f9bb7b074d4a42d8b6da099ed530373ed892 Mon Sep 17 00:00:00 2001 From: Alexey Bannov Date: Fri, 29 Sep 2023 14:39:22 +0300 Subject: [PATCH] fixed migration --- .../Tools/ASC.MigrationPersonalToDocspace/MigrationCreator.cs | 4 +++- .../Tools/ASC.MigrationPersonalToDocspace/MigrationRunner.cs | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/common/Tools/ASC.MigrationPersonalToDocspace/MigrationCreator.cs b/common/Tools/ASC.MigrationPersonalToDocspace/MigrationCreator.cs index 73c2157480..67cf3c8fb5 100644 --- a/common/Tools/ASC.MigrationPersonalToDocspace/MigrationCreator.cs +++ b/common/Tools/ASC.MigrationPersonalToDocspace/MigrationCreator.cs @@ -23,6 +23,8 @@ // All the Product's GUI elements, including illustrations and icon sets, as well as technical writing // content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0 // International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + +using AuthConstants = ASC.Common.Security.Authorizing.AuthConstants; namespace ASC.Migration.PersonalToDocspace.Creator; @@ -192,7 +194,7 @@ public class MigrationCreator using var userDbContextToregion = _creatorDbContext.CreateDbContext(_toRegion); var usersCount = userDbContextToregion.Users .Join(userDbContextToregion.UserGroups, u => u.Id, ug => ug.Userid, (u, ug) => new { u, ug }) - .Where(q => q.u.TenantId == tenant.Id && q.ug.UserGroupId == Common.Security.Authorizing.Constants.DocSpaceAdmin.ID).Count(); + .Where(q => q.u.TenantId == tenant.Id && q.ug.UserGroupId == AuthConstants.DocSpaceAdmin.ID).Count(); if (usersCount > qouta.CountRoomAdmin) { throw new ArgumentException("user count exceed"); diff --git a/common/Tools/ASC.MigrationPersonalToDocspace/MigrationRunner.cs b/common/Tools/ASC.MigrationPersonalToDocspace/MigrationRunner.cs index 067d092a39..877c2eacf9 100644 --- a/common/Tools/ASC.MigrationPersonalToDocspace/MigrationRunner.cs +++ b/common/Tools/ASC.MigrationPersonalToDocspace/MigrationRunner.cs @@ -24,7 +24,7 @@ // content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0 // International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode -using ASC.Core; +using AuthConstants = ASC.Common.Security.Authorizing.AuthConstants; namespace ASC.Migration.PersonalToDocspace.Runner; @@ -192,7 +192,7 @@ public class MigrationRunner LastModified = DateTime.UtcNow, RefType = ASC.Core.UserGroupRefType.Contains, Removed = false, - UserGroupId = ASC.Common.Security.Authorizing.Constants.DocSpaceAdmin.ID, + UserGroupId = AuthConstants.DocSpaceAdmin.ID, Userid = tenant.OwnerId.Value };