Rewrite field with value on base of ProjectFieldInfo (#2336)

Author: leotsarev

src/JoinRpg.DataModel.Mocks/MockedProject.cs

@@ -11,14 +11,20 @@ public class MockedProject
     public User Player { get; } = new User() { UserId = 1, PrefferedName = "Player", Email = "[email protected]", Claims = new HashSet<Claim>() };
     public User Master { get; } = new User() { UserId = 2, PrefferedName = "Master", Email = "[email protected]", Claims = new HashSet<Claim>() };
     public ProjectField MasterOnlyField { get; }
+
+    public ProjectFieldInfo MasterOnlyFieldInfo { get; set; }
     public ProjectField CharacterField { get; }
     public ProjectField HideForUnApprovedClaim { get; }
+    public ProjectFieldInfo HideForUnApprovedClaimInfo { get; set; }
+
+    public ProjectFieldInfo CharacterFieldInfo { get; set; }
     public ProjectField PublicField { get; }
+    public ProjectFieldInfo PublicFieldInfo { get; set; }
 
     public Character Character { get; }
     public Character CharacterWithoutGroup { get; }
 
-    public ProjectInfo ProjectInfo { get; }
+    public ProjectInfo ProjectInfo { get; private set; }
 
     private static void FixProjectSubEntities(Project project1)
     {
@@ -129,8 +135,16 @@ public MockedProject()
 
         Character.ParentCharacterGroupIds = new[] { Group.CharacterGroupId };
 
-        ProjectInfo = ProjectRepository.CreateInfoFromProject(Project, new(Project.ProjectId));
+        ReInitProjectInfo();
+    }
 
+    public void ReInitProjectInfo()
+    {
+        ProjectInfo = ProjectRepository.CreateInfoFromProject(Project, new(Project.ProjectId));
+        PublicFieldInfo = ProjectInfo.GetFieldById(new(ProjectInfo.ProjectId, PublicField.ProjectFieldId));
+        HideForUnApprovedClaimInfo = ProjectInfo.GetFieldById(new(ProjectInfo.ProjectId, HideForUnApprovedClaim.ProjectFieldId));
+        CharacterFieldInfo = ProjectInfo.GetFieldById(new PrimitiveTypes.ProjectFieldIdentification(ProjectInfo.ProjectId, CharacterField.ProjectFieldId));
+        MasterOnlyFieldInfo = ProjectInfo.GetFieldById(new PrimitiveTypes.ProjectFieldIdentification(ProjectInfo.ProjectId, MasterOnlyField.ProjectFieldId));
     }
 
     public CharacterGroup CreateCharacterGroup(CharacterGroup? characterGroup = null)
@@ -147,24 +161,34 @@ public CharacterGroup CreateCharacterGroup(CharacterGroup? characterGroup = null
         return characterGroup;
     }
 
-    public ProjectField CreateConditionalField(ProjectField field, CharacterGroup conditionGroup)
+    public ProjectFieldInfo CreateConditionalField(Action<ProjectField> setup, CharacterGroup conditionGroup)
     {
-        field = CreateField(field);
-        field.AvailableForCharacterGroupIds = new[] { conditionGroup.CharacterGroupId };
-        return field;
+        return AddField(f => { f.AvailableForCharacterGroupIds = new[] { conditionGroup.CharacterGroupId }; setup(f); });
     }
 
-    public ProjectField CreateField(ProjectField? field = null)
+    public ProjectFieldInfo CreateConditionalField(CharacterGroup conditionGroup)
     {
-        field ??= new ProjectField();
+        return AddField(f => f.AvailableForCharacterGroupIds = new[] { conditionGroup.CharacterGroupId });
+    }
+
+    public ProjectFieldInfo AddField(Action<ProjectField> setup)
+    {
+        var field = new ProjectField();
         field.Project = Project;
         field.ProjectId = Project.ProjectId;
         field.ProjectFieldId = Project.ProjectFields.GetNextId();
         field.FieldName ??= "test_" + field.ProjectFieldId;
         field.AvailableForCharacterGroupIds = Array.Empty<int>();
         field.IsActive = true;
+        setup(field);
         Project.ProjectFields.Add(field);
-        return field;
+        ReInitProjectInfo();
+        return ProjectInfo.GetFieldById(new PrimitiveTypes.ProjectFieldIdentification(new PrimitiveTypes.ProjectIdentification(Project.ProjectId), field.ProjectFieldId));
+    }
+
+    public ProjectFieldInfo AddField()
+    {
+        return AddField(f => { });
     }
 
     public Claim CreateClaim(Character mockCharacter, User mockUser)
@@ -215,29 +239,30 @@ public Claim CreateCheckedInClaim(Character character, User player)
         return claim;
     }
 
