Исправить ошибки при копировании проекта (#3119)

leotsarev · web-flow · commit 93edcbbb72bb · 2025-03-16T10:28:15.000Z
* Вынести проверку обязательности в финальные стратегии

* Странный повтор в SetCharacterDescription

* Добавить конструкторов в CharacterIdentification

* Ограничить копируемые поля

* Отображать серверную ошибку
diff --git a/src/JoinRpg.Domain/CharacterFields/CharacterExistsStrategyBase.cs b/src/JoinRpg.Domain/CharacterFields/CharacterExistsStrategyBase.cs
@@ -40,7 +40,7 @@ protected void SetCharacterDescription(Dictionary<int, FieldWithValue> fields)
             var name = GetFieldValue(nameField);
 
             Character.CharacterName = string.IsNullOrWhiteSpace(name) ?
-                Character.CharacterName = "CHAR" + Character.CharacterId
+                "CHAR" + Character.CharacterId
                 : name;
         }
 
diff --git a/src/JoinRpg.Domain/CharacterFields/FieldSaveStrategyBase.cs b/src/JoinRpg.Domain/CharacterFields/FieldSaveStrategyBase.cs
@@ -23,7 +23,7 @@ internal abstract class FieldSaveStrategyBase(Claim? claim,
 
     protected abstract void SerializeFields(Dictionary<int, FieldWithValue> fields);
 
-    public abstract IReadOnlyCollection<FieldWithValue> GetFields();
+    protected abstract IReadOnlyCollection<FieldWithValue> GetFields();
 
     private void EnsureEditAccess(FieldWithValue field)
     {
@@ -107,7 +107,7 @@ public void AssignValues(IReadOnlyDictionary<int, string?> newFieldValue, Dictio
 
             var normalizedValue = NormalizeValueBeforeAssign(field, keyValuePair.Value);
 
-            if (normalizedValue is null && field.Field.MandatoryStatus == MandatoryStatus.Required && field.Field.IsAvailableForTarget(Character))
+            if (normalizedValue is null && FieldIsMandatory(field))
             {
                 ThrowRequiredField(field);
                 return;
@@ -117,6 +117,8 @@ public void AssignValues(IReadOnlyDictionary<int, string?> newFieldValue, Dictio
         }
     }
 
+    protected abstract bool FieldIsMandatory(FieldWithValue field);
+
     [DoesNotReturn]
     protected abstract void ThrowRequiredField(FieldWithValue field);
 
diff --git a/src/JoinRpg.Domain/CharacterFields/SaveToCharacterAndClaimStrategy.cs b/src/JoinRpg.Domain/CharacterFields/SaveToCharacterAndClaimStrategy.cs
@@ -26,5 +26,7 @@ protected override void SerializeFields(Dictionary<int, FieldWithValue> fields)
     }
 
     protected override void SetCharacterNameFromPlayer() => Character.CharacterName = Claim.Player.GetDisplayName();
-    public override IReadOnlyCollection<FieldWithValue> GetFields() => Claim.GetFields(ProjectInfo);
+    protected override IReadOnlyCollection<FieldWithValue> GetFields() => Claim.GetFields(ProjectInfo);
+
+    protected override bool FieldIsMandatory(FieldWithValue field) => field.Field.MandatoryStatus == MandatoryStatus.Required && field.Field.IsAvailableForTarget(Character);
 }
diff --git a/src/JoinRpg.Domain/CharacterFields/SaveToCharacterOnlyStrategy.cs b/src/JoinRpg.Domain/CharacterFields/SaveToCharacterOnlyStrategy.cs
@@ -22,7 +22,7 @@ public override void Save(Dictionary<int, FieldWithValue> fields)
         UpdateSpecialGroups(fields);
     }
 
-    public override IReadOnlyCollection<FieldWithValue> GetFields() => Character.GetFields(ProjectInfo);
+    protected override IReadOnlyCollection<FieldWithValue> GetFields() => Character.GetFields(ProjectInfo);
 
     protected override void SetCharacterNameFromPlayer()
     {
@@ -38,4 +38,9 @@ protected override void SerializeFields(Dictionary<int, FieldWithValue> fields)
             .Where(v => v.Field.BoundTo == FieldBoundTo.Character)
             .SerializeFields();
     }
