hrms-bangkok/hrms-api-backend
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

Merge branch 'develop' into working
Some checks failed
release-dev / release-dev (push) Failing after 12s
Details

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2025-05-07 15:36:31 +07:00
commit eeb82dcbe1
4 changed files with 23 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

28
BMA.EHR.Application/Repositories/RetirementEmployeeRepository.cs
View file

@ -31,7 +31,7 @@ namespace BMA.EHR.Application.Repositories
_httpContextAccessor = httpContextAccessor;
_repositoryNoti = repositoryNoti;
_configuration = configuration;
URL = _configuration["MAIN_PAGE"];
URL = _configuration["VITE_URL_MGT"];
}
#region " Properties "
@ -143,7 +143,6 @@ namespace BMA.EHR.Application.Repositories
try
{
var data = await _dbContext.Set<RetirementResignEmployee>().AsQueryable()
.AsNoTracking()
.Include(x => x.Approvers)
.FirstOrDefaultAsync(x => x.Id == id);
@ -155,15 +154,6 @@ namespace BMA.EHR.Application.Repositories
}
}
public async Task<RetirementResignEmployee?> GetByIdWithTrackingAsync(Guid id)
{
var data = await _dbContext.Set<RetirementResignEmployee>().AsQueryable()
//.AsNoTracking()
.Include(x => x.Approvers)
.FirstOrDefaultAsync(x => x.Id == id);
return data;
}
public async Task OfficerApproveRetirementResignEmployee(Guid id)
{
var rawData = await GetByIdAsync(id);
@ -200,7 +190,7 @@ namespace BMA.EHR.Application.Repositories
var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId);
var rawData = await GetByIdWithTrackingAsync(id);
var rawData = await GetByIdAsync(id);
if (rawData == null)
{
throw new Exception(GlobalMessages.DataNotFound);
@ -266,7 +256,6 @@ namespace BMA.EHR.Application.Repositories
if (approver.Seq != maxSeq)
{
rawData.Status = "PENDING";
await _dbContext.SaveChangesAsync();
var nextApprover = approvers.FirstOrDefault(x => x.Seq == approver.Seq + 1);
@ -287,7 +276,6 @@ namespace BMA.EHR.Application.Repositories
// rawData.LeaveComment = reason;
rawData.ApproveStep = "st3";
await _dbContext.SaveChangesAsync();
// TODO: Send notification to 1st Approver
var firstCommander = rawData.Approvers
@ -314,7 +302,7 @@ namespace BMA.EHR.Application.Repositories
var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId);
var rawData = await GetByIdWithTrackingAsync(id);
var rawData = await GetByIdAsync(id);
if (rawData == null)
{
throw new Exception(GlobalMessages.DataNotFound);
@ -365,7 +353,6 @@ namespace BMA.EHR.Application.Repositories
Payload = $"{URL}/retirement/resign-employee-detail/{id}",
};
_dbContext.Set<Notification>().Add(noti);
await _dbContext.SaveChangesAsync();
rawData.Status = "PENDING";
await _dbContext.SaveChangesAsync();
@ -376,7 +363,6 @@ namespace BMA.EHR.Application.Repositories
// rawData.LeaveComment = reason;
rawData.ApproveStep = "st3";
await _dbContext.SaveChangesAsync();
// TODO: Send notification to 1st Approver
var firstCommander = rawData.Approvers
@ -402,7 +388,7 @@ namespace BMA.EHR.Application.Repositories
// Get UserId from token
var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId);
var rawData = await GetByIdWithTrackingAsync(id);
var rawData = await GetByIdAsync(id);
if (rawData == null)
{
throw new Exception(GlobalMessages.DataNotFound);
@ -452,8 +438,6 @@ namespace BMA.EHR.Application.Repositories
};
_dbContext.Set<Notification>().Add(noti1);
await _dbContext.SaveChangesAsync();
await _dbContext.SaveChangesAsync();
}
else
{
@ -461,8 +445,6 @@ namespace BMA.EHR.Application.Repositories
// rawData.LeaveDirectorComment = reason;
rawData.ApproveStep = "st4";
await _dbContext.SaveChangesAsync();
// Send Noti
var noti = new Notification
{
@ -482,7 +464,7 @@ namespace BMA.EHR.Application.Repositories
// Get UserId from token
var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId);
var rawData = await GetByIdWithTrackingAsync(id);
var rawData = await GetByIdAsync(id);
if (rawData == null)
{
throw new Exception(GlobalMessages.DataNotFound);

32
BMA.EHR.Application/Repositories/RetirementRepository.cs
View file

@ -31,7 +31,7 @@ namespace BMA.EHR.Application.Repositories
_httpContextAccessor = httpContextAccessor;
_repositoryNoti = repositoryNoti;
_configuration = configuration;
URL = _configuration["MAIN_PAGE"];
URL = _configuration["VITE_URL_MGT"];
}
#region " Properties "
@ -143,7 +143,6 @@ namespace BMA.EHR.Application.Repositories
try
{
var data = await _dbContext.Set<RetirementResign>().AsQueryable()
.AsNoTracking()
.Include(x => x.Approvers)
.FirstOrDefaultAsync(x => x.Id == id);
@ -155,15 +154,6 @@ namespace BMA.EHR.Application.Repositories
}
}
public async Task<RetirementResign?> GetByIdWithTrackingAsync(Guid id)
{
var data = await _dbContext.Set<RetirementResign>().AsQueryable()
//.AsNoTracking()
.Include(x => x.Approvers)
.FirstOrDefaultAsync(x => x.Id == id);
return data;
}
public async Task OfficerApproveRetirementResign(Guid id)
{
var rawData = await GetByIdAsync(id);
@ -175,8 +165,6 @@ namespace BMA.EHR.Application.Repositories
rawData.Status = "PENDING";
rawData.ApproveStep = "st2";
await _dbContext.SaveChangesAsync();
// TODO: Send notification to 1st Commander
var firstCommander = rawData.Approvers
.Where(x => x.ApproveType!.ToUpper() == "COMMANDER")
@ -200,7 +188,7 @@ namespace BMA.EHR.Application.Repositories
var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId);
var rawData = await GetByIdWithTrackingAsync(id);
var rawData = await GetByIdAsync(id);
if (rawData == null)
{
throw new Exception(GlobalMessages.DataNotFound);
@ -266,7 +254,6 @@ namespace BMA.EHR.Application.Repositories
if (approver.Seq != maxSeq)
{
rawData.Status = "PENDING";
await _dbContext.SaveChangesAsync();
var nextApprover = approvers.FirstOrDefault(x => x.Seq == approver.Seq + 1);
@ -287,8 +274,6 @@ namespace BMA.EHR.Application.Repositories
// rawData.LeaveComment = reason;
rawData.ApproveStep = "st3";
await _dbContext.SaveChangesAsync();
// TODO: Send notification to 1st Approver
var firstCommander = rawData.Approvers
.Where(x => x.ApproveType!.ToUpper() == "APPROVER")
@ -314,7 +299,7 @@ namespace BMA.EHR.Application.Repositories
var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId);
var rawData = await GetByIdWithTrackingAsync(id);
var rawData = await GetByIdAsync(id);
if (rawData == null)
{
throw new Exception(GlobalMessages.DataNotFound);
@ -365,7 +350,6 @@ namespace BMA.EHR.Application.Repositories
Payload = $"{URL}/retirement/resign-detail/{id}",
};
_dbContext.Set<Notification>().Add(noti);
await _dbContext.SaveChangesAsync();
rawData.Status = "PENDING";
await _dbContext.SaveChangesAsync();
@ -376,8 +360,6 @@ namespace BMA.EHR.Application.Repositories
// rawData.LeaveComment = reason;
rawData.ApproveStep = "st3";
await _dbContext.SaveChangesAsync();
// TODO: Send notification to 1st Approver
var firstCommander = rawData.Approvers
.Where(x => x.ApproveType!.ToUpper() == "APPROVER")
@ -402,7 +384,7 @@ namespace BMA.EHR.Application.Repositories
// Get UserId from token
var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId);
var rawData = await GetByIdWithTrackingAsync(id);
var rawData = await GetByIdAsync(id);
if (rawData == null)
{
throw new Exception(GlobalMessages.DataNotFound);
@ -452,8 +434,6 @@ namespace BMA.EHR.Application.Repositories
};
_dbContext.Set<Notification>().Add(noti1);
await _dbContext.SaveChangesAsync();
await _dbContext.SaveChangesAsync();
}
else
{
@ -461,8 +441,6 @@ namespace BMA.EHR.Application.Repositories
// rawData.LeaveDirectorComment = reason;
rawData.ApproveStep = "st4";
await _dbContext.SaveChangesAsync();
if (rawData.profileId != null)
{
// Send Noti
@ -485,7 +463,7 @@ namespace BMA.EHR.Application.Repositories
// Get UserId from token
var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId);
var rawData = await GetByIdWithTrackingAsync(id);
var rawData = await GetByIdAsync(id);
if (rawData == null)
{
throw new Exception(GlobalMessages.DataNotFound);