fix: insignia + leave Error

.github/workflows/release_leave.yaml

@@ -53,7 +53,7 @@ jobs:
         with:
           context: .
           platforms: linux/amd64
-                  file: BMA.EHR.Leave.Service/Dockerfile
+          file: BMA.EHR.Leave/Dockerfile
           push: true
           tags: ${{env.REGISTRY}}/${{env.IMAGE_NAME}}:${{ steps.gen_ver.outputs.image_ver }},${{env.REGISTRY}}/${{env.IMAGE_NAME}}:latest
 

.idea/.idea.BMA.EHR.Solution/.idea/.gitignore

@@ -1,13 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Rider ignored files
-/contentModel.xml
-/.idea.BMA.EHR.Solution.iml
-/modules.xml
-/projectSettingsUpdater.xml
-# Editor-based HTTP Client requests
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml

.idea/.idea.BMA.EHR.Solution/.idea/.name

@@ -1 +0,0 @@
-BMA.EHR.Solution

.idea/.idea.BMA.EHR.Solution/.idea/encodings.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding" addBOMForNewFiles="with BOM under Windows, with no BOM otherwise" />
-</project>

.idea/.idea.BMA.EHR.Solution/.idea/indexLayout.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="UserContentModel">
-    <attachedFolders />
-    <explicitIncludes />
-    <explicitExcludes />
-  </component>
-</project>

.idea/.idea.BMA.EHR.Solution/.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>

BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs

