add GetSingleField (#2410)

Author: leotsarev

src/JoinRpg.Domain/CharacterFields/CustomFieldsExtensions.cs

@@ -1,6 +1,7 @@
 using JoinRpg.Data.Interfaces;
 using JoinRpg.DataModel;
 using JoinRpg.Helpers;
+using JoinRpg.PrimitiveTypes;
 using JoinRpg.PrimitiveTypes.ProjectMetadata;
 using Newtonsoft.Json;
 
@@ -72,6 +73,11 @@ public static IReadOnlyCollection<FieldWithValue> GetFields(this Claim claim, Pr
             claim.DeserializeFieldValues());
     }
 
+    public static FieldWithValue? GetSingleField(this Claim claim, ProjectInfo projectInfo, ProjectFieldIdentification id)
+    {
+        return claim.GetFields(projectInfo).SingleOrDefault(f => f.Field.ProjectFieldId == id.ProjectFieldId);
+    }
+
     public static IReadOnlyCollection<FieldWithValue> GetFieldsForClaimSource(this IClaimSource claimSource, ProjectInfo projectInfo)
     {
         if (claimSource is Character character)

src/JoinRpg.Portal/Controllers/ClaimListController.cs

@@ -353,11 +353,12 @@ public async Task<ActionResult> PaidDeclined(int projectid, string export)
     [HttpGet, MasterAuthorize()]
     public async Task<ActionResult> ByAssignedField(int projectfieldid, int projectid, string export)
     {
-        var field = await ProjectRepository.GetProjectField(projectid, projectfieldid);
         var claims = await ClaimsRepository.GetClaims(projectid, ClaimStatusSpec.Active);
         var projectInfo = await projectMetadataRepository.GetProjectMetadata(new(projectid));
+        var fieldId = new ProjectFieldIdentification(new(projectid), projectfieldid);
+        var field = projectInfo.GetFieldById(fieldId);
 
-        return await ShowMasterClaimList(projectid, export, "Поле (проставлено): " + field.FieldName, claims.Where(c => c.GetFields(projectInfo).Single(f => f.Field.ProjectFieldId == projectfieldid).HasEditableValue)
+        return await ShowMasterClaimList(projectid, export, "Поле (проставлено): " + field.Name, claims.Where(c => c.GetSingleField(projectInfo, fieldId)!.HasEditableValue)
                 .ToList(),
                 ClaimStatusSpec.Active
         );
@@ -366,10 +367,12 @@ public async Task<ActionResult> ByAssignedField(int projectfieldid, int projecti
     [HttpGet, MasterAuthorize()]
     public async Task<ActionResult> ByUnAssignedField(int projectfieldid, int projectid, string export)
     {
-        var field = await ProjectRepository.GetProjectField(projectid, projectfieldid);
         var claims = await ClaimsRepository.GetClaims(projectid, ClaimStatusSpec.Active);
         var projectInfo = await projectMetadataRepository.GetProjectMetadata(new(projectid));
-        return await ShowMasterClaimList(projectid, export, "Поле (непроставлено): " + field.FieldName, claims.Where(c => !c.GetFields(projectInfo).Single(f => f.Field.ProjectFieldId == projectfieldid).HasEditableValue)
+        var fieldId = new ProjectFieldIdentification(new(projectid), projectfieldid);
+        var field = projectInfo.GetFieldById(fieldId);
+
+        return await ShowMasterClaimList(projectid, export, "Поле (непроставлено): " + field.Name, claims.Where(c => !c.GetSingleField(projectInfo, fieldId)!.HasEditableValue)
                 .ToList(),
                 ClaimStatusSpec.Active
         );