-    public ProjectField CreateConditionalHeader()
+    public ProjectFieldInfo CreateConditionalHeader()
     {
-        return CreateConditionalField(new ProjectField()
+        return CreateConditionalField(f =>
         {
-            CanPlayerEdit = true,
-            CanPlayerView = true,
-            ShowOnUnApprovedClaims = true,
-            FieldBoundTo = FieldBoundTo.Character,
-            FieldType = ProjectFieldType.Header,
-            FieldName = "Conditional",
+            f.CanPlayerEdit = true;
+            f.CanPlayerView = true;
+            f.ShowOnUnApprovedClaims = true;
+            f.FieldBoundTo = FieldBoundTo.Character;
+            f.FieldType = ProjectFieldType.Header;
+            f.FieldName = "Conditional";
         },
             Group);
     }
 
-    public ProjectField CreateConditionalField()
+    public ProjectFieldInfo CreateConditionalField()
     {
-        return CreateConditionalField(new ProjectField()
+        return CreateConditionalField(f =>
         {
-            CanPlayerEdit = true,
-            CanPlayerView = true,
-            IsActive = true,
-            ShowOnUnApprovedClaims = true,
-            FieldBoundTo = FieldBoundTo.Character,
+
+            f.CanPlayerEdit = true;
+            f.CanPlayerView = true;
+            f.IsActive = true;
+            f.ShowOnUnApprovedClaims = true;
+            f.FieldBoundTo = FieldBoundTo.Character;
         },
             Group);
     }

src/JoinRpg.Domain.Test/CustomFieldsExtensionsTest.cs

@@ -9,34 +9,25 @@ namespace JoinRpg.Domain.Test;
 public class CustomFieldsExtensionsTest
 {
     private MockedProject projectMock = new();
-    private ProjectField[] allFieldsExceptMasterOnly;
-    private ProjectField[] allFields;
+    private ProjectFieldInfo[] allFieldsExceptMasterOnly;
+    private ProjectFieldInfo[] allFields;
 
     public CustomFieldsExtensionsTest()
     {
         var conditionalHeader = projectMock.CreateConditionalHeader();
         var conditionalField = projectMock.CreateConditionalField();
 
-        allFieldsExceptMasterOnly = new[]
-        {
-          projectMock.CharacterField,
-          projectMock.PublicField,
-          projectMock.HideForUnApprovedClaim,
-          conditionalField,
-          conditionalHeader,
-      };
-
-        allFields = allFieldsExceptMasterOnly
-            .Union(new[] { projectMock.MasterOnlyField })
-            .ToArray();
+        allFieldsExceptMasterOnly = projectMock.ProjectInfo.UnsortedFields.Except(new[] { projectMock.MasterOnlyFieldInfo }).ToArray();
+
+        allFields = projectMock.ProjectInfo.UnsortedFields.ToArray();
     }
 
     [Fact]
     public void CharacterFieldVisibilityByPlayerTest()
     {
         VerifyCharacter( //Assert that
           projectMock.Player, //a player user can see only public fields of a character
-          projectMock.PublicField);
+          projectMock.PublicFieldInfo);
     }
 
     [Fact]
@@ -65,7 +56,7 @@ public void NotApprovedClaimFieldVisibilitysTest()
           projectMock.CreateClaim(projectMock.Character, projectMock.Player), //when claim is not yet approved
           projectMock.Player, //then the user who created the claim can see only the fields below
           projectMock.ProjectInfo,
-          projectMock.PublicField);
+          projectMock.PublicFieldInfo);
     }
 
     [Fact]
@@ -92,7 +83,7 @@ public void ApprovedClaimFieldVisibilitysByAnotherPlayerTest()
           projectMock.CreateApprovedClaim(projectMock.Character, projectMock.Player), //when claim is approved
           anotherPlayer, //then other users see ony public info
           projectMock.ProjectInfo,
-          projectMock.PublicField);
+          projectMock.PublicFieldInfo);
     }
 
     [Fact]
@@ -105,24 +96,24 @@ public void NotApprovedClaimFieldVisibilitysByMasterTest()
           allFields);
     }
 
-    private void VerifyClaim(Claim claim, User viewerUser, ProjectInfo projectInfo, params ProjectField[] expectedFields)
+    private void VerifyClaim(Claim claim, User viewerUser, ProjectInfo projectInfo, params ProjectFieldInfo[] expectedFields)
     {
         var accessPredicate = claim.GetAccessArguments(viewerUser.UserId);
 
-        IList<FieldWithValue> userVisibleFields = claim.GetFields(projectInfo).Where(f => f.HasViewAccess(accessPredicate)).ToList();
+        IList<FieldWithValue> userVisibleFields = claim.GetFields(projectInfo).Where(f => f.Field.HasViewAccess(accessPredicate)).ToList();
 
         AssertCorrectFieldsArePresent(userVisibleFields, expectedFields);
     }
 
-    private void VerifyCharacter(User viewerUser, params ProjectField[] expectedFields)
+    private void VerifyCharacter(User viewerUser, params ProjectFieldInfo[] expectedFields)
     {
         var accessPredicate = projectMock.Character.GetAccessArguments(viewerUser.UserId);
 
         IList<FieldWithValue> userVisibleFields = projectMock.Character.GetFields(projectMock.ProjectInfo)
-            .Where(f => f.HasViewAccess(accessPredicate)).ToList();
+            .Where(f => f.Field.HasViewAccess(accessPredicate)).ToList();
 
         AssertCorrectFieldsArePresent(userVisibleFields, expectedFields);
     }
 
-    private void AssertCorrectFieldsArePresent(IList<FieldWithValue> actualFields, params ProjectField[] expectedFields) => actualFields.Select(actual => actual.Field).ShouldBe(expectedFields, ignoreOrder: true);
+    private void AssertCorrectFieldsArePresent(IList<FieldWithValue> actualFields, params ProjectFieldInfo[] expectedFields) => actualFields.Select(actual => actual.Field).ShouldBe(expectedFields, ignoreOrder: true);
 }