+
+    protected override bool FieldIsMandatory(FieldWithValue field) =>
+        field.Field.MandatoryStatus == MandatoryStatus.Required
+        && field.Field.BoundTo == FieldBoundTo.Character // Игнорируем пустые поля заявок в данном случае
+        && field.Field.IsAvailableForTarget(Character);
 }
diff --git a/src/JoinRpg.Domain/CharacterFields/SaveToClaimOnlyStrategy.cs b/src/JoinRpg.Domain/CharacterFields/SaveToClaimOnlyStrategy.cs
@@ -1,6 +1,7 @@
 using System.Diagnostics.CodeAnalysis;
 using JoinRpg.DataModel;
 using JoinRpg.Domain.Access;
+using JoinRpg.PrimitiveTypes.ProjectMetadata;
 
 namespace JoinRpg.Domain.CharacterFields;
 
@@ -11,7 +12,7 @@ internal class SaveToClaimOnlyStrategy : FieldSaveStrategyBase
     public SaveToClaimOnlyStrategy(Claim claim,
         int currentUserId,
         IFieldDefaultValueGenerator generator,
-        PrimitiveTypes.ProjectMetadata.ProjectInfo projectInfo) : base(claim,
+        ProjectInfo projectInfo) : base(claim,
         character: null,
         currentUserId,
         generator,
@@ -31,8 +32,10 @@ protected override void SetCharacterNameFromPlayer()
         //Do nothing player could not change character yet
     }
 
-    public override IReadOnlyCollection<FieldWithValue> GetFields() => Claim.GetFields(ProjectInfo);
+    protected override IReadOnlyCollection<FieldWithValue> GetFields() => Claim.GetFields(ProjectInfo);
 
     [DoesNotReturn]
     protected override void ThrowRequiredField(FieldWithValue field) => throw new CharacterFieldRequiredException(field.Field.Name, field.Field.Id, new(ProjectInfo.ProjectId, Claim.CharacterId));
+
+    protected override bool FieldIsMandatory(FieldWithValue field) => field.Field.MandatoryStatus == MandatoryStatus.Required && field.Field.IsAvailableForTarget(Character);
 }
