Final Retuouch, antoher update will be available soon

src/Application.BLL/Services/Implementation/LoanService.cs

@@ -213,17 +213,20 @@ public async Task<ApplicationResult> ReturnLoan(Guid loanId)
             using (var transaction = await _unitOfWork.BeginTransactionAsync())
             {
                 var loan = await _unitOfWork.LoanRepository.GetByIdAsync(loanId);
+
                 if (loan == null || loan.IsDeleted)
                     return new ApplicationResult() { Succeeded= false, Errors = new List<string>() { "Loan doesn't exist" } };
 
 
                 if (loan.IsReturned)
                     return new ApplicationResult() { Succeeded = false, Errors = new List<string>() { "Loan has already been returned" } };
 
+                List<string> errors = new List<string>();
+
                 if (loan.DueDate < DateTime.UtcNow)
                 {
                     // Calculate penalty
-                    var penaltyAmount = (decimal)((DateTime.UtcNow - loan.DueDate).TotalDays * 1.5);
+                    var penaltyAmount = new decimal(((DateTime.UtcNow.Day - loan.DueDate.Day) * 1.9));
                     var penalty = new Penalty
                     {
                         Loan = loan,
@@ -235,35 +238,29 @@ public async Task<ApplicationResult> ReturnLoan(Guid loanId)
 
                     // Add penalty
                     await _unitOfWork.PenaltyRepository.AddAsync(penalty);
-                    await _unitOfWork.CompleteAsync();
-
-                    // Throw to let middleware handle it if penalty is due
-                    return new ApplicationResult()
-                    {
-                        Succeeded = false,
-                        Errors = new List<string>() { $"Please pay the penalty of {penaltyAmount:C} before returning this loan." }
-                    };
+                    errors.Add($"Pay {penaltyAmount} as a penalty due to you late return");
                 }
 
-                // Mark loan as returned
+               // Mark loan as returned
                 loan.IsReturned = true;
 
                 // Increase available copies
                 if (loan.Book != null)
                 {
                     loan.Book.AvailableCopies += 1;
                     await _unitOfWork.BookRepository.UpdateAsync(loan.Book);
+
                 }
 
-                // Update loan and save changes
+                // Update e loan and save changes
                 await _unitOfWork.LoanRepository.UpdateAsync(loan);
                 await _unitOfWork.CompleteAsync();
-
                 // Commit transaction
                 await transaction.CommitAsync();
                 return new ApplicationResult()
                 {
-                    Succeeded = true
+                    Succeeded = true,
+                    Errors = errors
                 };
             }
         }

src/Application.BLL/Services/Implementation/PenaltyService.cs

@@ -152,23 +152,30 @@ public async Task<ApplicationResult> PayPenalty(Guid penaltyId, decimal amount)
             {
                 var penalty = await _unitOfWork.PenaltyRepository.GetByIdAsync(penaltyId);
                 if (penalty == null || penalty.IsPaid)
-                   return  new ApplicationResult() { 
-                            Succeeded = false, 
-                            Errors = new List<string>
+                {
+                    await transaction.CommitAsync();
+                    return new ApplicationResult()
+                    {
+                        Succeeded = false,
+                        Errors = new List<string>
                                     {
-                                        "No penalty to pay or penalty is already paid." 
-                                    } 
-                   };
-
+                                        "No penalty to pay or penalty is already paid."
+                                    }
+                    };
+                }
                 if (amount < penalty.Amount)
-                  return new ApplicationResult() {
-                      Succeeded = false,
-                      Errors = new List<string>
-                                { 
-                                    $"Payment is less than the penalty amount. Required: {penalty.Amount:C}" 
-                                } 
-                  };
-
+                {
+                    await transaction.CommitAsync();
+                    return new ApplicationResult()
+                    {
+                        Succeeded = false,
+                        Errors = new List<string>
+                                {
+                                    $"Payment is less than the penalty amount. Required: {penalty.Amount:C}"
+                                }
+                    };
+
+                }
                 // Mark penalty as paid
                 penalty.IsPaid = true;
                 await _unitOfWork.PenaltyRepository.UpdateAsync(penalty);

src/Application.DAL/Entities/Penalty.cs

@@ -3,6 +3,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -13,7 +14,7 @@ public class Penalty : ISoftDeleteable
     {
         public Guid PenaltyId { get; set; } = Guid.NewGuid();
 
-        [Precision(3,3), DataType(DataType.Currency)]
+        [Column(TypeName = "decimal(5,2)")]
         public decimal? Amount { get; set; }
         public bool IsPaid { set; get; } = false;
         public bool IsDeleted { set; get; } = false;