From 2a53e1c24124880056bb8df1eb608748d5158225 Mon Sep 17 00:00:00 2001 From: "ashutosh.nehete" Date: Tue, 4 Nov 2025 17:44:23 +0530 Subject: [PATCH] Added the create recurring payment API --- Marco.Pms.Services/Service/ExpensesService.cs | 185 ++++++++++-------- 1 file changed, 105 insertions(+), 80 deletions(-) diff --git a/Marco.Pms.Services/Service/ExpensesService.cs b/Marco.Pms.Services/Service/ExpensesService.cs index fcb889c..8b2a80c 100644 --- a/Marco.Pms.Services/Service/ExpensesService.cs +++ b/Marco.Pms.Services/Service/ExpensesService.cs @@ -2340,93 +2340,118 @@ namespace Marco.Pms.Services.Service public async Task> CreateRecurringPaymentAsync(RecurringTemplateDto model, Employee loggedInEmployee, Guid tenantId) { - using var scope = _serviceScopeFactory.CreateScope(); - var permissionService = scope.ServiceProvider.GetRequiredService(); - var hasPermission = await permissionService.HasPermission(PermissionsMaster.ManageRecurring, loggedInEmployee.Id); + _logger.LogInfo("Start CreateRecurringPaymentAsync called by EmployeeId: {EmployeeId} for TenantId: {TenantId}", loggedInEmployee.Id, tenantId); - if (!hasPermission) + try { - _logger.LogWarning("Employee {EmployeeId} attempted to create recurring template", loggedInEmployee.Id); - return ApiResponse.ErrorResponse("You do not have access to create recurring template", "You do not have access to create recurring template", 400); + // Check if user has permission to create recurring payment templates + 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 create recurring payment template without required permission.", loggedInEmployee.Id); + return ApiResponse.ErrorResponse("You do not have access to create recurring template.", "Permission denied.", 403); + } + + // Concurrently fetch related entities required for validation and response mapping + 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, can be null + + // Generate unique UID prefix and postfix per current month/year + string uIDPrefix = $"RP/{DateTime.Now:MMyy}"; + + var lastRecurringPayment = await _context.RecurringPayments + .Where(e => e.UIDPrefix == uIDPrefix) + .OrderByDescending(e => e.UIDPostfix) + .FirstOrDefaultAsync(); + + int uIDPostfix = lastRecurringPayment == null ? 1 : lastRecurringPayment.UIDPostfix + 1; + + // Map input DTO to entity and set additional fields + var recurringPayment = _mapper.Map(model); + recurringPayment.UIDPrefix = uIDPrefix; + recurringPayment.UIDPostfix = uIDPostfix; + recurringPayment.IsActive = true; + recurringPayment.CreatedAt = DateTime.UtcNow; + recurringPayment.CreatedById = loggedInEmployee.Id; + recurringPayment.TenantId = tenantId; + + _context.RecurringPayments.Add(recurringPayment); + await _context.SaveChangesAsync(); + + // Prepare response view model with enriched data + 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 created successfully with UID: {RecurringPaymentUId} by EmployeeId: {EmployeeId}", response.RecurringPaymentUId, loggedInEmployee.Id); + + return ApiResponse.SuccessResponse(response, "Recurring Payment Template created successfully.", 201); } - - var expenseCategoryTask = Task.Run(async () => + catch (Exception ex) { - 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(et => et.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 await context.Projects.FirstOrDefaultAsync(P => model.ProjectId.HasValue && P.Id == model.ProjectId.Value); - }); - - await Task.WhenAll(expenseCategoryTask, currencyTask, projectTask, recurringStatusTask); - - 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); + _logger.LogError(ex, "Error in CreateRecurringPaymentAsync called by EmployeeId: {EmployeeId}: {Message}", loggedInEmployee.Id, ex.Message); + return ApiResponse.ErrorResponse("An error occurred while creating the recurring payment template.", ex.Message, 500); } - - var recurringStatus = await recurringStatusTask; - if (expenseCategory == null) + finally { - _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); + _logger.LogInfo("End CreateRecurringPaymentAsync called by EmployeeId: {EmployeeId}", loggedInEmployee.Id); } - - 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; - - string uIDPrefix = $"RP/{DateTime.Now:MMyy}"; - - var lastExpense = await _context.RecurringPayments - .Where(e => e.UIDPrefix == uIDPrefix) - .OrderByDescending(e => e.UIDPostfix) - .FirstOrDefaultAsync(); - - int uIDPostfix = lastExpense == null ? 1 : (lastExpense.UIDPostfix + 1); - - var recurringPayment = _mapper.Map(model); - recurringPayment.UIDPrefix = uIDPrefix; - recurringPayment.UIDPostfix = uIDPostfix; - recurringPayment.IsActive = true; - recurringPayment.CreatedAt = DateTime.UtcNow; - recurringPayment.CreatedById = loggedInEmployee.Id; - recurringPayment.TenantId = tenantId; - - _context.RecurringPayments.Add(recurringPayment); - await _context.SaveChangesAsync(); - - 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); - - return ApiResponse.SuccessResponse(response, "Recurring Payment Template created successfully", 201); } + public async Task> EditRecurringPaymentAsync(Guid id, RecurringTemplateDto model, Employee loggedInEmployee, Guid tenantId) { using var scope = _serviceScopeFactory.CreateScope(); @@ -2435,8 +2460,8 @@ namespace Marco.Pms.Services.Service if (!hasPermission) { - _logger.LogWarning("Employee {EmployeeId} attempted to create recurring template", loggedInEmployee.Id); - return ApiResponse.ErrorResponse("You do not have access to create recurring template", "You do not have access to create recurring template", 400); + _logger.LogWarning("Employee {EmployeeId} attempted to update recurring template", loggedInEmployee.Id); + return ApiResponse.ErrorResponse("You do not have access to update recurring template", "You do not have access to update recurring template", 400); } var expenseCategoryTask = Task.Run(async () =>