Fix bug with claim fields nullified during approve (#2409)

Author: leotsarev

src/JoinRpg.Domain.Test/FieldSaveHelperTest.cs

@@ -2,18 +2,26 @@
 using JoinRpg.DataModel.Mocks;
 using JoinRpg.Domain.CharacterFields;
 using JoinRpg.PrimitiveTypes.ProjectMetadata;
+using JoinRpg.TestHelpers;
 using Shouldly;
 using Xunit;
+using Xunit.Abstractions;
 
 namespace JoinRpg.Domain.Test;
 
 public class FieldSaveHelperTest
 {
     private MockedProject _original = null!; // Should be initialized per fact
+    private readonly ITestOutputHelper testOutputHelper;
 
-    private static FieldSaveHelper InitFieldSaveHelper()
+    public FieldSaveHelperTest(ITestOutputHelper testOutputHelper)
     {
-        return new FieldSaveHelper(new MockedFieldDefaultValueGenerator());
+        this.testOutputHelper = testOutputHelper;
+    }
+
+    private FieldSaveHelper InitFieldSaveHelper()
+    {
+        return new FieldSaveHelper(new MockedFieldDefaultValueGenerator(), new XUnitLogger<FieldSaveHelper>(testOutputHelper));
     }
 
     [Fact]

src/JoinRpg.Domain/CharacterFields/FieldSaveHelper.cs

@@ -1,5 +1,6 @@
 using JoinRpg.DataModel;
 using JoinRpg.PrimitiveTypes.ProjectMetadata;
+using Microsoft.Extensions.Logging;
 
 namespace JoinRpg.Domain.CharacterFields;
 
@@ -9,10 +10,12 @@ namespace JoinRpg.Domain.CharacterFields;
 public class FieldSaveHelper
 {
     private readonly IFieldDefaultValueGenerator generator;
+    private readonly ILogger<FieldSaveHelper> logger;
 
-    public FieldSaveHelper(IFieldDefaultValueGenerator generator)
+    public FieldSaveHelper(IFieldDefaultValueGenerator generator, ILogger<FieldSaveHelper> logger)
     {
         this.generator = generator;
+        this.logger = logger;
     }
 
     /// <summary>
@@ -66,6 +69,8 @@ private IReadOnlyCollection<FieldWithPreviousAndNewValue> SaveCharacterFieldsImp
     {
         var strategy = CreateStrategy(currentUserId, character, claim, projectInfo);
 
+        logger.LogDebug("Selected saving strategy as {strategyName}", strategy.GetType().Name);
+
         var fields = strategy.GetFields().ToDictionary(f => f.Field.ProjectFieldId);
 
         AssignValues(newFieldValue, fields, strategy);

src/JoinRpg.Domain/JoinRpg.Domain.csproj

@@ -12,6 +12,7 @@
   <ItemGroup>
     <PackageReference Include="Autofac" Version="7.1.0" />
     <PackageReference Include="JetBrains.Annotations" Version="2022.3.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 </Project>

src/JoinRpg.Services.Impl/ClaimServiceImpl.cs

@@ -347,13 +347,14 @@ public async Task ApproveByMaster(int projectId, int claimId, string commentText
         MarkCharacterChangedIfApproved(claim);
         Debug.Assert(claim.Character != null, "claim.Character != null");
         claim.Character.ApprovedClaimId = claim.ClaimId;
+        claim.Character.ApprovedClaim = claim; // Used in SaveCharacterFields
         claim.Character.IsHot = false;
 
         //We need to re-save fields here. Reasons:
         // 1. If we created character during approving, we need to set name for character
         // 2. M.b. we need to move some field values from Claim to Characters
         // 3. (2) Could activate changing of special groups
-        // ReSharper disable once MustUseReturnValue we don't need send email here
+        // we don't need send to show updated fields in email here, so ignore return result. 
         _ = fieldSaveHelper.SaveCharacterFields(CurrentUserId, claim, new Dictionary<int, string?>(), projectInfo);
 
         await UnitOfWork.SaveChangesAsync();

src/JoinRpg.TestHelpers/JoinRpg.TestHelpers.csproj

@@ -4,6 +4,7 @@
     <AssemblyTitle>JoinRpg.TestHelpers</AssemblyTitle>
   </PropertyGroup>
   <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
     <PackageReference Include="Shouldly" Version="4.2.1" />
     <PackageReference Include="xunit" Version="2.5.1" />

src/JoinRpg.TestHelpers/XUnitLogger.cs

@@ -0,0 +1,31 @@
+using Microsoft.Extensions.Logging;
+using Xunit.Abstractions;
+
+namespace JoinRpg.TestHelpers;
+public class XUnitLogger<T> : ILogger<T>, IDisposable
+{
+    private ITestOutputHelper _output;
+
+    public XUnitLogger(ITestOutputHelper output)
+    {
+        _output = output;
+    }
+    public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception? exception, Func<TState, Exception, string> formatter)
+    {
+        _output.WriteLine(state?.ToString());
+    }
+
+    public bool IsEnabled(LogLevel logLevel)
+    {
+        return true;
+    }
+
+    public IDisposable? BeginScope<TState>(TState state) where TState : notnull
+    {
+        return this;
+    }
+
+    public void Dispose()
+    {
+    }
+}