diff --git a/src/JoinRpg.Portal/Controllers/WebApi/ProjectCreateController.cs b/src/JoinRpg.Portal/Controllers/WebApi/ProjectCreateController.cs
@@ -29,7 +29,7 @@ public async Task<IActionResult> Create([FromBody] ProjectCreateViewModel model,
             return result switch
             {
                 FaildToCreateProjectResult failed => Problem(title: "Произошла ошибка при обработке запроса", detail: failed.Message, statusCode: 500),
-                PartiallySuccessCreateProjectResult partially => Ok(new ProjectCreateResultViewModel(partially.ProjectId, partially.Message)),
+                PartiallySuccessCreateProjectResult partially => Ok(new ProjectCreateResultViewModel(partially.ProjectId, $"Ошибка: {partially.Message}\n RequestId: {HttpContext.TraceIdentifier}")),
                 SuccessCreateProjectResult successCreateProjectResult => Ok(new ProjectCreateResultViewModel(successCreateProjectResult.ProjectId, Error: null)),
                 _ => Ok(result)
             };
diff --git a/src/JoinRpg.PrimitiveTypes.Test/IdentificationCommonTest.cs b/src/JoinRpg.PrimitiveTypes.Test/IdentificationCommonTest.cs
@@ -72,7 +72,11 @@ public void IfAcceptsProjectIdShouldImplementIProjectEntityId(Type type)
         {
             return;
         }
-        var acceptsProjectEntityId = type.GetConstructors().Any(c => c.GetParameters().Any(p => p.ParameterType == typeof(ProjectIdentification) || p.ParameterType.IsAssignableTo(typeof(IProjectEntityId))));
+        var acceptsProjectEntityId = type.GetConstructors().Any(c => c.GetParameters().Any(
+            p => p.ParameterType == typeof(ProjectIdentification)
+            || p.ParameterType.IsAssignableTo(typeof(IProjectEntityId))
+            || p.Name?.Equals("ProjectId", StringComparison.InvariantCultureIgnoreCase) == true
+            ));
 
         if (acceptsProjectEntityId)
         {
diff --git a/src/JoinRpg.PrimitiveTypes/CharacterIdentification.cs b/src/JoinRpg.PrimitiveTypes/CharacterIdentification.cs
@@ -1,8 +1,17 @@
+using System.Text.Json.Serialization;
+
 namespace JoinRpg.PrimitiveTypes;
+[method: JsonConstructor]
 public record CharacterIdentification(
-    int ProjectId,
-    int CharacterId)
+    ProjectIdentification ProjectId,
+    int CharacterId) : IProjectEntityId
 {
+    public int Id => CharacterId;
+
+    public CharacterIdentification(int projectId, int characterId) : this(new(projectId), characterId)
+    {
+
+    }
 
     public static CharacterIdentification? FromOptional(int ProjectId, int? CharacterId)
     {
@@ -17,4 +26,6 @@ public record CharacterIdentification(
     }
 
     public static IEnumerable<CharacterIdentification> FromList(IEnumerable<int> list, ProjectIdentification projectId) => list.Select(g => new CharacterIdentification(projectId, g));
+
+    public override string ToString() => $"CharacterId({CharacterId}, {ProjectId})";
 }
diff --git a/src/JoinRpg.Services.Impl/Projects/CloneProjectHelper.cs b/src/JoinRpg.Services.Impl/Projects/CloneProjectHelper.cs
@@ -262,7 +262,10 @@ private async Task CopyCharacter(Character originalChar)
         {
             var fieldValues = originalChar.GetFields(original);
             var setFieldsRequest = new Dictionary<int, string?>();
-            foreach (var originalFieldValue in fieldValues)
+            foreach (var originalFieldValue in fieldValues
+                .Where(fv => fv.Field.BoundTo == FieldBoundTo.Character) // Только поля персонажей
+                .Where(fv => fv.HasEditableValue) // Только те поля, у которых есть какое-то значение
+                )
             {
                 var newFieldId = FieldMapping.GetValueOrDefault(originalFieldValue.Field.Id);
                 if (newFieldId is null)
diff --git a/src/JoinRpg.Services.Impl/Projects/CreateProjectService.Main.cs b/src/JoinRpg.Services.Impl/Projects/CreateProjectService.Main.cs
@@ -47,7 +47,7 @@ async Task<CreateProjectResultBase> ICreateProjectService.CreateProject(CreatePr
                 }
                 else
                 {
-                    return new PartiallySuccessCreateProjectResult(projectId, "Удалось скопировать не все");
+                    return new PartiallySuccessCreateProjectResult(projectId, "Удалось скопировать не все элементы проекта");
                 }
             }
             catch (Exception ex)
diff --git a/src/JoinRpg.Web.ProjectCommon/Projects/CreateProjectPanel.razor b/src/JoinRpg.Web.ProjectCommon/Projects/CreateProjectPanel.razor
@@ -1,4 +1,4 @@
-﻿@inject ILogger<CreateProjectPanel> logger
+@inject ILogger<CreateProjectPanel> logger
 @inject NavigationManager NavigationManager
 @inject IServiceProvider Services
 @implements IDisposable
@@ -22,6 +22,8 @@
     <JoinAlert Variation="VariationStyleEnum.Danger">
         Проект был создан, вы можете перейти на <a href="/@(created.Value)/home">страницу проекта</a>.
         При настройке проекта согласно вашим запросам произошла ошибка. Обратитесь в техподдержку и/или проверьте настройки проекта вручную.
+        <br> 
+        @createErrorResult
     </JoinAlert>
     return;
 }
@@ -67,6 +69,7 @@
     private bool creating = false;
     private ValidationMessageStore? messageStore;
     private ProjectIdentification? created;
+    private string? createErrorResult;
 
     [Parameter]
     [EditorRequired]
@@ -122,7 +125,7 @@
                 {
                     created = result.ProjectId;
                 }
-                messageStore?.Add(() => Model, result.Error ?? "Неизвестная серверная ошибка при создании проекта");
+                createErrorResult = result.Error ?? "Неизвестная серверная ошибка при создании проекта";
                 creating = false;
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ protected void SetCharacterDescription(Dictionary<int, FieldWithValue> fields)`
`40`	`40`	`var name = GetFieldValue(nameField);`
`41`	`41`
`42`	`42`	`Character.CharacterName = string.IsNullOrWhiteSpace(name) ?`
`43`		`- Character.CharacterName = "CHAR" + Character.CharacterId`
	`43`	`+ "CHAR" + Character.CharacterId`
`44`	`44`	`: name;`
`45`	`45`	`}`
`46`	`46`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ internal abstract class FieldSaveStrategyBase(Claim? claim,`
`23`	`23`
`24`	`24`	`protected abstract void SerializeFields(Dictionary<int, FieldWithValue> fields);`
`25`	`25`
`26`		`- public abstract IReadOnlyCollection<FieldWithValue> GetFields();`
	`26`	`+ protected abstract IReadOnlyCollection<FieldWithValue> GetFields();`
`27`	`27`
`28`	`28`	`private void EnsureEditAccess(FieldWithValue field)`
`29`	`29`	`{`
`@@ -107,7 +107,7 @@ public void AssignValues(IReadOnlyDictionary<int, string?> newFieldValue, Dictio`
`107`	`107`
`108`	`108`	`var normalizedValue = NormalizeValueBeforeAssign(field, keyValuePair.Value);`
`109`	`109`
`110`		`- if (normalizedValue is null && field.Field.MandatoryStatus == MandatoryStatus.Required && field.Field.IsAvailableForTarget(Character))`
	`110`	`+ if (normalizedValue is null && FieldIsMandatory(field))`
`111`	`111`	`{`
`112`	`112`	`ThrowRequiredField(field);`
`113`	`113`	`return;`
`@@ -117,6 +117,8 @@ public void AssignValues(IReadOnlyDictionary<int, string?> newFieldValue, Dictio`
`117`	`117`	`}`
`118`	`118`	`}`
`119`	`119`
	`120`	`+ protected abstract bool FieldIsMandatory(FieldWithValue field);`
	`121`	`+`
`120`	`122`	`[DoesNotReturn]`
`121`	`123`	`protected abstract void ThrowRequiredField(FieldWithValue field);`
`122`	`124`
Original file line number	Diff line number	Diff line change
`@@ -26,5 +26,7 @@ protected override void SerializeFields(Dictionary<int, FieldWithValue> fields)`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`protected override void SetCharacterNameFromPlayer() => Character.CharacterName = Claim.Player.GetDisplayName();`
`29`		`- public override IReadOnlyCollection<FieldWithValue> GetFields() => Claim.GetFields(ProjectInfo);`
	`29`	`+ protected override IReadOnlyCollection<FieldWithValue> GetFields() => Claim.GetFields(ProjectInfo);`
	`30`	`+`
	`31`	`+ protected override bool FieldIsMandatory(FieldWithValue field) => field.Field.MandatoryStatus == MandatoryStatus.Required && field.Field.IsAvailableForTarget(Character);`
`30`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public override void Save(Dictionary<int, FieldWithValue> fields)`
`22`	`22`	`UpdateSpecialGroups(fields);`
`23`	`23`	`}`
`24`	`24`
`25`		`- public override IReadOnlyCollection<FieldWithValue> GetFields() => Character.GetFields(ProjectInfo);`
	`25`	`+ protected override IReadOnlyCollection<FieldWithValue> GetFields() => Character.GetFields(ProjectInfo);`
`26`	`26`
`27`	`27`	`protected override void SetCharacterNameFromPlayer()`
`28`	`28`	`{`
`@@ -38,4 +38,9 @@ protected override void SerializeFields(Dictionary<int, FieldWithValue> fields)`
`38`	`38`	`.Where(v => v.Field.BoundTo == FieldBoundTo.Character)`
`39`	`39`	`.SerializeFields();`
`40`	`40`	`}`
	`41`	`+`
	`42`	`+ protected override bool FieldIsMandatory(FieldWithValue field) =>`
	`43`	`+ field.Field.MandatoryStatus == MandatoryStatus.Required`
	`44`	`+ && field.Field.BoundTo == FieldBoundTo.Character // Игнорируем пустые поля заявок в данном случае`
	`45`	`+ && field.Field.IsAvailableForTarget(Character);`
