From 2fc1587d18ce1890ebddb1ddd94cef856f0c41c1 Mon Sep 17 00:00:00 2001
From: Kittapath <kittapath@frappet.com>
Date: Sat, 29 Jun 2024 01:00:18 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=20noti?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Repositories/MessageQueue/NotificationRepository.cs   | 8 ++++----
 BMA.EHR.Placement.Service/Controllers/NotifyController.cs | 8 ++++----
 .../Controllers/PlacementController.cs                    | 6 ++++++
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/BMA.EHR.Application/Repositories/MessageQueue/NotificationRepository.cs b/BMA.EHR.Application/Repositories/MessageQueue/NotificationRepository.cs
index cf255741..d8cc4775 100644
--- a/BMA.EHR.Application/Repositories/MessageQueue/NotificationRepository.cs
+++ b/BMA.EHR.Application/Repositories/MessageQueue/NotificationRepository.cs
@@ -187,9 +187,9 @@ namespace BMA.EHR.Application.Repositories.MessageQueue
         {
             try
             {
-                var profile = await _dbContext.Set<Profile>().FirstOrDefaultAsync(x => x.Id == ReceiverUserId);
-                if (profile != null)
-                {
+                // var profile = await _dbContext.Set<Profile>().FirstOrDefaultAsync(x => x.Id == ReceiverUserId);
+                //if (profile != null)
+                //{
                     _dbContext.Set<Notification>().Add(new Notification
                     {
                         Body = Body,
@@ -224,7 +224,7 @@ namespace BMA.EHR.Application.Repositories.MessageQueue
                         _emailSenderService.SendMail(Subject, Body, "kittapath@frappet.com");
                     }
                     await _dbContext.SaveChangesAsync();
-                }
+                //}
             }
             catch
             {
diff --git a/BMA.EHR.Placement.Service/Controllers/NotifyController.cs b/BMA.EHR.Placement.Service/Controllers/NotifyController.cs
index 63f01670..c99b934b 100644
--- a/BMA.EHR.Placement.Service/Controllers/NotifyController.cs
+++ b/BMA.EHR.Placement.Service/Controllers/NotifyController.cs
@@ -75,12 +75,12 @@ namespace BMA.EHR.Placement.Service.Controllers
         [HttpPost("keycloak")]
         public async Task<ActionResult<ResponseObject>> UpdatePropertyByUserKeycloak([FromBody] NotiRequest req)
         {
-            var profile = await _context.Profiles.FirstOrDefaultAsync(x => x.KeycloakId == req.ReceiverUserId);
-            if (profile == null)
-                return Error(GlobalMessages.DataNotFound);
+            // var profile = await _context.Profiles.FirstOrDefaultAsync(x => x.KeycloakId == req.ReceiverUserId);
+            // if (profile == null)
+            //     return Error(GlobalMessages.DataNotFound);
 
             await _repositoryNoti.PushNotificationAsync(
-                profile.Id,
+                req.ReceiverUserId,
                 req.Subject,
                 req.Body,
                 req.Payload,
diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs
index 14bd46aa..98023f6e 100644
--- a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs
+++ b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs
@@ -152,6 +152,7 @@ namespace BMA.EHR.Placement.Service.Controllers
                     Draft = x.Draft,
                     typeCommand = x.typeCommand,
                     IsOfficer = x.IsOfficer,
+                    IsRelief = x.IsRelief,
                     posLevelCandidateId = x.PositionLevel == null ? (Guid?)null : x.PositionLevel.Id,
                     posTypeCandidateId = x.PositionType == null ? (Guid?)null : x.PositionType.Id,
                 }).OrderBy(x => x.ExamNumber).ToListAsync();
@@ -202,6 +203,7 @@ namespace BMA.EHR.Placement.Service.Controllers
                         p.StatusId,
                         p.Draft,
                         p.typeCommand,
+                        p.IsRelief,
                         p.posLevelCandidateId,
                         p.posTypeCandidateId,
                     };
@@ -277,6 +279,7 @@ namespace BMA.EHR.Placement.Service.Controllers
                         Draft = x.Draft,
                         typeCommand = x.typeCommand,
                         IsOfficer = x.IsOfficer,
+                        IsRelief = x.IsRelief,
                         posLevelCandidateId = x.PositionLevel == null ? (Guid?)null : x.PositionLevel.Id,
                         posTypeCandidateId = x.PositionType == null ? (Guid?)null : x.PositionType.Id,
                     }).OrderBy(x => x.ExamNumber).ToListAsync();
@@ -327,6 +330,7 @@ namespace BMA.EHR.Placement.Service.Controllers
                             p.StatusId,
                             p.Draft,
                             p.typeCommand,
+                            p.IsRelief,
                             p.posLevelCandidateId,
                             p.posTypeCandidateId,
                         };
@@ -449,6 +453,7 @@ namespace BMA.EHR.Placement.Service.Controllers
                 ExamNumber = x.ExamNumber,
                 ExamRound = x.ExamRound,
                 Pass = x.Pass,
+                IsRelief = x.IsRelief,
                 IsProperty = x.IsProperty == null ? null : Newtonsoft.Json.JsonConvert.DeserializeObject<List<PersonPropertyRequest>>(x.IsProperty),
                 BmaOfficer = x.IsOfficer == true ? "OFFICER" : null,
                 PlacementProfileDocs = x.PlacementProfileDocs.Where(d => d.Document != null).Select(d => new { d.Document.Id, d.Document.FileName }),
@@ -527,6 +532,7 @@ namespace BMA.EHR.Placement.Service.Controllers
                 data.ExamRound,
                 data.Pass,
                 data.IsProperty,
+                data.IsRelief,
                 BmaOfficer = data.BmaOfficer,
                 Docs = placementProfileDocs,
             };