Add last comment fields for claims

Author: leotsarev

src/JoinRpg.Dal.Impl/Migrations/202106200922043_LastCommentDates.Designer.cs

@@ -0,0 +1,34 @@
+namespace JoinRpg.Dal.Impl.Migrations
+{
+    using System;
+    using System.Data.Entity.Migrations;
+    
+    public partial class LastCommentDates : DbMigration
+    {
+        public override void Up()
+        {
+            AddColumn("dbo.Claims", "LastMasterCommentAt", c => c.DateTimeOffset(precision: 7));
+            AddColumn("dbo.Claims", "LastMasterCommentBy_Id", c => c.Int());
+            AddColumn("dbo.Claims", "LastVisibleMasterCommentAt", c => c.DateTimeOffset(precision: 7));
+            AddColumn("dbo.Claims", "LastVisibleMasterCommentBy_Id", c => c.Int());
+            AddColumn("dbo.Claims", "LastPlayerCommentAt", c => c.DateTimeOffset(precision: 7));
+            CreateIndex("dbo.Claims", "LastMasterCommentBy_Id");
+            CreateIndex("dbo.Claims", "LastVisibleMasterCommentBy_Id");
+            AddForeignKey("dbo.Claims", "LastMasterCommentBy_Id", "dbo.Users", "UserId");
+            AddForeignKey("dbo.Claims", "LastVisibleMasterCommentBy_Id", "dbo.Users", "UserId");
+        }
+        
+        public override void Down()
+        {
+            DropForeignKey("dbo.Claims", "LastVisibleMasterCommentBy_Id", "dbo.Users");
+            DropForeignKey("dbo.Claims", "LastMasterCommentBy_Id", "dbo.Users");
+            DropIndex("dbo.Claims", new[] { "LastVisibleMasterCommentBy_Id" });
+            DropIndex("dbo.Claims", new[] { "LastMasterCommentBy_Id" });
+            DropColumn("dbo.Claims", "LastPlayerCommentAt");
+            DropColumn("dbo.Claims", "LastVisibleMasterCommentBy_Id");
+            DropColumn("dbo.Claims", "LastVisibleMasterCommentAt");
+            DropColumn("dbo.Claims", "LastMasterCommentBy_Id");
+            DropColumn("dbo.Claims", "LastMasterCommentAt");
+        }
+    }
+}

src/JoinRpg.Dal.Impl/Migrations/202106200922043_LastCommentDates.cs

@@ -133,7 +133,16 @@ public IEnumerable<FinanceOperation> ApprovedFinanceOperations
 
         #endregion
 
-
+        public DateTimeOffset? LastMasterCommentAt { get; set; }
+        [ForeignKey(nameof(LastMasterCommentBy_Id))]
+        public User? LastMasterCommentBy { get; set; }
+        public int? LastMasterCommentBy_Id { get; set; }
+
+        public DateTimeOffset? LastVisibleMasterCommentAt { get; set; }
+        [ForeignKey(nameof(LastVisibleMasterCommentBy_Id))]
+        public User? LastVisibleMasterCommentBy { get; set; }
+        public int? LastVisibleMasterCommentBy_Id { get; set; }
+        public DateTimeOffset? LastPlayerCommentAt { get; set; }
 
         #region ILinkable impl
 

src/JoinRpg.Dal.Impl/Migrations/202106200922043_LastCommentDates.resx

@@ -33,18 +33,13 @@ protected Comment AddCommentImpl(Claim claim,
             bool isVisibleToPlayer,
             CommentExtraAction? extraAction = null)
         {
-
-
-            var comment = CommentHelper.CreateCommentForDiscussion(claim.CommentDiscussion,
+            var comment = CommentHelper.CreateCommentForClaim(claim,
                 CurrentUserId,
                 Now,
                 commentText,
                 isVisibleToPlayer,
                 parentComment,
                 extraAction);
-
-            claim.LastUpdateDateTime = Now;
-
             return comment;
         }
 

src/JoinRpg.DataModel/Claim.cs

@@ -7,6 +7,42 @@ namespace JoinRpg.Services.Impl
 {
     internal static class CommentHelper
     {
+        public static Comment CreateCommentForClaim(
+            Claim claim,
+            int currentUserId,
+            DateTime createdAt,
+            string commentText,
+            bool isVisibleToPlayer,
+            Comment? parentComment,
+            CommentExtraAction? extraAction = null)
+        {
+            var comment = CreateCommentForDiscussion(claim.CommentDiscussion,
+              currentUserId,
+              createdAt,
+              commentText,
+              isVisibleToPlayer,
+              parentComment,
+              extraAction);
+
+            claim.LastUpdateDateTime = createdAt;
+            if (claim.Player.UserId == currentUserId)
+            {
+                claim.LastPlayerCommentAt = createdAt;
+            }
+            else
+            {
+                claim.LastMasterCommentAt = createdAt;
+                claim.LastMasterCommentBy_Id = currentUserId;
+
+                if (isVisibleToPlayer)
+                {
+                    claim.LastVisibleMasterCommentAt = createdAt;
+                    claim.LastVisibleMasterCommentBy_Id = currentUserId;
+                }
+            }
+
+            return comment;
+        }
         public static Comment CreateCommentForDiscussion([NotNull]
             CommentDiscussion commentDiscussion,
             int currentUserId,

src/JoinRpg.Services.Impl/ClaimImplBase.cs

@@ -334,8 +334,8 @@ private async Task<Tuple<Comment, Comment>> AddTransferCommentsAsync(
             ClaimPaymentTransferRequest request)
         {
             // Comment to source claim
-            Comment commentFrom = CommentHelper.CreateCommentForDiscussion(
-                claimFrom.CommentDiscussion,
+            Comment commentFrom = CommentHelper.CreateCommentForClaim(
+                claimFrom,
                 CurrentUserId,
                 Now,
                 request.CommentText,
@@ -356,8 +356,8 @@ private async Task<Tuple<Comment, Comment>> AddTransferCommentsAsync(
             _ = UnitOfWork.GetDbSet<Comment>().Add(commentFrom);
 
             // Comment to destination claim
-            Comment commentTo = CommentHelper.CreateCommentForDiscussion(
-                claimTo.CommentDiscussion,
+            Comment commentTo = CommentHelper.CreateCommentForClaim(
+                claimTo,
                 CurrentUserId,
                 Now,
                 request.CommentText,

src/JoinRpg.Services.Impl/CommentHelper.cs

@@ -133,7 +133,7 @@ public async Task<ClaimPaymentContext> InitiateClaimPaymentAsync(ClaimPaymentReq
             PaymentRequestDescriptor result = await GetApi(request.ProjectId, request.ClaimId)
                 .BuildPaymentRequestAsync(
                     message,
-                    async () => (await AddPaymentCommentAsync(claim.CommentDiscussion, onlinePaymentType, request))
+                    async () => (await AddPaymentCommentAsync(claim, onlinePaymentType, request))
                         .CommentId
                         .ToString()
                         .PadLeft(10, '0')
@@ -147,12 +147,12 @@ public async Task<ClaimPaymentContext> InitiateClaimPaymentAsync(ClaimPaymentReq
         }
 
         private async Task<Comment> AddPaymentCommentAsync(
-            CommentDiscussion discussion,
+            Claim claim,
             PaymentType paymentType,
             ClaimPaymentRequest request)
         {
-            Comment comment = CommentHelper.CreateCommentForDiscussion(
-                discussion,
+            Comment comment = CommentHelper.CreateCommentForClaim(
+                claim,
                 CurrentUserId,
                 Now,
                 request.CommentText ?? "",