Check status of claim before change (#1383)

leotsarev · web-flow · commit cd20c509af9e · 2021-05-05T13:51:05.000+03:00
diff --git a/src/JoinRpg.Services.Impl/ClaimServiceImpl.cs b/src/JoinRpg.Services.Impl/ClaimServiceImpl.cs
@@ -409,6 +409,8 @@ public async Task DeclineByMaster(int projectId, int claimId, Claim.DenialStatus
         {
             var claim = await LoadClaimForApprovalDecline(projectId, claimId, CurrentUserId);
 
+            var statusWasApproved = claim.ClaimStatus == Claim.Status.Approved;
+
             claim.EnsureCanChangeStatus(Claim.Status.DeclinedByMaster);
 
             claim.MasterDeclinedDate = Now;
@@ -417,7 +419,6 @@ public async Task DeclineByMaster(int projectId, int claimId, Claim.DenialStatus
 
             var roomEmail = await CommonClaimDecline(claim);
 
-            var statusWasApproved = claim.ClaimStatus == Claim.Status.Approved;
             if (deleteCharacter)
             {
                 if (claim.Character is null || !statusWasApproved)

Original file line number	Diff line number	Diff line change
`@@ -409,6 +409,8 @@ public async Task DeclineByMaster(int projectId, int claimId, Claim.DenialStatus`
`409`	`409`	`{`
`410`	`410`	`var claim = await LoadClaimForApprovalDecline(projectId, claimId, CurrentUserId);`
`411`	`411`
	`412`	`+ var statusWasApproved = claim.ClaimStatus == Claim.Status.Approved;`
	`413`	`+`
`412`	`414`	`claim.EnsureCanChangeStatus(Claim.Status.DeclinedByMaster);`
`413`	`415`
`414`	`416`	`claim.MasterDeclinedDate = Now;`
`@@ -417,7 +419,6 @@ public async Task DeclineByMaster(int projectId, int claimId, Claim.DenialStatus`
`417`	`419`
`418`	`420`	`var roomEmail = await CommonClaimDecline(claim);`
`419`	`421`
`420`		`- var statusWasApproved = claim.ClaimStatus == Claim.Status.Approved;`
`421`	`422`	`if (deleteCharacter)`
`422`	`423`	`{`
`423`	`424`	`if (claim.Character is null \|\| !statusWasApproved)`