From b313f3ce704cd8e30d864fefd8cdd8a1196b27f3 Mon Sep 17 00:00:00 2001
From: "ashutosh.nehete" <ashutosh.nehete@marcoaiot.com>
Date: Wed, 5 Nov 2025 16:19:21 +0530
Subject: [PATCH] Not updating the strike date when updating recurring template

---
 ...teDto.cs => CreateRecurringTemplateDto.cs} |  3 +--
 .../Expenses/UpdateRecurringTemplateDto.cs    | 22 +++++++++++++++++++
 .../Controllers/ExpenseController.cs          |  4 ++--
 .../MappingProfiles/MappingProfile.cs         |  4 ++--
 Marco.Pms.Services/Service/ExpensesService.cs |  5 ++---
 .../ServiceInterfaces/IExpensesService.cs     |  4 ++--
 6 files changed, 31 insertions(+), 11 deletions(-)
 rename Marco.Pms.Model/Dtos/Expenses/{RecurringTemplateDto.cs => CreateRecurringTemplateDto.cs} (91%)
 create mode 100644 Marco.Pms.Model/Dtos/Expenses/UpdateRecurringTemplateDto.cs

diff --git a/Marco.Pms.Model/Dtos/Expenses/RecurringTemplateDto.cs b/Marco.Pms.Model/Dtos/Expenses/CreateRecurringTemplateDto.cs
similarity index 91%
rename from Marco.Pms.Model/Dtos/Expenses/RecurringTemplateDto.cs
rename to Marco.Pms.Model/Dtos/Expenses/CreateRecurringTemplateDto.cs
index 5c32f9c..3ac8cd4 100644
--- a/Marco.Pms.Model/Dtos/Expenses/RecurringTemplateDto.cs
+++ b/Marco.Pms.Model/Dtos/Expenses/CreateRecurringTemplateDto.cs
@@ -2,9 +2,8 @@
 
 namespace Marco.Pms.Model.Dtos.Expenses
 {
-    public class RecurringTemplateDto
+    public class CreateRecurringTemplateDto
     {
-        public Guid? Id { get; set; }
         public required string Title { get; set; }
         public required string Description { get; set; }
         public required string Payee { get; set; }
diff --git a/Marco.Pms.Model/Dtos/Expenses/UpdateRecurringTemplateDto.cs b/Marco.Pms.Model/Dtos/Expenses/UpdateRecurringTemplateDto.cs
new file mode 100644
index 0000000..df56ac9
--- /dev/null
+++ b/Marco.Pms.Model/Dtos/Expenses/UpdateRecurringTemplateDto.cs
@@ -0,0 +1,22 @@
+using Marco.Pms.Model.TenantModels;
+
+namespace Marco.Pms.Model.Dtos.Expenses
+{
+    public class UpdateRecurringTemplateDto
+    {
+        public Guid Id { get; set; }
+        public required string Title { get; set; }
+        public required string Description { get; set; }
+        public required string Payee { get; set; }
+        public required string NotifyTo { get; set; }
+        public required Guid CurrencyId { get; set; }
+        public required double Amount { get; set; }
+        public Guid? ProjectId { get; set; }
+        public required int PaymentBufferDays { get; set; }
+        public required int NumberOfIteration { get; set; }
+        public required Guid ExpenseCategoryId { get; set; }
+        public required Guid StatusId { get; set; }
+        public required PLAN_FREQUENCY Frequency { get; set; }
+        public required bool IsVariable { get; set; }
+    }
+}
diff --git a/Marco.Pms.Services/Controllers/ExpenseController.cs b/Marco.Pms.Services/Controllers/ExpenseController.cs
index eef0a13..d78b5ea 100644
--- a/Marco.Pms.Services/Controllers/ExpenseController.cs
+++ b/Marco.Pms.Services/Controllers/ExpenseController.cs
@@ -223,7 +223,7 @@ namespace Marco.Pms.Services.Controllers
         }
 
         [HttpPost("recurring-payment/create")]
-        public async Task<IActionResult> CreateRecurringPayment([FromBody] RecurringTemplateDto model)
+        public async Task<IActionResult> CreateRecurringPayment([FromBody] CreateRecurringTemplateDto model)
         {
             var loggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
             var response = await _expensesService.CreateRecurringPaymentAsync(model, loggedInEmployee, tenantId);
@@ -246,7 +246,7 @@ namespace Marco.Pms.Services.Controllers
         }
 
         [HttpPost("recurring-payment/edit/{id}")]
-        public async Task<IActionResult> EditRecurringPaymentAsync(Guid id, [FromBody] RecurringTemplateDto model)
+        public async Task<IActionResult> EditRecurringPaymentAsync(Guid id, [FromBody] UpdateRecurringTemplateDto model)
         {
             var loggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
             var response = await _expensesService.EditRecurringPaymentAsync(id, model, loggedInEmployee, tenantId);
diff --git a/Marco.Pms.Services/MappingProfiles/MappingProfile.cs b/Marco.Pms.Services/MappingProfiles/MappingProfile.cs
index 7d33cc2..e657982 100644
--- a/Marco.Pms.Services/MappingProfiles/MappingProfile.cs
+++ b/Marco.Pms.Services/MappingProfiles/MappingProfile.cs
@@ -269,9 +269,9 @@ namespace Marco.Pms.Services.MappingProfiles
 
             #region ======================================================= Recurring Request =======================================================
 
-            CreateMap<RecurringTemplateDto, RecurringPayment>();
+            CreateMap<CreateRecurringTemplateDto, RecurringPayment>();
+            CreateMap<UpdateRecurringTemplateDto, RecurringPayment>();
             CreateMap<RecurringPayment, RecurringPaymentVM>();
-            //CreateMap<RecurringPayment, PaymentRequestDetailsVM>();
 
             #endregion
 
diff --git a/Marco.Pms.Services/Service/ExpensesService.cs b/Marco.Pms.Services/Service/ExpensesService.cs
index 62ca400..b6b5b41 100644
--- a/Marco.Pms.Services/Service/ExpensesService.cs
+++ b/Marco.Pms.Services/Service/ExpensesService.cs
@@ -2514,7 +2514,7 @@ namespace Marco.Pms.Services.Service
                 _logger.LogInfo("End GetRecurringPaymentListAsync called by EmployeeId: {EmployeeId}", loggedInEmployee.Id);
             }
         }
