From ae67d4381d1e575f98be6c71edea3b4fb260fb49 Mon Sep 17 00:00:00 2001 From: kittapath Date: Tue, 5 Nov 2024 11:20:55 +0700 Subject: [PATCH] no message --- .../PlacementAppointmentController.cs | 44 ++----- .../PlacementAppointmentEmployeeController.cs | 3 - .../Controllers/PlacementController.cs | 3 - .../Controllers/PlacementOfficerController.cs | 113 +++++++++--------- .../Controllers/PlacementReceiveController.cs | 27 +---- .../PlacementRelocationController.cs | 5 - .../PlacementRepatriationController.cs | 5 +- .../PlacementTransferController.cs | 5 +- 8 files changed, 70 insertions(+), 135 deletions(-) diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs index b1dbc350..b174c096 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs @@ -57,9 +57,6 @@ namespace BMA.EHR.Placement.Service.Controllers private string? FullName => _httpContextAccessor?.HttpContext?.User?.FindFirst("name")?.Value; private string? token => _httpContextAccessor?.HttpContext?.Request.Headers["Authorization"]; - //private bool? PlacementAdmin => _httpContextAccessor?.HttpContext?.User?.IsInRole("placement1"); - private bool? PlacementAdmin => _httpContextAccessor?.HttpContext?.User?.Claims?.Any(claim => new[] { "placement", "placement1", "placement2" }.Contains(claim.Value)); - #endregion /// @@ -164,32 +161,6 @@ namespace BMA.EHR.Placement.Service.Controllers p.typeCommand, }) .ToListAsync(); - // if (PlacementAdmin == true) - // placementAppointments.Where(x => x.Status.Trim().ToUpper().Contains("PENDING")); - - // if (keyword != "") - // { - // var data = placementAppointments.Where(x => - // (x.citizenId != null && x.citizenId.Contains(keyword)) || - // (x.prefix != null && x.prefix.Contains(keyword)) || - // (x.firstName != null && x.firstName.Contains(keyword)) || - // (x.lastName != null && x.lastName.Contains(keyword)) || - // (x.rootShortNameOld != null && x.rootShortNameOld.Contains(keyword)) || - // (x.posMasterNoOld != null && x.posMasterNoOld.ToString().Contains(keyword)) || - // (x.OrganizationOld != null && x.OrganizationOld.Contains(keyword)) || - // (x.posTypeNameOld != null && x.posTypeNameOld.Contains(keyword)) || - // (x.posLevelNameOld != null && x.posLevelNameOld.Contains(keyword)) || - // (x.OrganizationPositionOld != null && x.OrganizationPositionOld.Contains(keyword)) || - // (x.Reason != null && x.Reason.Contains(keyword)) || - // (x.nodeName != null && x.nodeName.Contains(keyword))) - // .OrderByDescending(x => x.CreatedAt) - // .Skip((page - 1) * pageSize) - // .Take(pageSize) - // .ToList(); - - // placementAppointments = data; - // } - return Success(placementAppointments); } @@ -864,7 +835,8 @@ namespace BMA.EHR.Placement.Service.Controllers { result.Add(r); string? _null = null; - result.Add(new { + result.Add(new + { No = _null, FullName = r.RemarkHorizontal, Education = _null, @@ -1070,7 +1042,8 @@ namespace BMA.EHR.Placement.Service.Controllers { result.Add(r); string? _null = null; - result.Add(new { + result.Add(new + { No = _null, FullName = r.RemarkHorizontal, Education = _null, @@ -1274,7 +1247,8 @@ namespace BMA.EHR.Placement.Service.Controllers { result.Add(r); string? _null = null; - result.Add(new { + result.Add(new + { No = _null, FullName = r.RemarkHorizontal, OldOrganization = _null, @@ -1474,7 +1448,8 @@ namespace BMA.EHR.Placement.Service.Controllers { result.Add(r); string? _null = null; - result.Add(new { + result.Add(new + { No = _null, FullName = r.RemarkHorizontal, OldOc = _null, @@ -1683,7 +1658,8 @@ namespace BMA.EHR.Placement.Service.Controllers { result.Add(r); string? _null = null; - result.Add(new { + result.Add(new + { No = _null, FullName = r.RemarkHorizontal, Education = _null, diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentEmployeeController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentEmployeeController.cs index 4a2bd2cb..ecb38b58 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentEmployeeController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentEmployeeController.cs @@ -56,9 +56,6 @@ namespace BMA.EHR.Placement.Service.Controllers private string? FullName => _httpContextAccessor?.HttpContext?.User?.FindFirst("name")?.Value; private string? token => _httpContextAccessor?.HttpContext?.Request.Headers["Authorization"]; - //private bool? PlacementAdmin => _httpContextAccessor?.HttpContext?.User?.IsInRole("placement1"); - private bool? PlacementAdmin => _httpContextAccessor?.HttpContext?.User?.Claims?.Any(claim => new[] { "placement", "placement1", "placement2" }.Contains(claim.Value)); - #endregion /// diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs index 43f86007..d44f47f2 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs @@ -57,9 +57,6 @@ namespace BMA.EHR.Placement.Service.Controllers private string? FullName => _httpContextAccessor?.HttpContext?.User?.FindFirst("name")?.Value; private string? token => _httpContextAccessor.HttpContext.Request.Headers["Authorization"]; - //private bool? PlacementAdmin => _httpContextAccessor?.HttpContext?.User?.IsInRole("placement"); - private bool? PlacementAdmin => _httpContextAccessor?.HttpContext?.User?.Claims?.Any(claim => new[] { "placement", "placement1", "placement2" }.Contains(claim.Value)); - #endregion [HttpGet] diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs index f1c56e0c..020e0e5e 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs @@ -57,9 +57,6 @@ namespace BMA.EHR.Placement.Service.Controllers private string? FullName => _httpContextAccessor?.HttpContext?.User?.FindFirst("name")?.Value; private string? token => _httpContextAccessor?.HttpContext?.Request.Headers["Authorization"]; - //private bool? PlacementAdmin => _httpContextAccessor?.HttpContext?.User?.IsInRole("placement1"); - private bool? PlacementAdmin => _httpContextAccessor?.HttpContext?.User?.Claims?.Any(claim => new[] { "placement", "placement1", "placement2" }.Contains(claim.Value)); - #endregion /// @@ -80,13 +77,12 @@ namespace BMA.EHR.Placement.Service.Controllers { return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden); } - var rootId = ""; var child1Id = ""; var child2Id = ""; var child3Id = ""; var child4Id = ""; - var apiUrl = $"{_configuration["API"]}/org/profile/keycloak/position-act-main"; + var apiUrl = $"{_configuration["API"]}/org/profile/keycloak/position"; using (var client = new HttpClient()) { client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", "")); @@ -94,58 +90,60 @@ namespace BMA.EHR.Placement.Service.Controllers var _req = new HttpRequestMessage(HttpMethod.Get, apiUrl); var _res = await client.SendAsync(_req); var _result = await _res.Content.ReadAsStringAsync(); - if (_res.IsSuccessStatusCode) - { - var org = JsonConvert.DeserializeObject(_result); - rootId = org.result.rootId == null ? "" : org.result.rootId; - child1Id = org.result.child1Id == null ? "" : org.result.child1Id; - child2Id = org.result.child2Id == null ? "" : org.result.child2Id; - child3Id = org.result.child3Id == null ? "" : org.result.child3Id; - child4Id = org.result.child4Id == null ? "" : org.result.child4Id; - var placementOfficers = await _context.PlacementOfficers.AsQueryable() - .OrderByDescending(x => x.CreatedAt) - .Where(x => org.result.isOfficer == true ? true : (rootId == "" ? true : (child1Id == "" ? x.rootOldId == rootId : (child2Id == "" ? x.child1OldId == child1Id : (child3Id == "" ? x.child2OldId == child2Id : (child4Id == "" ? x.child3OldId == child3Id : x.child4OldId == child4Id)))))) - .Select(p => new - { - p.Id, - p.citizenId, - p.profileId, - p.prefix, - p.firstName, - p.lastName, - p.rootOld, - p.rootOldId, - p.rootShortNameOld, - p.child1Old, - p.child1OldId, - p.child1ShortNameOld, - p.child2Old, - p.child2OldId, - p.child2ShortNameOld, - p.child3Old, - p.child3OldId, - p.child3ShortNameOld, - p.child4Old, - p.child4OldId, - p.child4ShortNameOld, - p.PositionOld, - p.posMasterNoOld, - p.posTypeOldId, - p.posTypeNameOld, - p.posLevelOldId, - p.posLevelNameOld, - p.CreatedAt, - p.Reason, - p.Status, - p.DateStart, - p.DateEnd, - p.Organization, - p.OrganizationPositionOld, - p.IsActive, - }) - .ToListAsync(); - } + var org = JsonConvert.DeserializeObject(_result); + + if (org == null || org.result == null) + return Error("ไม่พบหน่วยงานของผู้ใช้งานคนนี้", 404); + rootId = org.result.rootId == null ? "" : org.result.rootId; + child1Id = org.result.child1Id == null ? "" : org.result.child1Id; + child2Id = org.result.child2Id == null ? "" : org.result.child2Id; + child3Id = org.result.child3Id == null ? "" : org.result.child3Id; + child4Id = org.result.child4Id == null ? "" : org.result.child4Id; + + var placementOfficers = await _context.PlacementOfficers.AsQueryable() + .OrderByDescending(x => x.CreatedAt) + .Where(x => rootId == "" ? true : (child1Id == "" ? x.rootOldId == rootId : (child2Id == "" ? x.child1OldId == child1Id : (child3Id == "" ? x.child2OldId == child2Id : (child4Id == "" ? x.child3OldId == child3Id : x.child4OldId == child4Id))))) + .Select(p => new + { + p.Id, + p.citizenId, + p.profileId, + p.prefix, + p.firstName, + p.lastName, + p.rootOld, + p.rootOldId, + p.rootShortNameOld, + p.child1Old, + p.child1OldId, + p.child1ShortNameOld, + p.child2Old, + p.child2OldId, + p.child2ShortNameOld, + p.child3Old, + p.child3OldId, + p.child3ShortNameOld, + p.child4Old, + p.child4OldId, + p.child4ShortNameOld, + p.PositionOld, + p.posMasterNoOld, + p.posTypeOldId, + p.posTypeNameOld, + p.posLevelOldId, + p.posLevelNameOld, + p.CreatedAt, + p.Reason, + p.Status, + p.DateStart, + p.DateEnd, + p.Organization, + p.OrganizationPositionOld, + p.IsActive, + }) + .ToListAsync(); + return Success(placementOfficers); } } @@ -646,7 +644,8 @@ namespace BMA.EHR.Placement.Service.Controllers { result.Add(r); string? _null = null; - result.Add(new { + result.Add(new + { No = _null, FullName = r.RemarkHorizontal, PositionName = _null, diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs index be777e86..0a5202af 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs @@ -58,9 +58,6 @@ namespace BMA.EHR.Placement.Service.Controllers private string? FullName => _httpContextAccessor?.HttpContext?.User?.FindFirst("name")?.Value; private string? token => _httpContextAccessor?.HttpContext?.Request.Headers["Authorization"]; - //private bool? PlacementAdmin => _httpContextAccessor?.HttpContext?.User?.IsInRole("placement1"); - private bool? PlacementAdmin => _httpContextAccessor?.HttpContext?.User?.Claims?.Any(claim => new[] { "placement", "placement1", "placement2" }.Contains(claim.Value)); - #endregion /// @@ -182,28 +179,7 @@ namespace BMA.EHR.Placement.Service.Controllers p.profileId, }) .ToListAsync(); - // if (PlacementAdmin == true) - // placementReceives.Where(x => x.Status.Trim().ToUpper().Contains("PENDING")); - - // if (keyword != "") - // { - // var data = placementReceives.Where(x => - // (x.prefix != null && x.prefix.Contains(keyword)) || - // (x.firstName != null && x.firstName.Contains(keyword)) || - // (x.lastName != null && x.lastName.Contains(keyword)) || - // (x.citizenId != null && x.citizenId.Contains(keyword)) || - // (x.root != null && x.root.Contains(keyword)) || - // (x.nodeName != null && x.nodeName.Contains(keyword)) || - // (x.nodeShortName != null && x.nodeShortName.Contains(keyword))) - // .OrderByDescending(x => x.CreatedAt) - // .Skip((page - 1) * pageSize) - // .Take(pageSize) - // .ToList(); - - // placementReceives = data; - // } return Success(placementReceives); - // } } /// @@ -999,7 +975,8 @@ namespace BMA.EHR.Placement.Service.Controllers { result.Add(r); string? _null = null; - result.Add(new { + result.Add(new + { No = _null, FullName = r.RemarkHorizontal, Education = _null, diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementRelocationController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementRelocationController.cs index 7a68f54c..6f27a62b 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementRelocationController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementRelocationController.cs @@ -46,9 +46,6 @@ namespace BMA.EHR.Placement.Service.Controllers private string? FullName => _httpContextAccessor?.HttpContext?.User?.FindFirst("name")?.Value; - //private bool? PlacementAdmin => _httpContextAccessor?.HttpContext?.User?.IsInRole("placement1"); - private bool? PlacementAdmin => _httpContextAccessor?.HttpContext?.User?.Claims?.Any(claim => new[] { "placement", "placement1", "placement2" }.Contains(claim.Value)); - #endregion /// @@ -103,8 +100,6 @@ namespace BMA.EHR.Placement.Service.Controllers p.CreatedAt, }) .ToListAsync(); - if (PlacementAdmin == true) - placementRelocations.Where(x => x.Status.Trim().ToUpper().Contains("PENDING")); return Success(placementRelocations); } diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs index c3621a21..d77aceff 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs @@ -58,9 +58,6 @@ namespace BMA.EHR.Placement.Service.Controllers private string? FullName => _httpContextAccessor?.HttpContext?.User?.FindFirst("name")?.Value; private string? token => _httpContextAccessor?.HttpContext?.Request.Headers["Authorization"]; - //private bool? PlacementAdmin => _httpContextAccessor?.HttpContext?.User?.IsInRole("placement1"); - private bool? PlacementAdmin => _httpContextAccessor?.HttpContext?.User?.Claims?.Any(claim => new[] { "placement", "placement1", "placement2" }.Contains(claim.Value)); - #endregion /// @@ -107,7 +104,7 @@ namespace BMA.EHR.Placement.Service.Controllers var placementRepatriations = await _context.PlacementRepatriations.AsQueryable() .OrderByDescending(x => x.CreatedAt) - .Where(x => PlacementAdmin == true ? true : (rootId == "" ? true : (child1Id == "" ? x.rootOldId == rootId : (child2Id == "" ? x.child1OldId == child1Id : (child3Id == "" ? x.child2OldId == child2Id : (child4Id == "" ? x.child3OldId == child3Id : x.child4OldId == child4Id)))))) + .Where(x => rootId == "" ? true : (child1Id == "" ? x.rootOldId == rootId : (child2Id == "" ? x.child1OldId == child1Id : (child3Id == "" ? x.child2OldId == child2Id : (child4Id == "" ? x.child3OldId == child3Id : x.child4OldId == child4Id))))) .Select(p => new { p.Id, diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs index 0e4c5f6e..23e2c41f 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs @@ -57,9 +57,6 @@ namespace BMA.EHR.Placement.Service.Controllers private string? FullName => _httpContextAccessor?.HttpContext?.User?.FindFirst("name")?.Value; private string? token => _httpContextAccessor?.HttpContext?.Request.Headers["Authorization"]; - //private bool? PlacementAdmin => _httpContextAccessor?.HttpContext?.User?.IsInRole("placement1"); - private bool? PlacementAdmin => _httpContextAccessor?.HttpContext?.User?.Claims?.Any(claim => new[] { "placement", "placement1", "placement2" }.Contains(claim.Value)); - #endregion /// @@ -195,7 +192,7 @@ namespace BMA.EHR.Placement.Service.Controllers var placementTransfers = await _context.PlacementTransfers.AsQueryable() .OrderByDescending(x => x.CreatedAt) - .Where(x => PlacementAdmin == true ? true : (rootId == "" ? true : (child1Id == "" ? x.rootOldId == rootId : (child2Id == "" ? x.child1OldId == child1Id : (child3Id == "" ? x.child2OldId == child2Id : (child4Id == "" ? x.child3OldId == child3Id : x.child4OldId == child4Id)))))) + .Where(x => rootId == "" ? true : (child1Id == "" ? x.rootOldId == rootId : (child2Id == "" ? x.child1OldId == child1Id : (child3Id == "" ? x.child2OldId == child2Id : (child4Id == "" ? x.child3OldId == child3Id : x.child4OldId == child4Id))))) .Select(p => new { p.Id,