`41`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public async Task<IActionResult> Create([FromBody] ProjectCreateViewModel model,`
`29`	`29`	`return result switch`
`30`	`30`	`{`
`31`	`31`	`FaildToCreateProjectResult failed => Problem(title: "Произошла ошибка при обработке запроса", detail: failed.Message, statusCode: 500),`
`32`		`- PartiallySuccessCreateProjectResult partially => Ok(new ProjectCreateResultViewModel(partially.ProjectId, partially.Message)),`
	`32`	`+ PartiallySuccessCreateProjectResult partially => Ok(new ProjectCreateResultViewModel(partially.ProjectId, $"Ошибка: {partially.Message}\n RequestId: {HttpContext.TraceIdentifier}")),`
`33`	`33`	`SuccessCreateProjectResult successCreateProjectResult => Ok(new ProjectCreateResultViewModel(successCreateProjectResult.ProjectId, Error: null)),`
`34`	`34`	`_ => Ok(result)`
`35`	`35`	`};`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,11 @@ public void IfAcceptsProjectIdShouldImplementIProjectEntityId(Type type)`
`72`	`72`	`{`
`73`	`73`	`return;`
`74`	`74`	`}`
`75`		`- var acceptsProjectEntityId = type.GetConstructors().Any(c => c.GetParameters().Any(p => p.ParameterType == typeof(ProjectIdentification) \|\| p.ParameterType.IsAssignableTo(typeof(IProjectEntityId))));`
	`75`	`+ var acceptsProjectEntityId = type.GetConstructors().Any(c => c.GetParameters().Any(`
	`76`	`+ p => p.ParameterType == typeof(ProjectIdentification)`
	`77`	`+ \|\| p.ParameterType.IsAssignableTo(typeof(IProjectEntityId))`
	`78`	`+ \|\| p.Name?.Equals("ProjectId", StringComparison.InvariantCultureIgnoreCase) == true`
	`79`	`+ ));`
`76`	`80`
`77`	`81`	`if (acceptsProjectEntityId)`
`78`	`82`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,17 @@`
	`1`	`+using System.Text.Json.Serialization;`
	`2`	`+`
`1`	`3`	`namespace JoinRpg.PrimitiveTypes;`
	`4`	`+[method: JsonConstructor]`
`2`	`5`	`public record CharacterIdentification(`
`3`		`- int ProjectId,`
`4`		`- int CharacterId)`
	`6`	`+ ProjectIdentification ProjectId,`
	`7`	`+ int CharacterId) : IProjectEntityId`
`5`	`8`	`{`
	`9`	`+ public int Id => CharacterId;`
	`10`	`+`
	`11`	`+ public CharacterIdentification(int projectId, int characterId) : this(new(projectId), characterId)`
	`12`	`+ {`
	`13`	`+`
	`14`	`+ }`
`6`	`15`
`7`	`16`	`public static CharacterIdentification? FromOptional(int ProjectId, int? CharacterId)`
`8`	`17`	`{`
`@@ -17,4 +26,6 @@ public record CharacterIdentification(`
`17`	`26`	`}`
`18`	`27`
`19`	`28`	`public static IEnumerable<CharacterIdentification> FromList(IEnumerable<int> list, ProjectIdentification projectId) => list.Select(g => new CharacterIdentification(projectId, g));`
	`29`	`+`
	`30`	`+ public override string ToString() => $"CharacterId({CharacterId}, {ProjectId})";`
`20`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -262,7 +262,10 @@ private async Task CopyCharacter(Character originalChar)`
`262`	`262`	`{`
`263`	`263`	`var fieldValues = originalChar.GetFields(original);`
`264`	`264`	`var setFieldsRequest = new Dictionary<int, string?>();`
`265`		`- foreach (var originalFieldValue in fieldValues)`
	`265`	`+ foreach (var originalFieldValue in fieldValues`
	`266`	`+ .Where(fv => fv.Field.BoundTo == FieldBoundTo.Character) // Только поля персонажей`
	`267`	`+ .Where(fv => fv.HasEditableValue) // Только те поля, у которых есть какое-то значение`
	`268`	`+ )`
`266`	`269`	`{`
`267`	`270`	`var newFieldId = FieldMapping.GetValueOrDefault(originalFieldValue.Field.Id);`
`268`	`271`	`if (newFieldId is null)`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ async Task<CreateProjectResultBase> ICreateProjectService.CreateProject(CreatePr`
`47`	`47`	`}`
`48`	`48`	`else`
`49`	`49`	`{`
`50`		`- return new PartiallySuccessCreateProjectResult(projectId, "Удалось скопировать не все");`
	`50`	`+ return new PartiallySuccessCreateProjectResult(projectId, "Удалось скопировать не все элементы проекта");`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`	`catch (Exception ex)`