From f5d0a1e710a456c37e07d8387b4ede76e1095fec Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Thu, 8 Apr 2021 23:52:46 +0000 Subject: [PATCH] --- .vscode/launch.json | 2 +- server/AyaNova/biz/WorkOrderBiz.cs | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 0e2049e9..8fd97968 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -53,7 +53,7 @@ "AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles", "AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles", "AYANOVA_FOLDER_TEMPORARY_SERVER_FILES": "c:\\temp\\RavenTestData\\tempfiles", - "AYANOVA_SERVER_TEST_MODE": "false", + "AYANOVA_SERVER_TEST_MODE": "true", "AYANOVA_SERVER_TEST_MODE_SEEDLEVEL": "small", "AYANOVA_SERVER_TEST_MODE_TZ_OFFSET": "-7", "AYANOVA_BACKUP_PG_DUMP_PATH": "C:\\data\\code\\postgres_13\\bin\\" diff --git a/server/AyaNova/biz/WorkOrderBiz.cs b/server/AyaNova/biz/WorkOrderBiz.cs index 36bd1f7b..e627d312 100644 --- a/server/AyaNova/biz/WorkOrderBiz.cs +++ b/server/AyaNova/biz/WorkOrderBiz.cs @@ -142,9 +142,9 @@ namespace AyaNova.Biz .SingleOrDefaultAsync(z => z.Id == id); //todo: set isLocked from state - var stat=await GetCurrentWorkOrderStatusFromRelatedAsync(BizType,ret.Id); - ret.IsLockedAtServer=stat.Locked; - ret.IsDirty=false; + var stat = await GetCurrentWorkOrderStatusFromRelatedAsync(BizType, ret.Id); + ret.IsLockedAtServer = stat.Locked; + ret.IsDirty = false; if (logTheGetEvent && ret != null) await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, id, BizType, AyaEvent.Retrieved), ct); @@ -906,6 +906,7 @@ namespace AyaNova.Biz } + //////////////////////////////////////////////////////////////////////////////////////////////// //UPDATE // @@ -957,7 +958,7 @@ namespace AyaNova.Biz transaction = await ct.Database.BeginTransactionAsync(); try { - var dbObject = await ItemGetAsync(id, false); + var dbObject = await ct.WorkOrderItem.AsNoTracking().SingleOrDefaultAsync(z => z.Id == id); if (dbObject == null) { AddError(ApiErrorCode.NOT_FOUND); @@ -968,6 +969,7 @@ namespace AyaNova.Biz return false; //collect the child id's to delete + //NO!! dbObject already has id's as its fully populated from get above var ExpenseIds = await ct.WorkOrderItemExpense.Where(z => z.WorkOrderItemId == id).Select(z => z.Id).ToListAsync(); var LaborIds = await ct.WorkOrderItemLabor.Where(z => z.WorkOrderItemId == id).Select(z => z.Id).ToListAsync(); var LoanIds = await ct.WorkOrderItemLoan.Where(z => z.WorkOrderItemId == id).Select(z => z.Id).ToListAsync();