Merge branch 'develop' into develop-Bright

BMA.EHR.Insignia/Controllers/InsigniaManageController.cs

@@ -307,7 +307,7 @@ namespace BMA.EHR.Insignia.Service.Controllers
         [HttpPost("org")]
         public async Task<ActionResult<ResponseObject>> PostOrganization([FromBody] InsigniaManageOrganizationRequest req)
         {
-            var getPermission = await _permission.GetPermissionAPIAsync("CREATE", "SYS_INSIGNIA_ALLOCATE");
+            var getPermission = await _permission.GetPermissionAPIAsync("UPDATE", "SYS_INSIGNIA_ALLOCATE");
             var jsonData = JsonConvert.DeserializeObject<JObject>(getPermission);
             if (jsonData["status"]?.ToString() != "200")
             {
@@ -370,7 +370,7 @@ namespace BMA.EHR.Insignia.Service.Controllers
         [HttpDelete("org/{insigniaManageOrgId:length(36)}")]
         public async Task<ActionResult<ResponseObject>> DeleteOrganization(Guid insigniaManageOrgId)
         {
-            var getPermission = await _permission.GetPermissionAPIAsync("DELETE", "SYS_INSIGNIA_ALLOCATE");
+            var getPermission = await _permission.GetPermissionAPIAsync("UPDATE", "SYS_INSIGNIA_ALLOCATE");
             var jsonData = JsonConvert.DeserializeObject<JObject>(getPermission);
             if (jsonData["status"]?.ToString() != "200")
             {

BMA.EHR.Insignia/Controllers/InsigniaRequestController.cs

@@ -1595,6 +1595,148 @@ namespace BMA.EHR.Insignia.Service.Controllers
             return Success(_insigniaNoteProfiles);
         }
         
+        /// <summary>
+        /// list รายชื่อบันทึกผลการได้รับพระราชทานเครื่องราชอิสริยสภรณ์/การจ่ายใบกำกับ ไม่ validate สิทธิ์
+        /// </summary>
+        /// <returns></returns>
+        /// <response code="200"></response>
+        /// <response code="400">ค่าตัวแปรที่ส่งมาไม่ถูกต้อง</response>
+        /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
+        /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
+        [HttpPost("note-list/search")]
+        public async Task<ActionResult<ResponseObject>> GetListNoteProfileNonValidateRole([FromBody] InsigniaNoteSearchRequest req)
+        {
+            var getPermission = await _permission.GetPermissionAPIAsync("LIST", "SYS_INSIGNIA_RECORD");
+            var jsonData = JsonConvert.DeserializeObject<JObject>(getPermission);
+            if (jsonData["status"]?.ToString() != "200")
+            {
+                return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
+            }
+            var insigniaNote = await _context.InsigniaNotes
+                                    .FirstOrDefaultAsync(x => x.Id == req.InsigniaNoteId);
+            if (insigniaNote == null)
+                return Error(GlobalMessages.InsigniaRequestNotFound);
+            var insigniaType = await _context.InsigniaTypes
+                                    .FirstOrDefaultAsync(x => x.Id == req.InsigniaTypeId);
+            if (insigniaType == null)
+                return Error(GlobalMessages.InsigniaTypeNotFound);
+
+            var rawNoteProfiles = await _context.InsigniaNoteProfiles
+                                        .Where(x => x.InsigniaNote == insigniaNote)
+                                        .Where(x => x.RequestInsignia.InsigniaType == insigniaType)
+                                        .Where(x => req.InsigniaId == null ? x.RequestInsignia != null : (x.RequestInsignia.Id == req.InsigniaId))
+                                        .Select(x => new
+                                        {
+                                            Id = x.Id,
+                                            Profile = _userProfileRepository.GetOfficerProfileById(x.ProfileId.Value, AccessToken),
+                                            OcId = Guid.Parse("e8493cd1-d371-402e-add6-566e68d5d1b3"), // TODO: ต้องมาแก้ไข
+                                            RequestInsignia = x.RequestInsignia.Name,
+                                            RequestInsigniaId = x.RequestInsignia.Id,
+                                            RequestInsigniaShortName = x.RequestInsignia.ShortName,
+                                            DateReceive = x.DateReceive,
+                                            OrganizationOrganizationSend = _userProfileRepository.GetOc(Guid.Parse("e8493cd1-d371-402e-add6-566e68d5d1b3"), 0, AccessToken).Root, //hardcode
+                                            OrganizationOrganizationReceive = _userProfileRepository.GetOc(Guid.Parse("e8493cd1-d371-402e-add6-566e68d5d1b3"), 0, AccessToken).Root, //hardcode
+                                            Status = x.Status,
+                                            Issue = x.Issue,
+                                            Date = x.Date,
+                                            VolumeNo = x.VolumeNo,
+                                            Section = x.Section,
+                                            Page = x.Page,
+                                            No = x.No,
+                                            DatePayment = x.DatePayment,
+                                            TypePayment = x.TypePayment,
+                                            Address = x.Address,
+                                            Number = x.Number,
+                                            Salary = x.Salary,
+                                            DateReceiveInsignia = x.DateReceiveInsignia,
+                                            DocReceiveInsignia = x.DocReceiveInsignia == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : x.DocReceiveInsignia.Id,
+                                            OrgReceiveInsignia = _userProfileRepository.GetOc(Guid.Parse("e8493cd1-d371-402e-add6-566e68d5d1b3"), 0, AccessToken).Root, //hardcode
+                                            DateReturnInsignia = x.DateReturnInsignia,
+                                            DocReturnInsignia = x.DocReturnInsignia == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : x.DocReturnInsignia.Id,
+                                            OrgReturnInsignia = _userProfileRepository.GetOc(Guid.Parse("e8493cd1-d371-402e-add6-566e68d5d1b3"), 0, AccessToken).Root, //hardcode
+                                        })
+                                        .ToListAsync();
+
+            var insigniaNoteProfiles = rawNoteProfiles
+                                       .Select(x => new
+                                       {
+                                           Id = x.Id,
+                                           Prefix = x.Profile == null ? "" : x.Profile.Prefix,
+                                           Position = x.Profile == null ? "" : x.Profile.Position,
+                                           ProfileType = x.Profile == null ? "" : x.Profile.ProfileType,
+                                           x.OcId,
+                                           CitizenId = x.Profile == null ? "" : x.Profile.CitizenId,
+                                           FullName = x.Profile == null ? "" : $"{x.Profile.Prefix}{x.Profile.FirstName} {x.Profile.LastName}",
+                                           RequestInsignia = x.RequestInsignia,
+                                           RequestInsigniaId = x.RequestInsigniaId,
+                                           RequestInsigniaShortName = x.RequestInsigniaShortName,
+                                           DateReceive = x.DateReceive,
+                                           OrganizationOrganizationSend = x.OrganizationOrganizationSend,
+                                           OrganizationOrganizationReceive = x.OrganizationOrganizationReceive,
+                                           Status = x.Status,
+                                           Issue = x.Issue,
+                                           Date = x.Date,
+                                           VolumeNo = x.VolumeNo,
+                                           Section = x.Section,
+                                           Page = x.Page,
+                                           No = x.No,
+                                           DatePayment = x.DatePayment,
+                                           TypePayment = x.TypePayment,
+                                           Address = x.Address,
+                                           Number = x.Number,
+                                           Salary = x.Salary,
+                                           DateReceiveInsignia = x.DateReceiveInsignia,
+                                           DocReceiveInsignia = x.DocReceiveInsignia,
+                                           OrgReceiveInsignia = x.OrgReceiveInsignia,
+                                           DateReturnInsignia = x.DateReturnInsignia,
+                                           DocReturnInsignia = x.DocReturnInsignia,
+                                           OrgReturnInsignia = x.OrgReturnInsignia,
+                                       })
+                                       .ToList();
+
+            var _insigniaNoteProfiles = new List<dynamic>();
+            foreach (var insigniaNoteProfile in insigniaNoteProfiles)
+            {
+                _insigniaNoteProfiles.Add(
+                    new
+                    {
+                        insigniaNoteProfile.Id,
+                        insigniaNoteProfile.Prefix,
+                        insigniaNoteProfile.Position,
+                        insigniaNoteProfile.CitizenId,
+                        insigniaNoteProfile.ProfileType,
+                        insigniaNoteProfile.FullName,
+                        insigniaNoteProfile.RequestInsignia,
+                        insigniaNoteProfile.RequestInsigniaId,
+                        insigniaNoteProfile.RequestInsigniaShortName,
+                        insigniaNoteProfile.DateReceive,
+                        insigniaNoteProfile.OrganizationOrganizationSend,
+                        insigniaNoteProfile.OrganizationOrganizationReceive,
+                        insigniaNoteProfile.Status,
+                        insigniaNoteProfile.Issue,
+                        insigniaNoteProfile.Date,
+                        insigniaNoteProfile.VolumeNo,
+                        insigniaNoteProfile.Section,
+                        insigniaNoteProfile.Page,
+                        insigniaNoteProfile.No,
+                        insigniaNoteProfile.DatePayment,
+                        insigniaNoteProfile.TypePayment,
+                        insigniaNoteProfile.Address,
+                        insigniaNoteProfile.Number,
+                        insigniaNoteProfile.Salary,
+                        insigniaNoteProfile.DateReceiveInsignia,
+                        DocReceiveInsignia = insigniaNoteProfile.DocReceiveInsignia == Guid.Parse("00000000-0000-0000-0000-000000000000") ? null : await _documentService.ImagesPath(insigniaNoteProfile.DocReceiveInsignia),
+                        insigniaNoteProfile.OrgReceiveInsignia,
+                        insigniaNoteProfile.DateReturnInsignia,
+                        DocReturnInsignia = insigniaNoteProfile.DocReturnInsignia == Guid.Parse("00000000-0000-0000-0000-000000000000") ? null : await _documentService.ImagesPath(insigniaNoteProfile.DocReturnInsignia),
+                        insigniaNoteProfile.OrgReturnInsignia,
+                    }
+                );
+            }
+
+            return Success(_insigniaNoteProfiles);
+        }
+
         /// <summary>
         /// Get รายชื่อบันทึกผลการได้รับพระราชทานเครื่องราชอิสริยสภรณ์/การจ่ายใบกำกับ
         /// </summary>