server/AyaNova/biz/WorkOrderBiz.cs

@@ -1991,7 +1991,7 @@ namespace AyaNova.Biz
 
         public async Task<Search.SearchIndexProcessObjectParameters> OutsideServiceGetSearchResultSummary(long id)
         {
-            var obj = await OutsideServiceGetAsync(id,false);
+            var obj = await OutsideServiceGetAsync(id, false);
             var SearchParams = new Search.SearchIndexProcessObjectParameters();
             if (obj != null)
                 SearchParams.AddText(obj.Notes).AddText(obj.RMANumber).AddText(obj.TrackingNumber);
@@ -2121,7 +2121,7 @@ namespace AyaNova.Biz
                 //newObject.CustomFields = JsonUtil.CompactJson(newObject.CustomFields);
                 await ct.WorkOrderItemPart.AddAsync(newObject);
                 await ct.SaveChangesAsync();
-                await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, newObject.Id, AyaType.WorkOrderItemPart, AyaEvent.Created), ct);
+                await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, newObject.Id, newObject.AyaType, AyaEvent.Created), ct);
                 await PartSearchIndexAsync(newObject, true);
                 //await TagBiz.ProcessUpdateTagsInRepositoryAsync(ct, newObject.Tags, null);
                 return newObject;
@@ -2133,41 +2133,33 @@ namespace AyaNova.Biz
         //    
         internal async Task<WorkOrderItemPart> PartGetAsync(long id, bool logTheGetEvent = true)
         {
-            //Note: there could be rules checking here in future, i.e. can only get own workorder or something
+            var ret = await ct.WorkOrderItemPart.AsNoTracking().SingleOrDefaultAsync(z => z.Id == id);
-            //if so, then need to implement AddError and in route handle Null return with Error check just like PUT route does now
-
-            //https://docs.microsoft.com/en-us/ef/core/querying/related-data
-            //docs say this will not query twice but will recognize the duplicate woitem bit which is required for multiple grandchild collections
-            var ret =
-            await ct.WorkOrderItemPart
-            .SingleOrDefaultAsync(z => z.Id == id);
             if (logTheGetEvent && ret != null)
-                await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, id, AyaType.WorkOrderItemPart, AyaEvent.Retrieved), ct);
+                await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, id, ret.AyaType, AyaEvent.Retrieved), ct);
             return ret;
         }
 
         ////////////////////////////////////////////////////////////////////////////////////////////////
         //UPDATE
         //       
-        internal async Task<WorkOrderItemPart> PartPutAsync(WorkOrderItemPart dtPutObject)
+        internal async Task<WorkOrderItemPart> PartPutAsync(WorkOrderItemPart putObject)
         {
-            WorkOrderItemPart dbObject = await ct.WorkOrderItemPart.SingleOrDefaultAsync(z => z.Id == dtPutObject.Id);
+            WorkOrderItemPart dbObject = await PartGetAsync(putObject.Id, false);
             if (dbObject == null)
             {
                 AddError(ApiErrorCode.NOT_FOUND, "id");
                 return null;
             }
-
+            if (dbObject.Concurrency != putObject.Concurrency)
-            // make a snapshot of the original for validation but update the original to preserve workflow           
+            {
-            WorkOrderItemPart SnapshotOfOriginalDBObj = new WorkOrderItemPart();
+                AddError(ApiErrorCode.CONCURRENCY_CONFLICT);
-            CopyObject.Copy(dbObject, SnapshotOfOriginalDBObj);
+                return null;
-            CopyObject.Copy(dtPutObject, dbObject, "Id");
+            }
 
             //dbObject.Tags = TagBiz.NormalizeTags(dbObject.Tags);
             //dbObject.CustomFields = JsonUtil.CompactJson(dbObject.CustomFields);
 
-            ct.Entry(dbObject).OriginalValues["Concurrency"] = dtPutObject.Concurrency;
+            await PartValidateAsync(putObject, dbObject);
-            await PartValidateAsync(dbObject, SnapshotOfOriginalDBObj);
             if (HasErrors) return null;
             ct.Replace(dbObject, putObject);
             try
@@ -2176,45 +2168,86 @@ namespace AyaNova.Biz
             }
             catch (DbUpdateConcurrencyException)
             {
-                if (!await PartExistsAsync(dtPutObject.Id))
+                if (!await PartExistsAsync(putObject.Id))
                     AddError(ApiErrorCode.NOT_FOUND);
                 else
                     AddError(ApiErrorCode.CONCURRENCY_CONFLICT);
                 return null;
             }
-            await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, dbObject.Id, AyaType.WorkOrderItemPart, AyaEvent.Modified), ct);
+            await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, putObject.Id, putObject.AyaType, AyaEvent.Modified), ct);
-            await PartSearchIndexAsync(dbObject, false);
+            await PartSearchIndexAsync(putObject, false);
             //await TagBiz.ProcessUpdateTagsInRepositoryAsync(ct, dbObject.Tags, SnapshotOfOriginalDBObj.Tags);
-            await PartHandlePotentialNotificationEvent(AyaEvent.Modified, dbObject, SnapshotOfOriginalDBObj);
+            await PartHandlePotentialNotificationEvent(AyaEvent.Modified, putObject, dbObject);
-            return dbObject;
+            return putObject;
         }
 
         ////////////////////////////////////////////////////////////////////////////////////////////////
         //DELETE
         //
