diff --git a/Marco.Pms.Services/Controllers/ExpenseController.cs b/Marco.Pms.Services/Controllers/ExpenseController.cs index 582d3cf..5e324f0 100644 --- a/Marco.Pms.Services/Controllers/ExpenseController.cs +++ b/Marco.Pms.Services/Controllers/ExpenseController.cs @@ -255,6 +255,20 @@ namespace Marco.Pms.Services.Controllers } return StatusCode(response.StatusCode, response); + } + + [HttpPut("recurring-payment/edit/{id}")] + public async Task EditRecurringPaymentAsync(Guid id, [FromBody] UpdateRecurringTemplateDto model) + { + var loggedInEmployee = await _userHelper.GetCurrentEmployeeAsync(); + var response = await _expensesService.EditRecurringPaymentAsync(id, model, loggedInEmployee, tenantId); + if (response.Success) + { + var notification = new { LoggedInUserId = loggedInEmployee.Id, Keyword = "Payment_Request", Response = response.Data }; + await _signalR.SendNotificationAsync(notification); + } + return StatusCode(response.StatusCode, response); + } #endregion diff --git a/Marco.Pms.Services/Service/ExpensesService.cs b/Marco.Pms.Services/Service/ExpensesService.cs index 537aa69..f61788a 100644 --- a/Marco.Pms.Services/Service/ExpensesService.cs +++ b/Marco.Pms.Services/Service/ExpensesService.cs @@ -2897,7 +2897,127 @@ namespace Marco.Pms.Services.Service _logger.LogInfo("End CreateRecurringPaymentAsync called by EmployeeId: {EmployeeId}", loggedInEmployee.Id); } } + public async Task> 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); + try + { + // Validate if the employee Id from the URL path matches the Id in the request body (model) + if (id != model.Id) + { + // Log a warning with details for traceability when Ids do not match + _logger.LogWarning("Mismatch detected: Path parameter Id ({PathId}) does not match body Id ({BodyId}) for employee {EmployeeId}", + id, model.Id, loggedInEmployee.Id); + + // Return standardized error response with HTTP 400 Bad Request status and clear message + return ApiResponse.ErrorResponse("The employee Id in the path does not match the Id in the request body.", + "The employee Id in the path does not match the Id in the request body.", 400); + } + + // Permission check for managing recurring payments + using var scope = _serviceScopeFactory.CreateScope(); + var permissionService = scope.ServiceProvider.GetRequiredService(); + var hasPermission = await permissionService.HasPermission(PermissionsMaster.ManageRecurring, loggedInEmployee.Id); + + if (!hasPermission) + { + _logger.LogWarning("Access denied: Employee {EmployeeId} attempted to update recurring template without permission.", loggedInEmployee.Id); + return ApiResponse.ErrorResponse("You do not have access to update recurring template.", "Permission denied.", 403); + } + + // Concurrently fetch required related entities for validation + var expenseCategoryTask = Task.Run(async () => + { + await using var context = await _dbContextFactory.CreateDbContextAsync(); + return await context.ExpenseCategoryMasters.FirstOrDefaultAsync(et => et.Id == model.ExpenseCategoryId && et.IsActive); + }); + + var recurringStatusTask = Task.Run(async () => + { + await using var context = await _dbContextFactory.CreateDbContextAsync(); + return await context.RecurringPaymentStatus.FirstOrDefaultAsync(rs => rs.Id == model.StatusId); + }); + + var currencyTask = Task.Run(async () => + { + await using var context = await _dbContextFactory.CreateDbContextAsync(); + return await context.CurrencyMaster.FirstOrDefaultAsync(c => c.Id == model.CurrencyId); + }); + + var projectTask = Task.Run(async () => + { + await using var context = await _dbContextFactory.CreateDbContextAsync(); + return model.ProjectId.HasValue ? await context.Projects.FirstOrDefaultAsync(p => p.Id == model.ProjectId.Value) : null; + }); + + await Task.WhenAll(expenseCategoryTask, recurringStatusTask, currencyTask, projectTask); + + var expenseCategory = await expenseCategoryTask; + if (expenseCategory == null) + { + _logger.LogWarning("Expense Category not found with Id: {ExpenseCategoryId}", model.ExpenseCategoryId); + return ApiResponse.ErrorResponse("Expense Category not found.", "Expense Category not found.", 404); + } + + var recurringStatus = await recurringStatusTask; + if (recurringStatus == null) + { + _logger.LogWarning("Recurring Payment Status not found with Id: {StatusId}", model.StatusId); + return ApiResponse.ErrorResponse("Recurring Payment Status not found.", "Recurring Payment Status not found.", 404); + } + + var currency = await currencyTask; + if (currency == null) + { + _logger.LogWarning("Currency not found with Id: {CurrencyId}", model.CurrencyId); + return ApiResponse.ErrorResponse("Currency not found.", "Currency not found.", 404); + } + + var project = await projectTask; // Optional + + // Retrieve the existing recurring payment record for update + var recurringPayment = await _context.RecurringPayments + .FirstOrDefaultAsync(rp => rp.Id == id && rp.IsActive && rp.TenantId == tenantId); + + if (recurringPayment == null) + { + _logger.LogWarning("Recurring Payment Template not found with Id: {RecurringPaymentId}", id); + return ApiResponse.ErrorResponse("Recurring Payment Template not found.", "Recurring Payment Template not found.", 404); + } + + // Map updated values from DTO to entity + _mapper.Map(model, recurringPayment); + recurringPayment.UpdatedAt = DateTime.UtcNow; + recurringPayment.UpdatedById = loggedInEmployee.Id; + + // Save changes to database + await _context.SaveChangesAsync(); + + // Map entity to view model for response + var response = _mapper.Map(recurringPayment); + response.RecurringPaymentUId = $"{recurringPayment.UIDPrefix}/{recurringPayment.UIDPostfix:D5}"; + response.CreatedBy = _mapper.Map(loggedInEmployee); + response.ExpenseCategory = _mapper.Map(expenseCategory); + response.Status = recurringStatus; + response.Currency = currency; + response.Project = _mapper.Map(project); + + _logger.LogInfo("Recurring Payment Template updated successfully with UID: {RecurringPaymentUId} by EmployeeId: {EmployeeId}", response.RecurringPaymentUId, loggedInEmployee.Id); + + return ApiResponse.SuccessResponse(response, "Recurring Payment Template updated successfully.", 200); + } + catch (Exception ex) + { + _logger.LogError(ex, "Error in EditRecurringPaymentAsync called by EmployeeId: {EmployeeId}: {Message}", loggedInEmployee.Id, ex.Message); + return ApiResponse.ErrorResponse("An error occurred while updating the recurring payment template.", ex.Message, 500); + } + finally + { + _logger.LogInfo("End EditRecurringPaymentAsync called by EmployeeId: {EmployeeId}", loggedInEmployee.Id); + } + } #endregion #region =================================================================== Payment Request Functions =================================================================== diff --git a/Marco.Pms.Services/Service/ServiceInterfaces/IExpensesService.cs b/Marco.Pms.Services/Service/ServiceInterfaces/IExpensesService.cs index 63f8618..b323d02 100644 --- a/Marco.Pms.Services/Service/ServiceInterfaces/IExpensesService.cs +++ b/Marco.Pms.Services/Service/ServiceInterfaces/IExpensesService.cs @@ -33,7 +33,7 @@ namespace Marco.Pms.Services.Service.ServiceInterfaces Task> GetRecurringPaymentListAsync(string? searchString, string? filter, bool isActive, int pageSize, int pageNumber, Employee loggedInEmployee, Guid tenantId); Task> GetRecurringPaymentDetailsAsync(Guid? id, string? recurringPaymentUId, Employee loggedInEmployee, Guid tenantId); Task> CreateRecurringPaymentAsync(CreateRecurringTemplateDto model, Employee loggedInEmployee, Guid tenantId); - + Task> EditRecurringPaymentAsync(Guid id, UpdateRecurringTemplateDto model, Employee loggedInEmployee, Guid tenantId); #endregion #region =================================================================== Payment Request Functions ===================================================================