@@ -126,7 +126,7 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
 
         public async Task<List<LeaveRequest>> GetLeaveRequestByYearAsync(int year)
         {
-            var data = await _dbContext.Set<LeaveRequest>().AsQueryable()
+            var data = await _dbContext.Set<LeaveRequest>().AsQueryable().AsNoTracking()
                             .Include(x => x.Type)
                             .Where(x => x.LeaveStartDate.Year == year)
                             .Where(x => x.LeaveStatus != "REJECT" && x.LeaveStatus != "DELETE")
@@ -137,7 +137,7 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
 
         public async Task<List<LeaveRequest>> GetLeaveRequestByUserIdAsync(Guid keycloakUserId, int year, Guid type, string status)
         {
-            var rawData = _dbContext.Set<LeaveRequest>().AsQueryable()
+            var rawData = _dbContext.Set<LeaveRequest>().AsQueryable().AsNoTracking()
                                     .Include(x => x.Type)
                                     .Where(x => x.KeycloakUserId == keycloakUserId);
 
@@ -155,7 +155,7 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
 
         public async Task<List<LeaveRequest>> GetLeaveRequestForAdminAsync(int year, Guid type, string status, DateTime startDate, DateTime endDate)
         {
-            var rawData = _dbContext.Set<LeaveRequest>()
+            var rawData = _dbContext.Set<LeaveRequest>().AsNoTracking()
                                     .Include(x => x.Type)
                                     .Where(x => x.LeaveStatus != "DRAFT")
                                     .AsQueryable();
@@ -182,14 +182,15 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
 
         public async Task<double> GetRestDayTotalByYearForUserAsync(Guid keycloakUserId, int year)
         {
-            var leaveType = await _dbContext.Set<LeaveType>().AsQueryable().FirstOrDefaultAsync(l => l.Code.Trim().ToUpper() == "LV-005");
+            var leaveType = await _dbContext.Set<LeaveType>().AsQueryable().AsNoTracking()
+                                        .FirstOrDefaultAsync(l => l.Code.Trim().ToUpper() == "LV-005");
 
             if (leaveType == null)
             {
                 throw new Exception("ไม่พบข้อมูลประเภทการลาพักผ่อน โปรดติดต่อผู้ดูและระบบ");
             }
 
-            var data = _dbContext.Set<LeaveRequest>().AsQueryable()
+            var data = _dbContext.Set<LeaveRequest>().AsQueryable().AsNoTracking()
                             .Include(x => x.Type)
                             .Where(x => x.KeycloakUserId == keycloakUserId)
                             .Where(x => x.Type.Id == leaveType.Id)
@@ -201,7 +202,7 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
 
         public async Task<double> GetSumLeaveByTypeForUserAsync(Guid keycloakUserId, Guid leaveTypeId, int year)
         {
-            var data = await _dbContext.Set<LeaveRequest>().AsQueryable()
+            var data = await _dbContext.Set<LeaveRequest>().AsQueryable().AsNoTracking()
                             .Include(x => x.Type)
                             .Where(x => x.KeycloakUserId == keycloakUserId)
                             .Where(x => x.Type.Id == leaveTypeId)
@@ -214,7 +215,7 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
 
         public async Task<DateTime?> GetLeaveLastByTypeForUserAsync(Guid keycloakUserId, Guid leaveTypeId)
         {
-            var data = await _dbContext.Set<LeaveRequest>().AsQueryable()
+            var data = await _dbContext.Set<LeaveRequest>().AsQueryable().AsNoTracking()
                             .Include(x => x.Type)
                             .Where(x => x.KeycloakUserId == keycloakUserId)
                             .Where(x => x.Type.Id == leaveTypeId)
@@ -228,7 +229,7 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
 
         public async Task<LeaveRequest?> GetLastLeaveRequestByTypeForUserAsync(Guid keycloakUserId, Guid leaveTypeId)
         {
-            var data = await _dbContext.Set<LeaveRequest>().AsQueryable()
+            var data = await _dbContext.Set<LeaveRequest>().AsQueryable().AsNoTracking()
                             .Include(x => x.Type)
                             .Where(x => x.KeycloakUserId == keycloakUserId)
                             .Where(x => x.Type.Id == leaveTypeId)
@@ -241,7 +242,7 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
 
         public async Task<List<LeaveRequest>> GetCancelLeaveRequestForAdminAsync(int year, Guid type, string status)
         {
-            var rawData = _dbContext.Set<LeaveRequest>()
+            var rawData = _dbContext.Set<LeaveRequest>().AsNoTracking()
                                     .Include(x => x.Type)
                                     .Where(x => x.LeaveStatus == "DELETE")
                                     .AsQueryable();
@@ -603,7 +604,7 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
 
         public async Task<double> GetSumSendLeaveByTypeForUserAsync(Guid keycloakUserId, Guid leaveTypeId, int year)
         {
-            var data = await _dbContext.Set<LeaveRequest>().AsQueryable()
+            var data = await _dbContext.Set<LeaveRequest>().AsQueryable().AsNoTracking()
                             .Include(x => x.Type)
                             .Where(x => x.KeycloakUserId == keycloakUserId)
                             .Where(x => x.Type.Id == leaveTypeId)
@@ -615,7 +616,7 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
 
         public async Task<double> GetSumApproveLeaveByTypeForUserAsync(Guid keycloakUserId, Guid leaveTypeId, int year)
         {
-            var data = await _dbContext.Set<LeaveRequest>().AsQueryable()
+            var data = await _dbContext.Set<LeaveRequest>().AsQueryable().AsNoTracking()
                             .Include(x => x.Type)
                             .Where(x => x.KeycloakUserId == keycloakUserId)
                             .Where(x => x.Type.Id == leaveTypeId)
@@ -631,7 +632,7 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
 
         public async Task<double> GetSumApproveLeaveByRangeForUser(Guid keycloakUserId, DateTime startDate, DateTime endDate)
         {
-            var data = await _dbContext.Set<LeaveRequest>().AsQueryable()
+            var data = await _dbContext.Set<LeaveRequest>().AsQueryable().AsNoTracking()
                             .Include(x => x.Type)
                             .Where(x => x.KeycloakUserId == keycloakUserId)
                             .Where(x => x.LeaveStartDate.Date >= startDate.Date && x.LeaveStartDate.Date <= endDate.Date)
@@ -688,7 +689,7 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
 
         public async Task<double> GetSumApproveLeaveByTypeAndRangeForUser(Guid keycloakUserId, Guid leaveTypeId, DateTime startDate, DateTime endDate)
         {
-            var data = await _dbContext.Set<LeaveRequest>().AsQueryable()
+            var data = await _dbContext.Set<LeaveRequest>().AsQueryable().AsNoTracking()
                             .Include(x => x.Type)
                             .Where(x => x.KeycloakUserId == keycloakUserId)
                             .Where(x => x.Type.Id == leaveTypeId)
@@ -704,7 +705,7 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
 
         public async Task<int> GetCountApproveLeaveByTypeAndRangeForUser(Guid keycloakUserId, Guid leaveTypeId, DateTime startDate, DateTime endDate)
         {
-            var data = await _dbContext.Set<LeaveRequest>().AsQueryable()
+            var data = await _dbContext.Set<LeaveRequest>().AsQueryable().AsNoTracking()
                             .Include(x => x.Type)
                             .Where(x => x.KeycloakUserId == keycloakUserId)
                             .Where(x => x.Type.Id == leaveTypeId)
@@ -717,7 +718,7 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
 
         public async Task<double> GetSumRejectLeaveByTypeForUserAsync(Guid keycloakUserId, Guid leaveTypeId, int year)
         {
-            var data = await _dbContext.Set<LeaveRequest>().AsQueryable()
+            var data = await _dbContext.Set<LeaveRequest>().AsQueryable().AsNoTracking()
                             .Include(x => x.Type)
                             .Where(x => x.KeycloakUserId == keycloakUserId)
                             .Where(x => x.Type.Id == leaveTypeId)
@@ -752,7 +753,7 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
             var leaveStatus = new List<string>() { "NEW", "PENDING", "APPROVE" };
             if (range == "ALL")
             {
-                var data = await _dbContext.Set<LeaveRequest>().AsQueryable()
+                var data = await _dbContext.Set<LeaveRequest>().AsQueryable().AsNoTracking()
                                             .Include(x => x.Type)
                                             //.Where(x => x.LeaveRange == "ALL")
                                             .Where(x => x.KeycloakUserId == keycloakUserId)
@@ -764,7 +765,7 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
             }
             else
             {
-                var data = await _dbContext.Set<LeaveRequest>().AsQueryable()
+                var data = await _dbContext.Set<LeaveRequest>().AsQueryable().AsNoTracking()
                                             .Include(x => x.Type)
                                             .Where(x => x.LeaveRange == range)
                                             .Where(x => x.KeycloakUserId == keycloakUserId)
@@ -791,7 +792,7 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
 
         public async Task<LeaveRequest?> GetLeavePeriodAsync(Guid keycloakUserId, DateTime date)
         {
-            var data = await _dbContext.Set<LeaveRequest>().AsQueryable()
+            var data = await _dbContext.Set<LeaveRequest>().AsQueryable().AsNoTracking()
                                 .Include(x => x.Type)
                                 .Where(x => x.KeycloakUserId == keycloakUserId)
                                 .Where(x => x.LeaveStatus == "APPROVE")

BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveTypeRepository.cs

@@ -57,7 +57,7 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
 
         public async Task<LeaveType?> GetLeaveTypeByCodeAsync(string code)
         {
-            return await _dbContext.Set<LeaveType>().FirstOrDefaultAsync(x => x.Code == code);
+            return await _dbContext.Set<LeaveType>().AsNoTracking().FirstOrDefaultAsync(x => x.Code == code);
         }
 
     }

BMA.EHR.Insignia/Controllers/InsigniaRequestController.cs

@@ -1120,6 +1120,26 @@ namespace BMA.EHR.Insignia.Service.Controllers
                 LastUpdateFullName = FullName ?? "System Administrator",
                 LastUpdateUserId = UserId ?? "",
                 LastUpdatedAt = DateTime.Now,
+
+                // Add Information for reused in API Call
+                ProfileType = profile.ProfileType ?? "officer",
+                Prefix = profile.Prefix,
+                FirstName = profile.FirstName,
+                LastName = profile.LastName,
+                CitizenId = profile.CitizenId,
+                BirthDate = profile.BirthDate,
+                DateAppoint = profile.DateAppoint,
+                Position = profile.Position,
+                Gender = profile.Gender,
+                PosTypeName = profile.PosType!.PosTypeName,
+                PosLevelName = profile.PosLevel!.PosLevelName,
+                PosNo = profile.ProfileSalary == null || profile.ProfileSalary.Count == 0 ? "" :
+                        profile.ProfileSalary.OrderByDescending(x => x.Order).FirstOrDefault().PosNo,
+                Amount = profile.ProfileSalary == null || profile.ProfileSalary.Count == 0 ? 0 :
+                         profile.ProfileSalary.OrderByDescending(x => x.Order).FirstOrDefault().Amount,
+                PositionSalaryAmount = profile.ProfileSalary == null || profile.ProfileSalary.Count == 0 ? 0 :
+                         profile.ProfileSalary.OrderByDescending(x => x.Order).FirstOrDefault().PositionSalaryAmount,
+                LastInsigniaName = ""
             });
 
             await _context.SaveChangesAsync();

BMA.EHR.Leave/BMA.EHR.Leave.csproj

@@ -9,6 +9,7 @@
 		<GenerateDocumentationFile>True</GenerateDocumentationFile>
 		<DockerfileContext>.</DockerfileContext>
 		<RootNamespace>BMA.EHR.Leave.Service</RootNamespace>
+		<AssemblyName>BMA.EHR.Leave</AssemblyName>
 		<NoWarn>$(NoWarn);1591</NoWarn>
 	</PropertyGroup>
 

BMA.EHR.Leave/Dockerfile

@@ -11,17 +11,17 @@ WORKDIR /src
 COPY ["BMA.EHR.Domain/BMA.EHR.Domain.csproj", "BMA.EHR.Domain/"]
 COPY ["BMA.EHR.Application/BMA.EHR.Application.csproj", "BMA.EHR.Application/"]
 COPY ["BMA.EHR.Infrastructure/BMA.EHR.Infrastructure.csproj", "BMA.EHR.Infrastructure/"]
-COPY ["BMA.EHR.Leave.Service/BMA.EHR.Leave.Service.csproj", "BMA.EHR.Leave.Service/"]
+COPY ["BMA.EHR.Leave/BMA.EHR.Leave.csproj", "BMA.EHR.Leave/"]
 
-RUN dotnet restore  "BMA.EHR.Leave.Service/BMA.EHR.Leave.Service.csproj" 
+RUN dotnet restore  "BMA.EHR.Leave/BMA.EHR.Leave.csproj" 
 COPY . .
-WORKDIR "/src/BMA.EHR.Leave.Service"
+WORKDIR "/src/BMA.EHR.Leave"
-RUN dotnet build "BMA.EHR.Leave.Service.csproj"  -c Release -o /app/build
+RUN dotnet build "BMA.EHR.Leave.csproj"  -c Release -o /app/build
 
 FROM build AS publish
-RUN dotnet publish "BMA.EHR.Leave.Service.csproj" -c Release -o /app/publish /p:UseAppHost=false
+RUN dotnet publish "BMA.EHR.Leave.csproj" -c Release -o /app/publish /p:UseAppHost=false
 
 FROM base AS final
 WORKDIR /app
 COPY --from=publish /app/publish .
-ENTRYPOINT ["dotnet", "BMA.EHR.Leave.Service.dll"]
+ENTRYPOINT ["dotnet", "BMA.EHR.Leave.dll"]