From 9f3388eb2083aabd220e905183f280a5d64d4209 Mon Sep 17 00:00:00 2001
From: moss <>
Date: Wed, 7 May 2025 15:19:41 +0700
Subject: [PATCH] save retire

---
 .../RetirementEmployeeRepository.cs            | 18 ++++--------------
 .../Repositories/RetirementRepository.cs       | 18 ++++--------------
 2 files changed, 8 insertions(+), 28 deletions(-)

diff --git a/BMA.EHR.Application/Repositories/RetirementEmployeeRepository.cs b/BMA.EHR.Application/Repositories/RetirementEmployeeRepository.cs
index 410e8dfd..0144117b 100644
--- a/BMA.EHR.Application/Repositories/RetirementEmployeeRepository.cs
+++ b/BMA.EHR.Application/Repositories/RetirementEmployeeRepository.cs
@@ -143,7 +143,6 @@ namespace BMA.EHR.Application.Repositories
             try
             {
                 var data = await _dbContext.Set<RetirementResignEmployee>().AsQueryable()
-                                .AsNoTracking()
                                 .Include(x => x.Approvers)
                                 .FirstOrDefaultAsync(x => x.Id == id);
 
@@ -155,15 +154,6 @@ namespace BMA.EHR.Application.Repositories
             }
 
         }
-        public async Task<RetirementResignEmployee?> GetByIdWithTrackingAsync(Guid id)
-        {
-            var data = await _dbContext.Set<RetirementResignEmployee>().AsQueryable()
-                                //.AsNoTracking()
-                                .Include(x => x.Approvers)
-                                .FirstOrDefaultAsync(x => x.Id == id);
-
-            return data;
-        }
         public async Task OfficerApproveRetirementResignEmployee(Guid id)
         {
             var rawData = await GetByIdAsync(id);
@@ -200,7 +190,7 @@ namespace BMA.EHR.Application.Repositories
             var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId);
 
 
-            var rawData = await GetByIdWithTrackingAsync(id);
+            var rawData = await GetByIdAsync(id);
             if (rawData == null)
             {
                 throw new Exception(GlobalMessages.DataNotFound);
@@ -312,7 +302,7 @@ namespace BMA.EHR.Application.Repositories
             var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId);
 
 
-            var rawData = await GetByIdWithTrackingAsync(id);
+            var rawData = await GetByIdAsync(id);
             if (rawData == null)
             {
                 throw new Exception(GlobalMessages.DataNotFound);
@@ -398,7 +388,7 @@ namespace BMA.EHR.Application.Repositories
             // Get UserId from token
             var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId);
 
-            var rawData = await GetByIdWithTrackingAsync(id);
+            var rawData = await GetByIdAsync(id);
             if (rawData == null)
             {
                 throw new Exception(GlobalMessages.DataNotFound);
@@ -474,7 +464,7 @@ namespace BMA.EHR.Application.Repositories
             // Get UserId from token
             var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId);
 
-            var rawData = await GetByIdWithTrackingAsync(id);
+            var rawData = await GetByIdAsync(id);
             if (rawData == null)
             {
                 throw new Exception(GlobalMessages.DataNotFound);
diff --git a/BMA.EHR.Application/Repositories/RetirementRepository.cs b/BMA.EHR.Application/Repositories/RetirementRepository.cs
index 60e24157..dedac02a 100644
--- a/BMA.EHR.Application/Repositories/RetirementRepository.cs
+++ b/BMA.EHR.Application/Repositories/RetirementRepository.cs
@@ -143,7 +143,6 @@ namespace BMA.EHR.Application.Repositories
             try
             {
                 var data = await _dbContext.Set<RetirementResign>().AsQueryable()
-                                .AsNoTracking()
                                 .Include(x => x.Approvers)
                                 .FirstOrDefaultAsync(x => x.Id == id);
 
@@ -155,15 +154,6 @@ namespace BMA.EHR.Application.Repositories
             }
 
         }
-        public async Task<RetirementResign?> GetByIdWithTrackingAsync(Guid id)
-        {
-            var data = await _dbContext.Set<RetirementResign>().AsQueryable()
-                                //.AsNoTracking()
-                                .Include(x => x.Approvers)
-                                .FirstOrDefaultAsync(x => x.Id == id);
-
-            return data;
-        }
         public async Task OfficerApproveRetirementResign(Guid id)
         {
             var rawData = await GetByIdAsync(id);
@@ -198,7 +188,7 @@ namespace BMA.EHR.Application.Repositories
             var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId);
 
 
-            var rawData = await GetByIdWithTrackingAsync(id);
+            var rawData = await GetByIdAsync(id);
             if (rawData == null)
             {
                 throw new Exception(GlobalMessages.DataNotFound);
@@ -309,7 +299,7 @@ namespace BMA.EHR.Application.Repositories
             var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId);
 
 
-            var rawData = await GetByIdWithTrackingAsync(id);
+            var rawData = await GetByIdAsync(id);
             if (rawData == null)
             {
                 throw new Exception(GlobalMessages.DataNotFound);
@@ -394,7 +384,7 @@ namespace BMA.EHR.Application.Repositories
             // Get UserId from token
             var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId);
 
-            var rawData = await GetByIdWithTrackingAsync(id);
+            var rawData = await GetByIdAsync(id);
             if (rawData == null)
             {
                 throw new Exception(GlobalMessages.DataNotFound);
@@ -473,7 +463,7 @@ namespace BMA.EHR.Application.Repositories
             // Get UserId from token
             var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId);
 
-            var rawData = await GetByIdWithTrackingAsync(id);
+            var rawData = await GetByIdAsync(id);
             if (rawData == null)
             {
                 throw new Exception(GlobalMessages.DataNotFound);