From 263d55cff028b82b9a1d20d48a1e549651a228f0 Mon Sep 17 00:00:00 2001 From: "ashutosh.nehete" Date: Fri, 22 Aug 2025 11:30:32 +0530 Subject: [PATCH] Fixed the error occured due to rebasing --- .../Controllers/MasterController.cs | 9 ++-- Marco.Pms.Services/Helpers/MasterHelper.cs | 47 ++++++++++--------- 2 files changed, 30 insertions(+), 26 deletions(-) diff --git a/Marco.Pms.Services/Controllers/MasterController.cs b/Marco.Pms.Services/Controllers/MasterController.cs index a617f83..a1f9940 100644 --- a/Marco.Pms.Services/Controllers/MasterController.cs +++ b/Marco.Pms.Services/Controllers/MasterController.cs @@ -38,7 +38,7 @@ namespace Marco.Pms.Services.Controllers tenantId = userHelper.GetTenantId(); } - #region =================================================================== Activity APIs =================================================================== + #region =================================================================== Services APIs =================================================================== [HttpGet("services")] public async Task GetServices() @@ -68,8 +68,9 @@ namespace Marco.Pms.Services.Controllers return StatusCode(response.StatusCode, response); } + #endregion - // -------------------------------- Activity Group -------------------------------- + #region =================================================================== Activity Group APIs =================================================================== [HttpGet("activity-groups")] public async Task GetActivityGroups() @@ -99,8 +100,10 @@ namespace Marco.Pms.Services.Controllers var response = await _masterHelper.DeleteActivityGroup(id, isActive ?? false); return StatusCode(response.StatusCode, response); } + #endregion + + #region =================================================================== Activity APIs =================================================================== - // -------------------------------- Activity -------------------------------- [HttpGet("activities")] public async Task GetActivitiesMaster() { diff --git a/Marco.Pms.Services/Helpers/MasterHelper.cs b/Marco.Pms.Services/Helpers/MasterHelper.cs index 8a27836..4450abd 100644 --- a/Marco.Pms.Services/Helpers/MasterHelper.cs +++ b/Marco.Pms.Services/Helpers/MasterHelper.cs @@ -22,22 +22,17 @@ namespace Marco.Pms.Services.Helpers private readonly ILoggingService _logger; private readonly UserHelper _userHelper; private readonly PermissionServices _permissionService; - private readonly Guid View_Master; - private readonly Guid Manage_Master; private readonly Guid tenantId; - public MasterHelper(ApplicationDbContext context, ILoggingService logger, UserHelper userHelper, PermissionServices permission) + public MasterHelper(ApplicationDbContext context, ILoggingService logger, UserHelper userHelper, PermissionServices permissionServices) { _context = context; _logger = logger; _userHelper = userHelper; _permissionService = permissionServices; - View_Master = Guid.Parse("5ffbafe0-7ab0-48b1-bb50-c1bf76b65f9d"); - Manage_Master = Guid.Parse("588a8824-f924-4955-82d8-fc51956cf323"); tenantId = _userHelper.GetTenantId(); } - - // -------------------------------- Services -------------------------------- + #region =================================================================== Services APIs =================================================================== public async Task> GetServices() { _logger.LogInfo("GetServices called"); @@ -72,7 +67,7 @@ namespace Marco.Pms.Services.Helpers var loggedInEmployee = await _userHelper.GetCurrentEmployeeAsync(); // Step 1: Permission check - var hasManagePermission = await _permissionService.HasPermission(Manage_Master, loggedInEmployee.Id); + var hasManagePermission = await _permissionService.HasPermission(PermissionsMaster.ManageMasters, loggedInEmployee.Id); if (!hasManagePermission) { _logger.LogWarning("Access denied for employeeId: {EmployeeId}", loggedInEmployee.Id); @@ -125,7 +120,7 @@ namespace Marco.Pms.Services.Helpers var loggedInEmployee = await _userHelper.GetCurrentEmployeeAsync(); // Step 1: Permission check - var hasPermission = await _permissionService.HasPermission(Manage_Master, loggedInEmployee.Id); + var hasPermission = await _permissionService.HasPermission(PermissionsMaster.ManageMasters, loggedInEmployee.Id); if (!hasPermission) { _logger.LogWarning("Access denied. EmployeeId: {EmployeeId} lacks Manage_Master permission.", loggedInEmployee.Id); @@ -176,7 +171,7 @@ namespace Marco.Pms.Services.Helpers { // Step 1: Get current user and validate permission var loggedInEmployee = await _userHelper.GetCurrentEmployeeAsync(); - var hasPermission = await _permissionService.HasPermission(Manage_Master, loggedInEmployee.Id); + var hasPermission = await _permissionService.HasPermission(PermissionsMaster.ManageMasters, loggedInEmployee.Id); if (!hasPermission) { @@ -216,8 +211,9 @@ namespace Marco.Pms.Services.Helpers return ApiResponse.ErrorResponse("Error deleting service", ex.Message, 500); } } + #endregion - // -------------------------------- Activity Group -------------------------------- + #region =================================================================== Activity Group APIs =================================================================== public async Task> GetActivityGroups() { @@ -254,7 +250,7 @@ namespace Marco.Pms.Services.Helpers var loggedInEmployee = await _userHelper.GetCurrentEmployeeAsync(); // Step 1: Check Manage Master permission - var hasPermission = await _permissionService.HasPermission(Manage_Master, loggedInEmployee.Id); + var hasPermission = await _permissionService.HasPermission(PermissionsMaster.ManageMasters, loggedInEmployee.Id); if (!hasPermission) { _logger.LogWarning("Access denied. EmployeeId: {EmployeeId} lacks Manage_Master permission", loggedInEmployee.Id); @@ -306,7 +302,7 @@ namespace Marco.Pms.Services.Helpers { // Step 1: Permission check var loggedInEmployee = await _userHelper.GetCurrentEmployeeAsync(); - var hasPermission = await _permissionService.HasPermission(Manage_Master, loggedInEmployee.Id); + var hasPermission = await _permissionService.HasPermission(PermissionsMaster.ManageMasters, loggedInEmployee.Id); if (!hasPermission) { _logger.LogWarning("Access denied. EmployeeId: {EmployeeId} lacks Manage_Master permission.", loggedInEmployee.Id); @@ -366,7 +362,7 @@ namespace Marco.Pms.Services.Helpers { // Step 1: Permission check var loggedInEmployee = await _userHelper.GetCurrentEmployeeAsync(); - var hasPermission = await _permissionService.HasPermission(Manage_Master, loggedInEmployee.Id); + var hasPermission = await _permissionService.HasPermission(PermissionsMaster.ManageMasters, loggedInEmployee.Id); if (!hasPermission) { @@ -407,7 +403,10 @@ namespace Marco.Pms.Services.Helpers } } - // -------------------------------- Activity -------------------------------- + + #endregion + + #region =================================================================== Activity APIs =================================================================== public async Task> GetActivitiesMaster() { _logger.LogInfo("GetActivitiesMaster called"); @@ -488,7 +487,7 @@ namespace Marco.Pms.Services.Helpers var loggedInEmployee = await _userHelper.GetCurrentEmployeeAsync(); // Step 2: Check permissions - var hasPermission = await _permissionService.HasPermission(Manage_Master, loggedInEmployee.Id); + var hasPermission = await _permissionService.HasPermission(PermissionsMaster.ManageMasters, loggedInEmployee.Id); if (!hasPermission) { _logger.LogWarning("Access denied. EmployeeId: {EmployeeId} does not have Manage_Master permission.", loggedInEmployee.Id); @@ -544,7 +543,7 @@ namespace Marco.Pms.Services.Helpers // Step 2: Check permissions var loggedInEmployee = await _userHelper.GetCurrentEmployeeAsync(); - var hasPermission = await _permissionService.HasPermission(Manage_Master, loggedInEmployee.Id); + var hasPermission = await _permissionService.HasPermission(PermissionsMaster.ManageMasters, loggedInEmployee.Id); if (!hasPermission) { _logger.LogWarning("Access denied for employeeId: {EmployeeId}", loggedInEmployee.Id); @@ -645,7 +644,7 @@ namespace Marco.Pms.Services.Helpers { // Step 1: Validate permission var loggedInEmployee = await _userHelper.GetCurrentEmployeeAsync(); - var hasPermission = await _permissionService.HasPermission(Manage_Master, loggedInEmployee.Id); + var hasPermission = await _permissionService.HasPermission(PermissionsMaster.ManageMasters, loggedInEmployee.Id); if (!hasPermission) { @@ -679,6 +678,8 @@ namespace Marco.Pms.Services.Helpers } } + #endregion + #region =================================================================== Contact Category APIs =================================================================== public async Task> CreateContactCategory(CreateContactCategoryDto contactCategoryDto) { @@ -892,7 +893,7 @@ namespace Marco.Pms.Services.Helpers return ApiResponse.SuccessResponse(new { }, "Tag deleted successfully", 200); } -#endregion + #endregion #region =================================================================== Work Status APIs =================================================================== @@ -906,7 +907,7 @@ namespace Marco.Pms.Services.Helpers var loggedInEmployee = await _userHelper.GetCurrentEmployeeAsync(); // Step 2: Check permission to view master data - bool hasViewPermission = await _permission.HasPermission(PermissionsMaster.ViewMasters, loggedInEmployee.Id); + bool hasViewPermission = await _permissionService.HasPermission(PermissionsMaster.ViewMasters, loggedInEmployee.Id); if (!hasViewPermission) { _logger.LogWarning("Access denied for employeeId: {EmployeeId}", loggedInEmployee.Id); @@ -950,7 +951,7 @@ namespace Marco.Pms.Services.Helpers var loggedInEmployee = await _userHelper.GetCurrentEmployeeAsync(); // Step 2: Check if user has permission to manage master data - var hasManageMasterPermission = await _permission.HasPermission(PermissionsMaster.ManageMasters, loggedInEmployee.Id); + var hasManageMasterPermission = await _permissionService.HasPermission(PermissionsMaster.ManageMasters, loggedInEmployee.Id); if (!hasManageMasterPermission) { _logger.LogWarning("Access denied for employeeId: {EmployeeId}", loggedInEmployee.Id); @@ -1005,7 +1006,7 @@ namespace Marco.Pms.Services.Helpers var loggedInEmployee = await _userHelper.GetCurrentEmployeeAsync(); // Step 3: Check permissions - var hasManageMasterPermission = await _permission.HasPermission(PermissionsMaster.ManageMasters, loggedInEmployee.Id); + var hasManageMasterPermission = await _permissionService.HasPermission(PermissionsMaster.ManageMasters, loggedInEmployee.Id); if (!hasManageMasterPermission) { _logger.LogWarning("Access denied. EmployeeId: {EmployeeId} does not have Manage Master permission.", loggedInEmployee.Id); @@ -1057,7 +1058,7 @@ namespace Marco.Pms.Services.Helpers var loggedInEmployee = await _userHelper.GetCurrentEmployeeAsync(); // Step 2: Check permission to manage master data - var hasManageMasterPermission = await _permission.HasPermission(PermissionsMaster.ManageMasters, loggedInEmployee.Id); + var hasManageMasterPermission = await _permissionService.HasPermission(PermissionsMaster.ManageMasters, loggedInEmployee.Id); if (!hasManageMasterPermission) { _logger.LogWarning("Delete denied. EmployeeId: {EmployeeId} lacks Manage_Master permission.", loggedInEmployee.Id);