-        public async Task<ApiResponse<object>> CreateRecurringPaymentAsync(RecurringTemplateDto model, Employee loggedInEmployee, Guid tenantId)
+        public async Task<ApiResponse<object>> CreateRecurringPaymentAsync(CreateRecurringTemplateDto model, Employee loggedInEmployee, Guid tenantId)
         {
             _logger.LogInfo("Start CreateRecurringPaymentAsync called by EmployeeId: {EmployeeId} for TenantId: {TenantId}", loggedInEmployee.Id, tenantId);
 
@@ -2753,8 +2753,7 @@ namespace Marco.Pms.Services.Service
                 _logger.LogInfo("End PaymentRequestConversionAsync called by EmployeeId: {EmployeeId} for TenantId: {TenantId}", loggedInEmployee.Id, tenantId);
             }
         }
-
-        public async Task<ApiResponse<object>> EditRecurringPaymentAsync(Guid id, RecurringTemplateDto model, Employee loggedInEmployee, Guid tenantId)
+        public async Task<ApiResponse<object>> EditRecurringPaymentAsync(Guid id, UpdateRecurringTemplateDto model, Employee loggedInEmployee, Guid tenantId)
         {
             _logger.LogInfo("Start EditRecurringPaymentAsync called by EmployeeId: {EmployeeId} for TenantId: {TenantId}, RecurringPaymentId: {RecurringPaymentId}",
                 loggedInEmployee.Id, tenantId, id);
diff --git a/Marco.Pms.Services/Service/ServiceInterfaces/IExpensesService.cs b/Marco.Pms.Services/Service/ServiceInterfaces/IExpensesService.cs
index 48c18b4..c64e191 100644
--- a/Marco.Pms.Services/Service/ServiceInterfaces/IExpensesService.cs
+++ b/Marco.Pms.Services/Service/ServiceInterfaces/IExpensesService.cs
@@ -30,8 +30,8 @@ namespace Marco.Pms.Services.Service.ServiceInterfaces
 
         #region =================================================================== Recurring Payment Functions ===================================================================
         Task<ApiResponse<object>> GetRecurringPaymentListAsync(string? searchString, string? filter, bool isActive, int pageSize, int pageNumber, Employee loggedInEmployee, Guid tenantId);
-        Task<ApiResponse<object>> CreateRecurringPaymentAsync(RecurringTemplateDto model, Employee loggedInEmployee, Guid tenantId);
-        Task<ApiResponse<object>> EditRecurringPaymentAsync(Guid id, RecurringTemplateDto model, Employee loggedInEmployee, Guid tenantId);
+        Task<ApiResponse<object>> CreateRecurringPaymentAsync(CreateRecurringTemplateDto model, Employee loggedInEmployee, Guid tenantId);
+        Task<ApiResponse<object>> EditRecurringPaymentAsync(Guid id, UpdateRecurringTemplateDto model, Employee loggedInEmployee, Guid tenantId);
         Task<ApiResponse<object>> PaymentRequestConversionAsync(List<Guid> RecurringTemplateIds, Employee loggedInEmployee, Guid tenantId);
         #endregion