From 95513f0e10c0ea20acc52fa10f2d8ca9975c018e Mon Sep 17 00:00:00 2001 From: moss <> Date: Wed, 7 May 2025 15:16:04 +0700 Subject: [PATCH 1/3] set env page redirect --- .../Repositories/RetirementEmployeeRepository.cs | 10 +--------- .../Repositories/RetirementRepository.cs | 14 +------------- BMA.EHR.Retirement.Service/appsettings.json | 2 +- 3 files changed, 3 insertions(+), 23 deletions(-) diff --git a/BMA.EHR.Application/Repositories/RetirementEmployeeRepository.cs b/BMA.EHR.Application/Repositories/RetirementEmployeeRepository.cs index cab257c6..410e8dfd 100644 --- a/BMA.EHR.Application/Repositories/RetirementEmployeeRepository.cs +++ b/BMA.EHR.Application/Repositories/RetirementEmployeeRepository.cs @@ -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 " @@ -266,7 +266,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 +286,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 @@ -365,7 +363,6 @@ namespace BMA.EHR.Application.Repositories Payload = $"{URL}/retirement/resign-employee-detail/{id}", }; _dbContext.Set().Add(noti); - await _dbContext.SaveChangesAsync(); rawData.Status = "PENDING"; await _dbContext.SaveChangesAsync(); @@ -376,7 +373,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 @@ -452,8 +448,6 @@ namespace BMA.EHR.Application.Repositories }; _dbContext.Set().Add(noti1); await _dbContext.SaveChangesAsync(); - - await _dbContext.SaveChangesAsync(); } else { @@ -461,8 +455,6 @@ namespace BMA.EHR.Application.Repositories // rawData.LeaveDirectorComment = reason; rawData.ApproveStep = "st4"; - await _dbContext.SaveChangesAsync(); - // Send Noti var noti = new Notification { diff --git a/BMA.EHR.Application/Repositories/RetirementRepository.cs b/BMA.EHR.Application/Repositories/RetirementRepository.cs index 52d44476..60e24157 100644 --- a/BMA.EHR.Application/Repositories/RetirementRepository.cs +++ b/BMA.EHR.Application/Repositories/RetirementRepository.cs @@ -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 " @@ -175,8 +175,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") @@ -266,7 +264,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 +284,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") @@ -365,7 +360,6 @@ namespace BMA.EHR.Application.Repositories Payload = $"{URL}/retirement/resign-detail/{id}", }; _dbContext.Set().Add(noti); - await _dbContext.SaveChangesAsync(); rawData.Status = "PENDING"; await _dbContext.SaveChangesAsync(); @@ -376,8 +370,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") @@ -452,8 +444,6 @@ namespace BMA.EHR.Application.Repositories }; _dbContext.Set().Add(noti1); await _dbContext.SaveChangesAsync(); - - await _dbContext.SaveChangesAsync(); } else { @@ -461,8 +451,6 @@ namespace BMA.EHR.Application.Repositories // rawData.LeaveDirectorComment = reason; rawData.ApproveStep = "st4"; - await _dbContext.SaveChangesAsync(); - if (rawData.profileId != null) { // Send Noti diff --git a/BMA.EHR.Retirement.Service/appsettings.json b/BMA.EHR.Retirement.Service/appsettings.json index 52bf8792..1ecc2d71 100644 --- a/BMA.EHR.Retirement.Service/appsettings.json +++ b/BMA.EHR.Retirement.Service/appsettings.json @@ -36,7 +36,7 @@ "BucketName": "bma-recruit" }, "Protocol": "HTTPS", - "MAIN_PAGE": "https://bma-ehr.frappet.synology.me", + "VITE_URL_MGT": "https://bma-ehr.frappet.synology.me", "API": "https://bma-ehr.frappet.synology.me/api/v1", "APIV2": "https://bma-ehr.frappet.synology.me/api/v2", "API_KEY": "fKRL16yyEgbyTEJdsMw2h64tGSCmkW685PRtM3CygzX1JOSdptT9UJtpgWwKM8FybRTJups3GTFwj27ZRvlPdIkv3XgCoVJaD5LmR06ozuEPvCCRSdp2WFthg08V5xHc56fTPfZLpr1VmXrhd6dvYhHIqKkQUJR02Rlkss11cLRWEQOssEFVA4xdu2J5DIRO1EM5m7wRRvEwcDB4mYRXD9HH52SMq6iYqUWEWsMwLdbk7QW9yYESUEuzMW5gWrb6vIeWZxJV5bTz1PcWUyR7eO9Fyw1F5DiQYc9JgzTC1mW7cv31fEtTtrfbJYKIb5EbWilqIEUKC6A0UKBDDek35ML0006cqRVm0pvdOH6jeq7VQyYrhdXe59dBEyhYGUIfozoVBvW7Up4QBuOMjyPjSqJPlMBKwaseptfrblxQV1AOOivSBpf1ZcQyOZ8JktRtKUDSuXsmG0lsXwFlI3JCeSHdpVdgZWFYcJPegqfrB6KotR02t9AVkpLs1ZWrixwz" From 9f3388eb2083aabd220e905183f280a5d64d4209 Mon Sep 17 00:00:00 2001 From: moss <> Date: Wed, 7 May 2025 15:19:41 +0700 Subject: [PATCH 2/3] save retire --- .../RetirementEmployeeRepository.cs | 18 ++++-------------- .../Repositories/RetirementRepository.cs | 18 ++++-------------- 2 files changed, 8 insertions(+), 28 deletions(-) diff --git a/BMA.EHR.Application/Repositories/RetirementEmployeeRepository.cs b/BMA.EHR.Application/Repositories/RetirementEmployeeRepository.cs index 410e8dfd..0144117b 100644 --- a/BMA.EHR.Application/Repositories/RetirementEmployeeRepository.cs +++ b/BMA.EHR.Application/Repositories/RetirementEmployeeRepository.cs @@ -143,7 +143,6 @@ namespace BMA.EHR.Application.Repositories try { var data = await _dbContext.Set().AsQueryable() - .AsNoTracking() .Include(x => x.Approvers) .FirstOrDefaultAsync(x => x.Id == id); @@ -155,15 +154,6 @@ namespace BMA.EHR.Application.Repositories } } - public async Task GetByIdWithTrackingAsync(Guid id) - { - var data = await _dbContext.Set().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); @@ -312,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); @@ -398,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); @@ -474,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); diff --git a/BMA.EHR.Application/Repositories/RetirementRepository.cs b/BMA.EHR.Application/Repositories/RetirementRepository.cs index 60e24157..dedac02a 100644 --- a/BMA.EHR.Application/Repositories/RetirementRepository.cs +++ b/BMA.EHR.Application/Repositories/RetirementRepository.cs @@ -143,7 +143,6 @@ namespace BMA.EHR.Application.Repositories try { var data = await _dbContext.Set().AsQueryable() - .AsNoTracking() .Include(x => x.Approvers) .FirstOrDefaultAsync(x => x.Id == id); @@ -155,15 +154,6 @@ namespace BMA.EHR.Application.Repositories } } - public async Task GetByIdWithTrackingAsync(Guid id) - { - var data = await _dbContext.Set().AsQueryable() - //.AsNoTracking() - .Include(x => x.Approvers) - .FirstOrDefaultAsync(x => x.Id == id); - - return data; - } public async Task OfficerApproveRetirementResign(Guid id) { var rawData = await GetByIdAsync(id); @@ -198,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); @@ -309,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); @@ -394,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); @@ -473,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); From f2a0b754b3094be756065846d6f589d3247603e2 Mon Sep 17 00:00:00 2001 From: moss <> Date: Wed, 7 May 2025 15:24:24 +0700 Subject: [PATCH 3/3] retire add approver --- .../RetirementResignEmployeeController.cs | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs index 5f5e53ca..000f8ed7 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs @@ -363,6 +363,9 @@ namespace BMA.EHR.Retirement.Service.Controllers p.IsDiscipline, p.CancelReason, p.ApproveStep, + Approvers = p.Approvers.Where(x => x.ApproveType.ToUpper() == "APPROVER"), + Commanders = p.Approvers.Where(x => x.ApproveType.ToUpper() == "COMMANDER"), + KeycloakUserId = p.CreatedUserId, RetirementResignEmployeeCancels = p.RetirementResignEmployeeCancels.FirstOrDefault(), RetirementResignEmployeeDocs = p.RetirementResignEmployeeDocs.Where(d => d.Document != null).Select(d => new { d.Document.Id, d.Document.FileName }), }) @@ -442,6 +445,9 @@ namespace BMA.EHR.Retirement.Service.Controllers data.IsNoBurden, data.IsDiscipline, data.CancelReason, + data.KeycloakUserId, + data.Approvers, + data.Commanders, data.ApproveStep, idCancel = data.RetirementResignEmployeeCancels?.Id ?? Guid.Empty, statusCancel = data.RetirementResignEmployeeCancels?.Status ?? null, @@ -528,6 +534,9 @@ namespace BMA.EHR.Retirement.Service.Controllers p.IsNoDebt, p.IsNoBurden, p.IsDiscipline, + Approvers = p.Approvers.Where(x => x.ApproveType.ToUpper() == "APPROVER"), + Commanders = p.Approvers.Where(x => x.ApproveType.ToUpper() == "COMMANDER"), + KeycloakUserId = p.CreatedUserId, p.CancelReason, idMain = p.RetirementResignEmployee.Id, statusMain = p.RetirementResignEmployee.Status, @@ -610,6 +619,9 @@ namespace BMA.EHR.Retirement.Service.Controllers data.CancelReason, data.idMain, data.statusMain, + data.KeycloakUserId, + data.Approvers, + data.Commanders, statusCancel = data.Status, Docs = retirementResignEmployeeDocs, };