Поправить багу с копированием удаленных вводных (#3125)

* Поправить багу с копированием удаленных вводных

* Почитистить CharacterService

Author: leotsarev

src/JoinRpg.Portal/Controllers/XGameApi/CharacterApiController.cs

@@ -2,6 +2,7 @@
 using JoinRpg.DataModel;
 using JoinRpg.Domain;
 using JoinRpg.Portal.Infrastructure.Authorization;
+using JoinRpg.PrimitiveTypes;
 using JoinRpg.PrimitiveTypes.ProjectMetadata;
 using JoinRpg.Services.Interfaces.Characters;
 using JoinRpg.Web.Models.Characters;
@@ -90,7 +91,7 @@ public async Task<CharacterInfo> GetOne(int projectId, int characterId)
     [Route("{characterId}/fields")]
     public async Task<string> SetCharacterFields(int projectId, int characterId, Dictionary<int, string?> fieldValues)
     {
-        await characterService.SetFields(projectId, characterId, fieldValues);
+        await characterService.SetFields(new CharacterIdentification(projectId, characterId), fieldValues);
         return "ok";
     }
 

src/JoinRpg.Services.Impl/CharacterServiceImpl.cs

@@ -7,6 +7,7 @@
 using JoinRpg.Helpers;
 using JoinRpg.Interfaces;
 using JoinRpg.PrimitiveTypes;
+using JoinRpg.PrimitiveTypes.Access;
 using JoinRpg.PrimitiveTypes.ProjectMetadata;
 using JoinRpg.Services.Interfaces.Characters;
 using JoinRpg.Services.Interfaces.Notification;
@@ -86,7 +87,7 @@ public async Task EditCharacter(EditCharacterRequest editCharacterRequest)
     {
         var character = await LoadCharacter(editCharacterRequest.Id);
 
-        var projectInfo = await projectMetadataRepository.GetProjectMetadata(new(editCharacterRequest.Id.ProjectId));
+        var projectInfo = await projectMetadataRepository.GetProjectMetadata(editCharacterRequest.Id.ProjectId);
 
         SetCharacterSettings(character, editCharacterRequest.CharacterTypeInfo, projectInfo);
 
@@ -145,7 +146,7 @@ private async Task<Character> LoadCharacter(CharacterIdentification moniker)
     {
         var character = await CharactersRepository.GetCharacterAsync(moniker.ProjectId, moniker.CharacterId);
 
-        return character.RequestMasterAccess(CurrentUserId, acl => acl.CanEditRoles).EnsureProjectActive();
+        return character.RequestMasterAccess(CurrentUserId, Permission.CanEditRoles).EnsureProjectActive();
     }
 
     public async Task MoveCharacter(int currentUserId,
@@ -166,13 +167,10 @@ public async Task MoveCharacter(int currentUserId,
         await UnitOfWork.SaveChangesAsync();
     }
 
-    public async Task SetFields(int projectId, int characterId, Dictionary<int, string?> requestFieldValues)
+    public async Task SetFields(CharacterIdentification characterId, Dictionary<int, string?> requestFieldValues)
     {
-        var character = await LoadProjectSubEntityAsync<Character>(projectId, characterId);
-        var projectInfo = await projectMetadataRepository.GetProjectMetadata(new(projectId));
-        _ = character.RequestMasterAccess(CurrentUserId, acl => acl.CanEditRoles);
-
-        _ = character.EnsureProjectActive();
+        var character = await LoadCharacter(characterId);
+        var projectInfo = await projectMetadataRepository.GetProjectMetadata(characterId.ProjectId);
 
         var changedFields = fieldSaveHelper.SaveCharacterFields(CurrentUserId,
             character,
@@ -183,7 +181,7 @@ public async Task SetFields(int projectId, int characterId, Dictionary<int, stri
 
         FieldsChangedEmail? email = null;
 
-        if (changedFields.Any())
+        if (changedFields.Count != 0)
         {
             var user = await UserRepository.GetById(CurrentUserId);
             email = EmailHelpers.CreateFieldsEmail(

src/JoinRpg.Services.Impl/Projects/CloneProjectHelper.cs

@@ -305,10 +305,10 @@ private async Task CopyPlot()
             {
                 var plotFolderId = await plotService.CreatePlotFolder(projectId, originalFolder.MasterTitle, originalFolder.TodoField);
 
-                foreach (var originalElement in originalFolder.Elements)
+                foreach (var originalElement in originalFolder.Elements.Where(e => e.IsActive))
                 {
                     PlotElementTexts lastVersion = originalElement.LastVersion();
-                    await plotService.CreatePlotElement(
+                    _ = await plotService.CreatePlotElement(
                         plotFolderId,
                         lastVersion.Content.Contents ?? "",
                         lastVersion.TodoField,

src/JoinRpg.Services.Interfaces/Characters/ICharacterService.cs

@@ -16,5 +16,5 @@ Task MoveCharacter(int currentUserId,
         int parentCharacterGroupId,
         short direction);
 
-    Task SetFields(int projectId, int characterId, Dictionary<int, string?> requestFieldValues);
+    Task SetFields(CharacterIdentification characterId, Dictionary<int, string?> requestFieldValues);
 }