From 7f53cf96c4d860527cbf3efce5c80d95eed2e3fa Mon Sep 17 00:00:00 2001 From: Kittapath Date: Fri, 8 Sep 2023 09:51:51 +0700 Subject: [PATCH 1/2] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=9F?= =?UTF-8?q?=E0=B8=B1=E0=B8=87=E0=B8=81=E0=B9=8C=E0=B8=8A=E0=B8=B1=E0=B8=99?= =?UTF-8?q?noti=20=E0=B8=96=E0=B9=89=E0=B8=B2=E0=B8=AB=E0=B8=B2profile?= =?UTF-8?q?=E0=B9=84=E0=B8=A1=E0=B9=88=E0=B9=80=E0=B8=88=E0=B8=AD=E0=B9=83?= =?UTF-8?q?=E0=B8=AB=E0=B9=89=E0=B8=82=E0=B9=89=E0=B8=B2=E0=B8=A1=E0=B9=80?= =?UTF-8?q?=E0=B8=A5=E0=B8=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MessageQueue/NotificationRepository.cs | 96 +++++++++---------- BMA.EHR.Retirement.Service/appsettings.json | 2 +- .../wwwroot/keycloak.json | 2 +- 3 files changed, 50 insertions(+), 50 deletions(-) diff --git a/BMA.EHR.Application/Repositories/MessageQueue/NotificationRepository.cs b/BMA.EHR.Application/Repositories/MessageQueue/NotificationRepository.cs index b900cb9c..ce045829 100644 --- a/BMA.EHR.Application/Repositories/MessageQueue/NotificationRepository.cs +++ b/BMA.EHR.Application/Repositories/MessageQueue/NotificationRepository.cs @@ -59,58 +59,58 @@ namespace BMA.EHR.Application.Repositories.MessageQueue try { var profile = await _dbContext.Set().FirstOrDefaultAsync(x => x.Id == ReceiverUserId); - if (profile == null) - throw new Exception(GlobalMessages.DataNotFound); - - if (IsSendNotification == true) + if (profile != null) { - _dbContext.Set().Add(new Notification + if (IsSendNotification == true) { - Body = Body, - ReceiverUserId = ReceiverUserId, - Type = "", - Payload = "", - CreatedUserId = FullName ?? "", - CreatedFullName = UserId ?? "System Administrator", - CreatedAt = DateTime.Now, - LastUpdateFullName = FullName ?? "System Administrator", - LastUpdateUserId = UserId ?? "", - LastUpdatedAt = DateTime.Now, - }); - } - if (IsSendInbox == true) - { - _dbContext.Set().Add(new Inbox + _dbContext.Set().Add(new Notification + { + Body = Body, + ReceiverUserId = ReceiverUserId, + Type = "", + Payload = "", + CreatedUserId = FullName ?? "", + CreatedFullName = UserId ?? "System Administrator", + CreatedAt = DateTime.Now, + LastUpdateFullName = FullName ?? "System Administrator", + LastUpdateUserId = UserId ?? "", + LastUpdatedAt = DateTime.Now, + }); + } + if (IsSendInbox == true) { - Subject = Subject, - Body = Body, - ReceiverUserId = ReceiverUserId, - Payload = "", - CreatedUserId = FullName ?? "", - CreatedFullName = UserId ?? "System Administrator", - CreatedAt = DateTime.Now, - LastUpdateFullName = FullName ?? "System Administrator", - LastUpdateUserId = UserId ?? "", - LastUpdatedAt = DateTime.Now, - }); + _dbContext.Set().Add(new Inbox + { + Subject = Subject, + Body = Body, + ReceiverUserId = ReceiverUserId, + Payload = "", + CreatedUserId = FullName ?? "", + CreatedFullName = UserId ?? "System Administrator", + CreatedAt = DateTime.Now, + LastUpdateFullName = FullName ?? "System Administrator", + LastUpdateUserId = UserId ?? "", + LastUpdatedAt = DateTime.Now, + }); + } + if (IsSendMail == true) + { + // _context.Notifications.Add(new Notification + // { + // Body = req.Body, + // ReceiverUserId = req.ReceiverUserId, + // Type = "", + // Payload = "", + // CreatedUserId = FullName ?? "", + // CreatedFullName = UserId ?? "System Administrator", + // CreatedAt = DateTime.Now, + // LastUpdateFullName = FullName ?? "System Administrator", + // LastUpdateUserId = UserId ?? "", + // LastUpdatedAt = DateTime.Now, + // }); + } + await _dbContext.SaveChangesAsync(); } - if (IsSendMail == true) - { - // _context.Notifications.Add(new Notification - // { - // Body = req.Body, - // ReceiverUserId = req.ReceiverUserId, - // Type = "", - // Payload = "", - // CreatedUserId = FullName ?? "", - // CreatedFullName = UserId ?? "System Administrator", - // CreatedAt = DateTime.Now, - // LastUpdateFullName = FullName ?? "System Administrator", - // LastUpdateUserId = UserId ?? "", - // LastUpdatedAt = DateTime.Now, - // }); - } - await _dbContext.SaveChangesAsync(); } catch { diff --git a/BMA.EHR.Retirement.Service/appsettings.json b/BMA.EHR.Retirement.Service/appsettings.json index c694a90c..7da4ee84 100644 --- a/BMA.EHR.Retirement.Service/appsettings.json +++ b/BMA.EHR.Retirement.Service/appsettings.json @@ -19,7 +19,7 @@ }, "Jwt": { "Key": "HP-FnQMUj9msHMSD3T9HtdEnphAKoCJLEl85CIqROFI", - "Issuer": "https://identity.frappet.com/realms/bma-ehr" + "Issuer": "https://id.frappet.synology.me/realms/bma-ehr" }, "EPPlus": { "ExcelPackage": { diff --git a/BMA.EHR.Retirement.Service/wwwroot/keycloak.json b/BMA.EHR.Retirement.Service/wwwroot/keycloak.json index 9eba3b39..a023eb38 100644 --- a/BMA.EHR.Retirement.Service/wwwroot/keycloak.json +++ b/BMA.EHR.Retirement.Service/wwwroot/keycloak.json @@ -1,6 +1,6 @@ { "realm": "bma-ehr", - "auth-server-url": "https://identity.frappet.com", + "auth-server-url": "https://id.frappet.synology.me", "ssl-required": "external", "resource": "bma-ehr", "public-client": true From a886825bb1399b689de957daa581b8410d09c918 Mon Sep 17 00:00:00 2001 From: Kittapath Date: Fri, 8 Sep 2023 11:05:23 +0700 Subject: [PATCH 2/2] fix noti user placement --- .../Reports/InsigniaReportRepository.cs | 1 + .../PlacementTransferController.cs | 2 +- .../Controllers/RetirementResignController.cs | 25 ++++++++++++++++--- 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/BMA.EHR.Application/Repositories/Reports/InsigniaReportRepository.cs b/BMA.EHR.Application/Repositories/Reports/InsigniaReportRepository.cs index d2711cad..25ac2f0c 100644 --- a/BMA.EHR.Application/Repositories/Reports/InsigniaReportRepository.cs +++ b/BMA.EHR.Application/Repositories/Reports/InsigniaReportRepository.cs @@ -732,6 +732,7 @@ namespace BMA.EHR.Application.Repositories.Reports Age = r.Date == null ? "-" : r.Date.Value.CalculateBetweenDateV2(DateTime.Now).ToThaiNumber(), Amount = r.Amount == null ? null : r.Amount.Value.ToNumericText().ToThaiNumber(), Date = r.Date, + Remark = "", }) .Distinct() .OrderBy(x => x.Date) diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs index 535a308e..f327f823 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs @@ -373,7 +373,7 @@ namespace BMA.EHR.Placement.Service.Controllers } } await _repositoryNoti.PushNotificationAsync( - Guid.Parse("00000000-0000-0000-0000-000000000000"), + Guid.Parse("08db721d-ade4-480e-8d84-0853946a0ea5"), $"{profile.Prefix?.Name}{profile.FirstName} {profile.LastName} ได้ทำการยื่นคำขอโอน", $"{profile.Prefix?.Name}{profile.FirstName} {profile.LastName} ได้ทำการยื่นคำขอโอนไปยัง {req.Organization}" ); diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs index 91fd421e..5bf41c4f 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs @@ -352,7 +352,7 @@ namespace BMA.EHR.Retirement.Service.Controllers } } await _repositoryNoti.PushNotificationAsync( - Guid.Parse("00000000-0000-0000-0000-000000000000"), + Guid.Parse("08db721d-ae2f-4f5d-836a-02d2413df33d"), $"{profile.Prefix?.Name}{profile.FirstName} {profile.LastName} ได้ทำการยื่นคำลาออก", $"{profile.Prefix?.Name}{profile.FirstName} {profile.LastName} ได้ทำการยื่นคำลาออก" ); @@ -507,6 +507,11 @@ namespace BMA.EHR.Retirement.Service.Controllers updated.LastUpdateFullName = FullName ?? "System Administrator"; updated.LastUpdateUserId = UserId ?? ""; updated.LastUpdatedAt = DateTime.Now; + await _repositoryNoti.PushNotificationAsync( + Guid.Parse("08db721d-ae67-4ed1-8b3c-490f44a73e65"), + $"คำขอลาออกขอ {updated.Profile.Prefix?.Name}{updated.Profile.FirstName} {updated.Profile.LastName} ได้รับการอนุมัติจากผู้บังคับบัญชา", + $"คำขอลาออกขอ {updated.Profile.Prefix?.Name}{updated.Profile.FirstName} {updated.Profile.LastName} ได้รับการอนุมัติจากผู้บังคับบัญชา" + ); await _context.SaveChangesAsync(); return Success(); @@ -537,6 +542,11 @@ namespace BMA.EHR.Retirement.Service.Controllers updated.LastUpdateFullName = FullName ?? "System Administrator"; updated.LastUpdateUserId = UserId ?? ""; updated.LastUpdatedAt = DateTime.Now; + await _repositoryNoti.PushNotificationAsync( + Guid.Parse("08db721d-ae67-4ed1-8b3c-490f44a73e65"), + $"คำขอลาออกขอ {updated.Profile.Prefix?.Name}{updated.Profile.FirstName} {updated.Profile.LastName} ถูกยับยั้งจากผู้บังคับบัญชา", + $"คำขอลาออกขอ {updated.Profile.Prefix?.Name}{updated.Profile.FirstName} {updated.Profile.LastName} ถูกยับยั้งจากผู้บังคับบัญชา" + ); await _context.SaveChangesAsync(); return Success(); @@ -567,9 +577,9 @@ namespace BMA.EHR.Retirement.Service.Controllers updated.LastUpdateUserId = UserId ?? ""; updated.LastUpdatedAt = DateTime.Now; await _repositoryNoti.PushNotificationAsync( - Guid.Parse("00000000-0000-0000-0000-000000000000"), - $"คำขอลาออกขอ {updated.Profile.Prefix?.Name}{updated.Profile.FirstName} {updated.Profile.LastName} ได้รับการอนุมัติ", - $"คำขอลาออกขอ {updated.Profile.Prefix?.Name}{updated.Profile.FirstName} {updated.Profile.LastName} ได้รับการอนุมัติ" + updated.Profile.Id, + $"คำขอลาออกขอ {updated.Profile.Prefix?.Name}{updated.Profile.FirstName} {updated.Profile.LastName} ได้รับการอนุมัติจากผู้มีอำนาจ", + $"คำขอลาออกขอ {updated.Profile.Prefix?.Name}{updated.Profile.FirstName} {updated.Profile.LastName} ได้รับการอนุมัติจากผู้มีอำนาจ" ); await _context.SaveChangesAsync(); @@ -589,6 +599,8 @@ namespace BMA.EHR.Retirement.Service.Controllers public async Task> OligarchReject([FromBody] RetirementReasonDateRequest req, Guid id) { var updated = await _context.RetirementResigns + .Include(x => x.Profile) + .ThenInclude(x => x.Prefix) .FirstOrDefaultAsync(x => x.Id == id); if (updated == null) return Error(GlobalMessages.RetirementResignNotFound, 404); @@ -601,6 +613,11 @@ namespace BMA.EHR.Retirement.Service.Controllers updated.LastUpdateFullName = FullName ?? "System Administrator"; updated.LastUpdateUserId = UserId ?? ""; updated.LastUpdatedAt = DateTime.Now; + await _repositoryNoti.PushNotificationAsync( + updated.Profile.Id, + $"คำขอลาออกขอ {updated.Profile.Prefix?.Name}{updated.Profile.FirstName} {updated.Profile.LastName} ถูกยับยั้งจากผู้มีอำนาจ", + $"คำขอลาออกขอ {updated.Profile.Prefix?.Name}{updated.Profile.FirstName} {updated.Profile.LastName} ถูกยับยั้งจากผู้มีอำนาจ" + ); await _context.SaveChangesAsync(); return Success();