case 4192

server/AyaNova/biz/MemoBiz.cs

@@ -290,7 +290,7 @@ namespace AyaNova.Biz
                 var batchResults = await ct.Memo.AsNoTracking().Where(z => batch.Contains(z.Id)).ToArrayAsync();
                 //order the results back into original
                 var orderedList = from id in batch join z in batchResults on id equals z.Id select z;
-                batchResults=null;
+                batchResults = null;
                 foreach (Memo w in orderedList)
                 {
                     if (!ReportRenderManager.KeepGoing(jobId)) return null;
@@ -300,11 +300,11 @@ namespace AyaNova.Biz
                         jo["CustomFields"] = JObject.Parse((string)jo["CustomFields"]);
                     ReportData.Add(jo);
                 }
-                orderedList=null;
+                orderedList = null;
             }
             vc.Clear();
             return ReportData;
-        }        
+        }
         private VizCache vc = new VizCache();
 
         //populate viz fields from provided object
@@ -397,10 +397,30 @@ namespace AyaNova.Biz
             else
                 idList = await ct.Memo.AsNoTracking().Select(z => z.Id).ToListAsync();
             bool SaveIt = false;
+            //---------------------------------
+            //case 4192
+            TimeSpan ProgressAndCancelCheckSpan = new TimeSpan(0, 0, ServerBootConfig.JOB_PROGRESS_UPDATE_AND_CANCEL_CHECK_SECONDS);
+            DateTime LastProgressCheck = DateTime.UtcNow.Subtract(new TimeSpan(1, 1, 1, 1, 1));
+            var TotalRecords = idList.LongCount();
+            long CurrentRecord = -1;
+            //---------------------------------
             foreach (long id in idList)
             {
                 try
                 {
+                    //--------------------------------
+                    //case 4192
+                    //Update progress / cancel requested?                    
+                    CurrentRecord++;
+                    if (DateUtil.IsAfterDuration(LastProgressCheck, ProgressAndCancelCheckSpan))
+                    {
+                        await JobsBiz.UpdateJobProgressAsync(job.GId, $"{CurrentRecord}/{TotalRecords}");
+                        if (await JobsBiz.GetJobStatusAsync(job.GId) == JobStatus.CancelRequested)
+                            break;
+                        LastProgressCheck = DateTime.UtcNow;
+                    }
+                    //---------------------------------
+
                     SaveIt = false;
                     ClearErrors();
                     Memo o = null;
@@ -436,7 +456,7 @@ namespace AyaNova.Biz
                             FailedObjectCount++;
                         }
                     }
-                     //TEMPORARY MEASURE AWAITING BETTER SOLUTION AND CANCELLABLE EXTENSION JOBS
+
                     //delay so we're not tying up all the resources in a tight loop
                     await Task.Delay(AyaNova.Util.ServerBootConfig.JOB_OBJECT_HANDLE_BATCH_JOB_LOOP_DELAY);
                 }
@@ -446,6 +466,10 @@ namespace AyaNova.Biz
                     await JobsBiz.LogJobAsync(job.GId, ExceptionUtil.ExtractAllExceptionMessages(ex));
                 }
             }
+            //---------------------------------
+            //case 4192
+            await JobsBiz.UpdateJobProgressAsync(job.GId, $"{++CurrentRecord}/{TotalRecords}");
+            //---------------------------------
             await JobsBiz.LogJobAsync(job.GId, $"LT:BatchJob {job.SubType} {idList.Count}{(FailedObjectCount > 0 ? " - LT:Failed " + FailedObjectCount : "")}");
             await JobsBiz.UpdateJobStatusAsync(job.GId, JobStatus.Completed);
         }