hrms-bangkok/hrms-api-backend
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

fix : Update LeaveRequest Error Tracking Entity Id
Some checks failed
release-dev / release-dev (push) Failing after 13s
Details

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2024-09-13 09:56:30 +07:00
parent d67e0450e5
commit 069f427459
5 changed files with 19 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
BMA.EHR.Application/Common/Interfaces/ILeaveDbContext.cs
View file

@ -8,6 +8,8 @@ namespace BMA.EHR.Application.Common.Interfaces
void Attatch<T>(T entity) where T : class; void Attatch<T>(T entity) where T : class;
void Detach<T>(T entity) where T : class;
Task<int> SaveChangesAsync(); Task<int> SaveChangesAsync();
} }
} }

1
BMA.EHR.Application/Repositories/Leaves/GenericLeaveRepository.cs
View file

@ -77,6 +77,7 @@ namespace BMA.EHR.Application.Repositories.Leaves
(entity as EntityBase).LastUpdatedAt = DateTime.Now; (entity as EntityBase).LastUpdatedAt = DateTime.Now;
} }
_dbContext.Detach(entity);
_dbSet.Update(entity); _dbSet.Update(entity);
await _dbContext.SaveChangesAsync(); await _dbContext.SaveChangesAsync();

11
BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs
View file

@ -72,7 +72,8 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
public override async Task<LeaveRequest?> GetByIdAsync(Guid id) public override async Task<LeaveRequest?> GetByIdAsync(Guid id)
{ {
var data = await _dbContext.Set<LeaveRequest>().AsQueryable().AsNoTracking() var data = await _dbContext.Set<LeaveRequest>().AsQueryable()
//.AsNoTracking()
.Include(x => x.LeaveDocument) .Include(x => x.LeaveDocument)
.ThenInclude(x => x.Document) .ThenInclude(x => x.Document)
.Include(x => x.LeaveDraftDocument) .Include(x => x.LeaveDraftDocument)
@ -109,6 +110,9 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
public override async Task<LeaveRequest> UpdateAsync(LeaveRequest entity) public override async Task<LeaveRequest> UpdateAsync(LeaveRequest entity)
{ {
// detach
//_dbContext.Detach(entity);
if (entity.LeaveCancelDocument != null) if (entity.LeaveCancelDocument != null)
_dbContext.Attatch(entity.LeaveCancelDocument); _dbContext.Attatch(entity.LeaveCancelDocument);
@ -121,13 +125,12 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
{ {
_dbContext.Attatch(d); _dbContext.Attatch(d);
} }
} }
if (entity.Type != null) if (entity.Type != null)
{ {
//_dbContext.Attatch(entity.Type);
_dbContext.Attatch(entity.Type); //_dbContext.Detach(entity.Type);
} }

5
BMA.EHR.Infrastructure/Persistence/LeaveDbContext.cs
View file

@ -49,5 +49,10 @@ namespace BMA.EHR.Infrastructure.Persistence
{ {
Attach(entity); Attach(entity);
} }
public void Detach<T>(T entity) where T : class
{
base.Entry(entity).State = EntityState.Detached;
}
} }
} }

8
BMA.EHR.Leave/appsettings.json
View file

@ -15,12 +15,12 @@
"ConnectionStrings": { "ConnectionStrings": {
//"DefaultConnection": "User Id=sys;Password=P@ssw0rd;DBA Privilege=SYSDBA;Data Source=localhost:1521/ORCLCDB", //"DefaultConnection": "User Id=sys;Password=P@ssw0rd;DBA Privilege=SYSDBA;Data Source=localhost:1521/ORCLCDB",
//"DefaultConnection": "server=192.168.1.81;user=root;password=adminVM123;port=4061;database=bma_ehr;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;", //"DefaultConnection": "server=192.168.1.81;user=root;password=adminVM123;port=4061;database=bma_ehr;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
"DefaultConnection": "server=192.168.1.81;user=root;password=adminVM123;port=4063;database=bma_ehr;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;", //"DefaultConnection": "server=192.168.1.81;user=root;password=adminVM123;port=4063;database=bma_ehr;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
//"DefaultConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=bma_ehr_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;", "DefaultConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=bma_ehr_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
"ExamConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=bma_ehr_exam_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;", "ExamConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=bma_ehr_exam_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
//"LeaveConnection": "server=192.168.4.11;user=root;password=P@ssw0rd;port=3306;database=bma_ehr_leave;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;" //"LeaveConnection": "server=192.168.4.11;user=root;password=P@ssw0rd;port=3306;database=bma_ehr_leave;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;"
//"LeaveConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=bma_ehr_leave_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;", "LeaveConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=bma_ehr_leave_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
"LeaveConnection": "server=192.168.1.81;user=root;password=adminVM123;port=4063;database=bma_ehr_leave;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;" //"LeaveConnection": "server=192.168.1.81;user=root;password=adminVM123;port=4063;database=bma_ehr_leave;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;"
}, },
"Jwt": { "Jwt": {
"Key": "HP-FnQMUj9msHMSD3T9HtdEnphAKoCJLEl85CIqROFI", "Key": "HP-FnQMUj9msHMSD3T9HtdEnphAKoCJLEl85CIqROFI",