admin/marco.pms.api
1
0
Fork 0
Code Issues Pull Requests 3 Actions Packages Projects Releases Wiki Activity

Fixed the error occured due to rebasing

Browse Source
This commit is contained in:
ashutosh.nehete 2025-08-22 11:30:32 +05:30
parent dd9ee03282
commit 263d55cff0
2 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Marco.Pms.Services/Controllers/MasterController.cs
View File

@ -38,7 +38,7 @@ namespace Marco.Pms.Services.Controllers
tenantId = userHelper.GetTenantId(); tenantId = userHelper.GetTenantId();
} }
#region =================================================================== Activity APIs =================================================================== #region =================================================================== Services APIs ===================================================================
[HttpGet("services")] [HttpGet("services")]
public async Task<IActionResult> GetServices() public async Task<IActionResult> GetServices()
@ -68,8 +68,9 @@ namespace Marco.Pms.Services.Controllers
return StatusCode(response.StatusCode, response); return StatusCode(response.StatusCode, response);
} }
#endregion
// -------------------------------- Activity Group -------------------------------- #region =================================================================== Activity Group APIs ===================================================================
[HttpGet("activity-groups")] [HttpGet("activity-groups")]
public async Task<IActionResult> GetActivityGroups() public async Task<IActionResult> GetActivityGroups()
@ -99,8 +100,10 @@ namespace Marco.Pms.Services.Controllers
var response = await _masterHelper.DeleteActivityGroup(id, isActive ?? false); var response = await _masterHelper.DeleteActivityGroup(id, isActive ?? false);
return StatusCode(response.StatusCode, response); return StatusCode(response.StatusCode, response);
} }
#endregion
#region =================================================================== Activity APIs ===================================================================
// -------------------------------- Activity --------------------------------
[HttpGet("activities")] [HttpGet("activities")]
public async Task<IActionResult> GetActivitiesMaster() public async Task<IActionResult> GetActivitiesMaster()
{ {

45
Marco.Pms.Services/Helpers/MasterHelper.cs
View File

@ -22,22 +22,17 @@ namespace Marco.Pms.Services.Helpers
private readonly ILoggingService _logger; private readonly ILoggingService _logger;
private readonly UserHelper _userHelper; private readonly UserHelper _userHelper;
private readonly PermissionServices _permissionService; private readonly PermissionServices _permissionService;
private readonly Guid View_Master;
private readonly Guid Manage_Master;
private readonly Guid tenantId; 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; _context = context;
_logger = logger; _logger = logger;
_userHelper = userHelper; _userHelper = userHelper;
_permissionService = permissionServices; _permissionService = permissionServices;
View_Master = Guid.Parse("5ffbafe0-7ab0-48b1-bb50-c1bf76b65f9d");
Manage_Master = Guid.Parse("588a8824-f924-4955-82d8-fc51956cf323");
tenantId = _userHelper.GetTenantId(); tenantId = _userHelper.GetTenantId();
} }
#region =================================================================== Services APIs ===================================================================
// -------------------------------- Services --------------------------------
public async Task<ApiResponse<object>> GetServices() public async Task<ApiResponse<object>> GetServices()
{ {
_logger.LogInfo("GetServices called"); _logger.LogInfo("GetServices called");
@ -72,7 +67,7 @@ namespace Marco.Pms.Services.Helpers
var loggedInEmployee = await _userHelper.GetCurrentEmployeeAsync(); var loggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
// Step 1: Permission check // Step 1: Permission check
var hasManagePermission = await _permissionService.HasPermission(Manage_Master, loggedInEmployee.Id); var hasManagePermission = await _permissionService.HasPermission(PermissionsMaster.ManageMasters, loggedInEmployee.Id);
if (!hasManagePermission) if (!hasManagePermission)
{ {
_logger.LogWarning("Access denied for employeeId: {EmployeeId}", loggedInEmployee.Id); _logger.LogWarning("Access denied for employeeId: {EmployeeId}", loggedInEmployee.Id);
@ -125,7 +120,7 @@ namespace Marco.Pms.Services.Helpers
var loggedInEmployee = await _userHelper.GetCurrentEmployeeAsync(); var loggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
// Step 1: Permission check // Step 1: Permission check
var hasPermission = await _permissionService.HasPermission(Manage_Master, loggedInEmployee.Id); var hasPermission = await _permissionService.HasPermission(PermissionsMaster.ManageMasters, loggedInEmployee.Id);
if (!hasPermission) if (!hasPermission)
{ {
_logger.LogWarning("Access denied. EmployeeId: {EmployeeId} lacks Manage_Master permission.", loggedInEmployee.Id); _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 // Step 1: Get current user and validate permission
var loggedInEmployee = await _userHelper.GetCurrentEmployeeAsync(); 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) if (!hasPermission)
{ {
@ -216,8 +211,9 @@ namespace Marco.Pms.Services.Helpers
return ApiResponse<object>.ErrorResponse("Error deleting service", ex.Message, 500); return ApiResponse<object>.ErrorResponse("Error deleting service", ex.Message, 500);
} }
} }
#endregion
// -------------------------------- Activity Group -------------------------------- #region =================================================================== Activity Group APIs ===================================================================
public async Task<ApiResponse<object>> GetActivityGroups() public async Task<ApiResponse<object>> GetActivityGroups()
{ {
@ -254,7 +250,7 @@ namespace Marco.Pms.Services.Helpers
var loggedInEmployee = await _userHelper.GetCurrentEmployeeAsync(); var loggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
// Step 1: Check Manage Master permission // 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) if (!hasPermission)
{ {
_logger.LogWarning("Access denied. EmployeeId: {EmployeeId} lacks Manage_Master permission", loggedInEmployee.Id); _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 // Step 1: Permission check
var loggedInEmployee = await _userHelper.GetCurrentEmployeeAsync(); 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) if (!hasPermission)
{ {
_logger.LogWarning("Access denied. EmployeeId: {EmployeeId} lacks Manage_Master permission.", loggedInEmployee.Id); _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 // Step 1: Permission check
var loggedInEmployee = await _userHelper.GetCurrentEmployeeAsync(); 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) if (!hasPermission)
{ {
@ -407,7 +403,10 @@ namespace Marco.Pms.Services.Helpers
} }
} }
// -------------------------------- Activity --------------------------------
#endregion
#region =================================================================== Activity APIs ===================================================================
public async Task<ApiResponse<object>> GetActivitiesMaster() public async Task<ApiResponse<object>> GetActivitiesMaster()
{ {
_logger.LogInfo("GetActivitiesMaster called"); _logger.LogInfo("GetActivitiesMaster called");
@ -488,7 +487,7 @@ namespace Marco.Pms.Services.Helpers
var loggedInEmployee = await _userHelper.GetCurrentEmployeeAsync(); var loggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
// Step 2: Check permissions // Step 2: Check permissions
var hasPermission = await _permissionService.HasPermission(Manage_Master, loggedInEmployee.Id); var hasPermission = await _permissionService.HasPermission(PermissionsMaster.ManageMasters, loggedInEmployee.Id);
if (!hasPermission) if (!hasPermission)
{ {
_logger.LogWarning("Access denied. EmployeeId: {EmployeeId} does not have Manage_Master permission.", loggedInEmployee.Id); _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 // Step 2: Check permissions
var loggedInEmployee = await _userHelper.GetCurrentEmployeeAsync(); 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) if (!hasPermission)
{ {
_logger.LogWarning("Access denied for employeeId: {EmployeeId}", loggedInEmployee.Id); _logger.LogWarning("Access denied for employeeId: {EmployeeId}", loggedInEmployee.Id);
@ -645,7 +644,7 @@ namespace Marco.Pms.Services.Helpers
{ {
// Step 1: Validate permission // Step 1: Validate permission
var loggedInEmployee = await _userHelper.GetCurrentEmployeeAsync(); 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) if (!hasPermission)
{ {
@ -679,6 +678,8 @@ namespace Marco.Pms.Services.Helpers
} }
} }
#endregion
#region =================================================================== Contact Category APIs =================================================================== #region =================================================================== Contact Category APIs ===================================================================
public async Task<ApiResponse<object>> CreateContactCategory(CreateContactCategoryDto contactCategoryDto) public async Task<ApiResponse<object>> CreateContactCategory(CreateContactCategoryDto contactCategoryDto)
{ {
@ -906,7 +907,7 @@ namespace Marco.Pms.Services.Helpers
var loggedInEmployee = await _userHelper.GetCurrentEmployeeAsync(); var loggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
// Step 2: Check permission to view master data // 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) if (!hasViewPermission)
{ {
_logger.LogWarning("Access denied for employeeId: {EmployeeId}", loggedInEmployee.Id); _logger.LogWarning("Access denied for employeeId: {EmployeeId}", loggedInEmployee.Id);
@ -950,7 +951,7 @@ namespace Marco.Pms.Services.Helpers
var loggedInEmployee = await _userHelper.GetCurrentEmployeeAsync(); var loggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
// Step 2: Check if user has permission to manage master data // 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) if (!hasManageMasterPermission)
{ {
_logger.LogWarning("Access denied for employeeId: {EmployeeId}", loggedInEmployee.Id); _logger.LogWarning("Access denied for employeeId: {EmployeeId}", loggedInEmployee.Id);
@ -1005,7 +1006,7 @@ namespace Marco.Pms.Services.Helpers
var loggedInEmployee = await _userHelper.GetCurrentEmployeeAsync(); var loggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
// Step 3: Check permissions // Step 3: Check permissions
var hasManageMasterPermission = await _permission.HasPermission(PermissionsMaster.ManageMasters, loggedInEmployee.Id); var hasManageMasterPermission = await _permissionService.HasPermission(PermissionsMaster.ManageMasters, loggedInEmployee.Id);
if (!hasManageMasterPermission) if (!hasManageMasterPermission)
{ {
_logger.LogWarning("Access denied. EmployeeId: {EmployeeId} does not have Manage Master permission.", loggedInEmployee.Id); _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(); var loggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
// Step 2: Check permission to manage master data // 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) if (!hasManageMasterPermission)
{ {
_logger.LogWarning("Delete denied. EmployeeId: {EmployeeId} lacks Manage_Master permission.", loggedInEmployee.Id); _logger.LogWarning("Delete denied. EmployeeId: {EmployeeId} lacks Manage_Master permission.", loggedInEmployee.Id);