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

Change the table ExpenseTypeMaster to ExpenseCategoryMaster

Browse Source
This commit is contained in:
ashutosh.nehete 2025-11-01 15:58:22 +05:30
parent e7edc2f45c
commit faa47c40b2
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Marco.Pms.Services/MappingProfiles/MappingProfile.cs
View File

@ -338,9 +338,23 @@ namespace Marco.Pms.Services.MappingProfiles
// Explicitly and safely convert nullable Guid to non-nullable Guid // Explicitly and safely convert nullable Guid to non-nullable Guid
opt => opt.MapFrom(src => src.Id ?? Guid.Empty) opt => opt.MapFrom(src => src.Id ?? Guid.Empty)
); );
CreateMap<ExpensesTypeMasterDto, ExpenseCategoryMaster>()
.ForMember(
dest => dest.Id,
// Explicitly and safely convert nullable Guid to non-nullable Guid
opt => opt.MapFrom(src => src.Id ?? Guid.Empty)
);
CreateMap<ExpensesTypeMaster, ExpensesTypeMasterVM>(); CreateMap<ExpensesTypeMaster, ExpensesTypeMasterVM>();
CreateMap<ExpenseCategoryMaster, ExpensesTypeMasterVM>(); CreateMap<ExpenseCategoryMaster, ExpensesTypeMasterVM>();
CreateMap<ExpenseCategoryMaster, ExpensesTypeMasterMongoDB>()
.ForMember(
dest => dest.Id,
opt => opt.MapFrom(src => src.Id.ToString()))
.ForMember(
dest => dest.TenantId,
opt => opt.MapFrom(src => src.TenantId.ToString()));
CreateMap<ExpensesTypeMaster, ExpensesTypeMasterMongoDB>() CreateMap<ExpensesTypeMaster, ExpensesTypeMasterMongoDB>()
.ForMember( .ForMember(
dest => dest.Id, dest => dest.Id,

17
Marco.Pms.Services/Service/MasterService.cs
View File

@ -10,6 +10,7 @@ using Marco.Pms.Model.Dtos.DocumentManager;
using Marco.Pms.Model.Dtos.Master; using Marco.Pms.Model.Dtos.Master;
using Marco.Pms.Model.Employees; using Marco.Pms.Model.Employees;
using Marco.Pms.Model.Entitlements; using Marco.Pms.Model.Entitlements;
using Marco.Pms.Model.Expenses;
using Marco.Pms.Model.Master; using Marco.Pms.Model.Master;
using Marco.Pms.Model.MongoDBModels.Utility; using Marco.Pms.Model.MongoDBModels.Utility;
using Marco.Pms.Model.Utilities; using Marco.Pms.Model.Utilities;
@ -2051,7 +2052,7 @@ namespace Marco.Pms.Services.Service
try try
{ {
// Featching the list of Expenses Type. // Featching the list of Expenses Type.
var typeList = await _context.ExpensesTypeMaster.Where(et => et.TenantId == tenantId && et.IsActive == isActive).ToListAsync(); var typeList = await _context.ExpenseCategoryMasters.Where(et => et.TenantId == tenantId && et.IsActive == isActive).ToListAsync();
var response = _mapper.Map<List<ExpensesTypeMasterVM>>(typeList); var response = _mapper.Map<List<ExpensesTypeMasterVM>>(typeList);
_logger.LogInfo("{Count} records of expense type have been fetched successfully by employee {EmployeeId}", response.Count, loggedInEmployee.Id); _logger.LogInfo("{Count} records of expense type have been fetched successfully by employee {EmployeeId}", response.Count, loggedInEmployee.Id);
@ -2074,10 +2075,10 @@ namespace Marco.Pms.Services.Service
_logger.LogWarning("Access DENIED for employee {EmployeeId} for managing EXPANSES TYPE MASTER.", loggedInEmployee.Id); _logger.LogWarning("Access DENIED for employee {EmployeeId} for managing EXPANSES TYPE MASTER.", loggedInEmployee.Id);
return ApiResponse<object>.ErrorResponse("Access Denied.", "You do not have permission to Manage masters", 403); return ApiResponse<object>.ErrorResponse("Access Denied.", "You do not have permission to Manage masters", 403);
} }
var expensesType = _mapper.Map<ExpensesTypeMaster>(model); var expensesType = _mapper.Map<ExpenseCategoryMaster>(model);
expensesType.TenantId = tenantId; expensesType.TenantId = tenantId;
_context.ExpensesTypeMaster.Add(expensesType); _context.ExpenseCategoryMasters.Add(expensesType);
await _context.SaveChangesAsync(); await _context.SaveChangesAsync();
_logger.LogInfo("New Expense Type {ExpensesTypeId} was added by employee {EmployeeId}", expensesType.Id, loggedInEmployee.Id); _logger.LogInfo("New Expense Type {ExpensesTypeId} was added by employee {EmployeeId}", expensesType.Id, loggedInEmployee.Id);
@ -2115,7 +2116,7 @@ namespace Marco.Pms.Services.Service
return ApiResponse<object>.ErrorResponse("Invalid Data", "User has send invalid payload", 400); return ApiResponse<object>.ErrorResponse("Invalid Data", "User has send invalid payload", 400);
} }
var expensesType = await _context.ExpensesTypeMaster.AsNoTracking().FirstOrDefaultAsync(et => et.Id == model.Id.Value && et.TenantId == tenantId); var expensesType = await _context.ExpenseCategoryMasters.AsNoTracking().FirstOrDefaultAsync(et => et.Id == model.Id.Value && et.TenantId == tenantId);
// Checking if expense type exists // Checking if expense type exists
if (expensesType == null) if (expensesType == null)
@ -2130,7 +2131,7 @@ namespace Marco.Pms.Services.Service
// Mapping ExpensesTypeMasterDto to ExpensesTypeMaster // Mapping ExpensesTypeMasterDto to ExpensesTypeMaster
_mapper.Map(model, expensesType); _mapper.Map(model, expensesType);
_context.ExpensesTypeMaster.Update(expensesType); _context.ExpenseCategoryMasters.Update(expensesType);
await _context.SaveChangesAsync(); await _context.SaveChangesAsync();
_logger.LogInfo("Expense Type {ExpensesTypeId} was updated by employee {EmployeeId}", expensesType.Id, loggedInEmployee.Id); _logger.LogInfo("Expense Type {ExpensesTypeId} was updated by employee {EmployeeId}", expensesType.Id, loggedInEmployee.Id);
@ -2143,7 +2144,7 @@ namespace Marco.Pms.Services.Service
UpdatedById = loggedInEmployee.Id.ToString(), UpdatedById = loggedInEmployee.Id.ToString(),
OldObject = existingEntityBson, OldObject = existingEntityBson,
UpdatedAt = DateTime.UtcNow UpdatedAt = DateTime.UtcNow
}, "ExpensesTypeMasterModificationLog"); }, "ExpenseCategoryMasterModificationLog");
// Mapping ExpensesTypeMaster to ExpensesTypeMasterVM // Mapping ExpensesTypeMaster to ExpensesTypeMasterVM
var response = _mapper.Map<ExpensesTypeMasterVM>(expensesType); var response = _mapper.Map<ExpensesTypeMasterVM>(expensesType);
@ -2173,7 +2174,7 @@ namespace Marco.Pms.Services.Service
return ApiResponse<object>.ErrorResponse("Access Denied.", "You do not have permission to Manage masters", 403); return ApiResponse<object>.ErrorResponse("Access Denied.", "You do not have permission to Manage masters", 403);
} }
var expensesType = await _context.ExpensesTypeMaster.FirstOrDefaultAsync(et => et.Id == id && et.TenantId == tenantId); var expensesType = await _context.ExpenseCategoryMasters.FirstOrDefaultAsync(et => et.Id == id && et.TenantId == tenantId);
// Checking if expense type exists // Checking if expense type exists
if (expensesType == null) if (expensesType == null)
@ -2198,7 +2199,7 @@ namespace Marco.Pms.Services.Service
UpdatedById = loggedInEmployee.Id.ToString(), UpdatedById = loggedInEmployee.Id.ToString(),
OldObject = existingEntityBson, OldObject = existingEntityBson,
UpdatedAt = DateTime.UtcNow UpdatedAt = DateTime.UtcNow
}, "ExpensesTypeMasterModificationLog"); }, "ExpenseCategoryMasterModificationLog");
// Mapping ExpensesTypeMaster to ExpensesTypeMasterVM // Mapping ExpensesTypeMaster to ExpensesTypeMasterVM
var response = _mapper.Map<ExpensesTypeMasterVM>(expensesType); var response = _mapper.Map<ExpensesTypeMasterVM>(expensesType);