-        internal async Task<bool> PartDeleteAsync(long id)
+        internal async Task<bool> PartDeleteAsync(long id, Microsoft.EntityFrameworkCore.Storage.IDbContextTransaction parentTransaction = null)
         {
-            WorkOrderItemPart dbObject = await ct.WorkOrderItemPart.SingleOrDefaultAsync(z => z.Id == id);
+            Microsoft.EntityFrameworkCore.Storage.IDbContextTransaction transaction = null;
-            PartValidateCanDelete(dbObject);
+            if (parentTransaction == null)
-            if (HasErrors)
+                transaction = await ct.Database.BeginTransactionAsync();
-                return false;
+            try
-            ct.WorkOrderItemPart.Remove(dbObject);
+            {
-            await ct.SaveChangesAsync();
+                var dbObject = await ct.WorkOrderItemPart.SingleOrDefaultAsync(z => z.Id == id);
-
+                PartValidateCanDelete(dbObject);
-            //Log event 
+                if (HasErrors)
-            await EventLogProcessor.DeleteObjectLogAsync(UserId, AyaType.WorkOrderItemPart, dbObject.Id, "woitem:" + dbObject.WorkOrderItemId.ToString(), ct);//FIX woitem??
+                    return false;
-            await Search.ProcessDeletedObjectKeywordsAsync(dbObject.Id, AyaType.WorkOrderItemPart, ct);
+                ct.WorkOrderItemPart.Remove(dbObject);
-            // await TagBiz.ProcessDeleteTagsInRepositoryAsync(ct, dbObject.Tags);
+                await ct.SaveChangesAsync();
-            //await FileUtil.DeleteAttachmentsForObjectAsync(BizType, dbObject.Id, ct);
+                //Log event 
-            await PartHandlePotentialNotificationEvent(AyaEvent.Deleted, dbObject);
+                await EventLogProcessor.DeleteObjectLogAsync(UserId, dbObject.AyaType, dbObject.Id, "woitem:" + dbObject.WorkOrderItemId.ToString(), ct);//Fix??
+                await Search.ProcessDeletedObjectKeywordsAsync(dbObject.Id, dbObject.AyaType, ct);
+                //await TagBiz.ProcessDeleteTagsInRepositoryAsync(ct, dbObject.Tags);
+                //await FileUtil.DeleteAttachmentsForObjectAsync(dbObject.AyaType, dbObject.Id, ct);
+                if (parentTransaction == null)
+                    await transaction.CommitAsync();
+                await PartHandlePotentialNotificationEvent(AyaEvent.Deleted, dbObject);
+            }
+            catch
+            {
+                //Just re-throw for now, let exception handler deal, but in future may want to deal with this more here
+                throw;
+            }
             return true;
         }
 
+
+        //////////////////////////////////////////////
+        //INDEXING
+        //
+        private async Task PartSearchIndexAsync(WorkOrderItemPart obj, bool isNew)
+        {
+            //SEARCH INDEXING
+            var SearchParams = new Search.SearchIndexProcessObjectParameters(UserTranslationId, obj.Id, obj.AyaType);
+            SearchParams.AddText(obj.Description).AddText(obj.Serials);
+            if (isNew)
+                await Search.ProcessNewObjectKeywordsAsync(SearchParams);
+            else
+                await Search.ProcessUpdatedObjectKeywordsAsync(SearchParams);
+        }
+
+        public async Task<Search.SearchIndexProcessObjectParameters> PartGetSearchResultSummary(long id)
+        {
+            var obj = await PartGetAsync(id, false);
+            var SearchParams = new Search.SearchIndexProcessObjectParameters();
+            if (obj != null)
+                SearchParams.AddText(obj.Description).AddText(obj.Serials);
+            return SearchParams;
+        }
+
+
+
         ////////////////////////////////////////////////////////////////////////////////////////////////
         //VALIDATION
         //       
         private async Task PartValidateAsync(WorkOrderItemPart proposedObj, WorkOrderItemPart currentObj)
         {
+            //skip validation if seeding
+            // if (ServerBootConfig.SEEDING) return;
+
             //run validation and biz rules
             bool isNew = currentObj == null;
 
@@ -2257,29 +2290,6 @@ namespace AyaNova.Biz
         }
 
 
-        private async Task PartSearchIndexAsync(WorkOrderItemPart obj, bool isNew)
-        {
-            //SEARCH INDEXING
-            var SearchParams = new Search.SearchIndexProcessObjectParameters(UserTranslationId, obj.Id, AyaType.WorkOrderItemPart);
-            SearchParams.AddText(obj.Description).AddText(obj.Serials);
-
-            if (isNew)
-                await Search.ProcessNewObjectKeywordsAsync(SearchParams);
-            else
-                await Search.ProcessUpdatedObjectKeywordsAsync(SearchParams);
-        }
-
-        public async Task<Search.SearchIndexProcessObjectParameters> PartGetSearchResultSummary(long id)
-        {
-            var obj = await ct.WorkOrderItemPart.SingleOrDefaultAsync(z => z.Id == id);
-            var SearchParams = new Search.SearchIndexProcessObjectParameters();
-            if (obj != null)
-                SearchParams.AddText(obj.Description).AddText(obj.Serials);
-            return SearchParams;
-        }
-
-
-
         ////////////////////////////////////////////////////////////////////////////////////////////////
         // NOTIFICATION PROCESSING
         //