From 1fc4247149f782e6deef2b5f670fa09edc57aaa0 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Thu, 10 Dec 2020 18:27:31 +0000 Subject: [PATCH] Bulk is out Batch is in --- .../Controllers/AttachmentController.cs | 4 ++-- .../Controllers/JobOperationsController.cs | 4 ++-- server/AyaNova/Controllers/TagController.cs | 24 +++++++++---------- server/AyaNova/biz/CustomerBiz.cs | 4 ++-- server/AyaNova/biz/HeadOfficeBiz.cs | 10 ++++---- server/AyaNova/biz/NotifySubscriptionBiz.cs | 4 ++-- server/AyaNova/biz/UserBiz.cs | 4 ++-- server/AyaNova/biz/VendorBiz.cs | 4 ++-- server/AyaNova/biz/WidgetBiz.cs | 4 ++-- server/AyaNova/biz/WorkOrderBiz.cs | 4 ++-- 10 files changed, 33 insertions(+), 33 deletions(-) diff --git a/server/AyaNova/Controllers/AttachmentController.cs b/server/AyaNova/Controllers/AttachmentController.cs index 969a7e26..5c654974 100644 --- a/server/AyaNova/Controllers/AttachmentController.cs +++ b/server/AyaNova/Controllers/AttachmentController.cs @@ -424,7 +424,7 @@ namespace AyaNova.Api.Controllers } /// - /// Bulk delete attachments + /// Batch delete attachments /// /// /// No content @@ -459,7 +459,7 @@ namespace AyaNova.Api.Controllers return NoContent(); } /// - /// Bulk move attachments + /// Batch move attachments /// /// /// No content diff --git a/server/AyaNova/Controllers/JobOperationsController.cs b/server/AyaNova/Controllers/JobOperationsController.cs index 9053267c..8bcb2b0e 100644 --- a/server/AyaNova/Controllers/JobOperationsController.cs +++ b/server/AyaNova/Controllers/JobOperationsController.cs @@ -191,7 +191,7 @@ namespace AyaNova.Api.Controllers /// - /// Bulk DELETE list of object id's specified + /// Batch DELETE list of object id's specified /// /// /// Job Id @@ -215,7 +215,7 @@ namespace AyaNova.Api.Controllers if (dataListSelection.SelectedRowIds.Length == 0) return BadRequest(new ApiErrorResponse(ApiErrorCode.VALIDATION_REQUIRED, null, "List of ids")); - var JobName = $"LT:BatchOperation: DELETE on {dataListSelection.ObjectType} ({dataListSelection.SelectedRowIds.LongLength} specified)"; + var JobName = $"LT:BatchDeleteJob - LT:{dataListSelection.ObjectType} ({dataListSelection.SelectedRowIds.LongLength})"; JObject o = JObject.FromObject(new { idList = dataListSelection.SelectedRowIds diff --git a/server/AyaNova/Controllers/TagController.cs b/server/AyaNova/Controllers/TagController.cs index 02dfb163..aef86cd7 100644 --- a/server/AyaNova/Controllers/TagController.cs +++ b/server/AyaNova/Controllers/TagController.cs @@ -77,7 +77,7 @@ namespace AyaNova.Api.Controllers // /// - /// Bulk add tags to list of object id's specified + /// Batch add tags to list of object id's specified /// /// /// @@ -107,7 +107,7 @@ namespace AyaNova.Api.Controllers if (dataListSelection.SelectedRowIds.Length == 0) return BadRequest(new ApiErrorResponse(ApiErrorCode.VALIDATION_REQUIRED, null, "List of ids")); - var JobName = $"Bulk operation: Add tag \"{tag}\" on {dataListSelection.ObjectType} ({dataListSelection.SelectedRowIds.LongLength} specified)"; + var JobName = $"Batch job: Add tag \"{tag}\" on {dataListSelection.ObjectType} ({dataListSelection.SelectedRowIds.LongLength} specified)"; JObject o = JObject.FromObject(new { idList = dataListSelection.SelectedRowIds, @@ -127,7 +127,7 @@ namespace AyaNova.Api.Controllers } /// - /// Bulk add tags to all objects of type specified + /// Batch add tags to all objects of type specified /// /// /// @@ -148,7 +148,7 @@ namespace AyaNova.Api.Controllers if (string.IsNullOrWhiteSpace(tag)) return BadRequest(new ApiErrorResponse(ApiErrorCode.VALIDATION_REQUIRED, null, "tag")); - var JobName = $"Bulk operation: Add tag \"{tag}\" on any {ayaType}"; + var JobName = $"Batch job: Add tag \"{tag}\" on any {ayaType}"; JObject o = JObject.FromObject(new { tag = tag @@ -167,7 +167,7 @@ namespace AyaNova.Api.Controllers } /// - /// Bulk remove tags to list of object id's specified + /// Batch remove tags to list of object id's specified /// /// /// @@ -197,7 +197,7 @@ namespace AyaNova.Api.Controllers return BadRequest(new ApiErrorResponse(ApiErrorCode.VALIDATION_REQUIRED, null, "List of ids")); - var JobName = $"Bulk operation: Remove tag \"{tag}\" from {dataListSelection.ObjectType} ({dataListSelection.SelectedRowIds.LongLength} specified)"; + var JobName = $"Batch job: Remove tag \"{tag}\" from {dataListSelection.ObjectType} ({dataListSelection.SelectedRowIds.LongLength} specified)"; JObject o = JObject.FromObject(new { idList = dataListSelection.SelectedRowIds, @@ -218,7 +218,7 @@ namespace AyaNova.Api.Controllers /// - /// Bulk remove tags to all objects of type specified + /// Batch remove tags to all objects of type specified /// /// /// @@ -239,7 +239,7 @@ namespace AyaNova.Api.Controllers if (string.IsNullOrWhiteSpace(tag)) return BadRequest(new ApiErrorResponse(ApiErrorCode.VALIDATION_REQUIRED, null, "tag")); - var JobName = $"Bulk operation: Remove tag \"{tag}\" from any {ayaType}"; + var JobName = $"Batch job: Remove tag \"{tag}\" from any {ayaType}"; JObject o = JObject.FromObject(new { tag = tag @@ -259,7 +259,7 @@ namespace AyaNova.Api.Controllers /// - /// Bulk replace tags to list of object id's specified + /// Batch replace tags to list of object id's specified /// /// /// @@ -288,7 +288,7 @@ namespace AyaNova.Api.Controllers if (dataListSelection.SelectedRowIds.Length == 0) return BadRequest(new ApiErrorResponse(ApiErrorCode.VALIDATION_REQUIRED, null, "List of ids")); - var JobName = $"Bulk operation: Replace tag \"{fromTag}\" with tag \"{toTag}\" on {dataListSelection.ObjectType} ({dataListSelection.SelectedRowIds.LongLength} specified)"; + var JobName = $"Batch job: Replace tag \"{fromTag}\" with tag \"{toTag}\" on {dataListSelection.ObjectType} ({dataListSelection.SelectedRowIds.LongLength} specified)"; JObject o = JObject.FromObject(new { idList = dataListSelection.SelectedRowIds, @@ -309,7 +309,7 @@ namespace AyaNova.Api.Controllers } /// - /// Bulk replace tags to all objects of type specified + /// Batch replace tags to all objects of type specified /// /// /// @@ -335,7 +335,7 @@ namespace AyaNova.Api.Controllers if (string.IsNullOrWhiteSpace(toTag)) return BadRequest(new ApiErrorResponse(ApiErrorCode.VALIDATION_REQUIRED, null, "toTag")); - var JobName = $"Bulk operation: Replace tag \"{fromTag}\" with tag \"{toTag}\" on any {ayaType}"; + var JobName = $"Batch job: Replace tag \"{fromTag}\" with tag \"{toTag}\" on any {ayaType}"; JObject o = JObject.FromObject(new { tag = fromTag, diff --git a/server/AyaNova/biz/CustomerBiz.cs b/server/AyaNova/biz/CustomerBiz.cs index 04c9620f..b390a1f1 100644 --- a/server/AyaNova/biz/CustomerBiz.cs +++ b/server/AyaNova/biz/CustomerBiz.cs @@ -409,7 +409,7 @@ namespace AyaNova.Biz private async Task ProcessBulkJobAsync(OpsJob job) { await JobsBiz.UpdateJobStatusAsync(job.GId, JobStatus.Running); - await JobsBiz.LogJobAsync(job.GId, $"Bulk job {job.SubType} started..."); + await JobsBiz.LogJobAsync(job.GId, $"Batch job {job.SubType} started..."); List idList = new List(); long ProcessedObjectCount = 0; JObject jobData = JObject.Parse(job.JobInfo); @@ -464,7 +464,7 @@ namespace AyaNova.Biz await JobsBiz.LogJobAsync(job.GId, ExceptionUtil.ExtractAllExceptionMessages(ex)); } } - await JobsBiz.LogJobAsync(job.GId, $"Bulk job {job.SubType} processed {ProcessedObjectCount} of {idList.Count}"); + await JobsBiz.LogJobAsync(job.GId, $"Batch job {job.SubType} processed {ProcessedObjectCount} of {idList.Count}"); await JobsBiz.UpdateJobStatusAsync(job.GId, JobStatus.Completed); } diff --git a/server/AyaNova/biz/HeadOfficeBiz.cs b/server/AyaNova/biz/HeadOfficeBiz.cs index 20433bf8..df558f13 100644 --- a/server/AyaNova/biz/HeadOfficeBiz.cs +++ b/server/AyaNova/biz/HeadOfficeBiz.cs @@ -369,7 +369,7 @@ namespace AyaNova.Biz private async Task ProcessBulkJobAsync(OpsJob job) { await JobsBiz.UpdateJobStatusAsync(job.GId, JobStatus.Running); - await JobsBiz.LogJobAsync(job.GId, $"Bulk job {job.SubType} started..."); + await JobsBiz.LogJobAsync(job.GId, $"Batch job {job.SubType} started..."); List idList = new List(); long ProcessedObjectCount = 0; long FailedObjectCount = 0; @@ -402,7 +402,7 @@ namespace AyaNova.Biz case JobSubType.Delete: if (!await DeleteAsync(id)) { - await JobsBiz.LogJobAsync(job.GId, $"Error processing item {id}: {GetErrorsAsString()}"); + await JobsBiz.LogJobAsync(job.GId, $"LT:Errors id({id}): {GetErrorsAsString()}"); FailedObjectCount++; } break; @@ -413,7 +413,7 @@ namespace AyaNova.Biz { o = await PutAsync(o); if (o == null) - await JobsBiz.LogJobAsync(job.GId, $"Error processing item {id}: {GetErrorsAsString()}"); + await JobsBiz.LogJobAsync(job.GId, $"LT:Errors id({id}): {GetErrorsAsString()}"); else ProcessedObjectCount++; } @@ -422,12 +422,12 @@ namespace AyaNova.Biz } catch (Exception ex) { - await JobsBiz.LogJobAsync(job.GId, $"Error processing item {id}"); + await JobsBiz.LogJobAsync(job.GId, $"LT:Errors id({id})"); await JobsBiz.LogJobAsync(job.GId, ExceptionUtil.ExtractAllExceptionMessages(ex)); } } - await JobsBiz.LogJobAsync(job.GId, $"Bulk job {job.SubType} processed {ProcessedObjectCount} of {idList.Count} with {FailedObjectCount} failures"); + await JobsBiz.LogJobAsync(job.GId, $"Batch job {job.SubType} processed {ProcessedObjectCount} of {idList.Count} with {FailedObjectCount} failures"); await JobsBiz.UpdateJobStatusAsync(job.GId, FailedObjectCount == 0 ? JobStatus.Completed : JobStatus.Failed); } diff --git a/server/AyaNova/biz/NotifySubscriptionBiz.cs b/server/AyaNova/biz/NotifySubscriptionBiz.cs index f1841457..643f9318 100644 --- a/server/AyaNova/biz/NotifySubscriptionBiz.cs +++ b/server/AyaNova/biz/NotifySubscriptionBiz.cs @@ -314,7 +314,7 @@ namespace AyaNova.Biz // private async Task ProcessBulkJobAsync(OpsJob job) // { // await JobsBiz.UpdateJobStatusAsync(job.GId, JobStatus.Running); - // await JobsBiz.LogJobAsync(job.GId, $"Bulk job {job.SubType} started..."); + // await JobsBiz.LogJobAsync(job.GId, $"Batch job {job.SubType} started..."); // List idList = new List(); // long ProcessedObjectCount = 0; // JObject jobData = JObject.Parse(job.JobInfo); @@ -360,7 +360,7 @@ namespace AyaNova.Biz // await JobsBiz.LogJobAsync(job.GId, ExceptionUtil.ExtractAllExceptionMessages(ex)); // } // } - // await JobsBiz.LogJobAsync(job.GId, $"Bulk job {job.SubType} processed {ProcessedObjectCount} of {idList.Count}"); + // await JobsBiz.LogJobAsync(job.GId, $"Batch job {job.SubType} processed {ProcessedObjectCount} of {idList.Count}"); // await JobsBiz.UpdateJobStatusAsync(job.GId, JobStatus.Completed); // } diff --git a/server/AyaNova/biz/UserBiz.cs b/server/AyaNova/biz/UserBiz.cs index e5f12126..b9a5bf13 100644 --- a/server/AyaNova/biz/UserBiz.cs +++ b/server/AyaNova/biz/UserBiz.cs @@ -833,7 +833,7 @@ namespace AyaNova.Biz private async Task ProcessBulkJobAsync(OpsJob job) { await JobsBiz.UpdateJobStatusAsync(job.GId, JobStatus.Running); - await JobsBiz.LogJobAsync(job.GId, $"Bulk job {job.SubType} started..."); + await JobsBiz.LogJobAsync(job.GId, $"Batch job {job.SubType} started..."); List idList = new List(); long ChangedObjectCount = 0; JObject jobData = JObject.Parse(job.JobInfo); @@ -892,7 +892,7 @@ namespace AyaNova.Biz await JobsBiz.LogJobAsync(job.GId, ExceptionUtil.ExtractAllExceptionMessages(ex)); } } - await JobsBiz.LogJobAsync(job.GId, $"Bulk job {job.SubType} changed {ChangedObjectCount} of {idList.Count}"); + await JobsBiz.LogJobAsync(job.GId, $"Batch job {job.SubType} changed {ChangedObjectCount} of {idList.Count}"); await JobsBiz.UpdateJobStatusAsync(job.GId, JobStatus.Completed); } diff --git a/server/AyaNova/biz/VendorBiz.cs b/server/AyaNova/biz/VendorBiz.cs index 124c681c..29cd7536 100644 --- a/server/AyaNova/biz/VendorBiz.cs +++ b/server/AyaNova/biz/VendorBiz.cs @@ -344,7 +344,7 @@ namespace AyaNova.Biz private async Task ProcessBulkJobAsync(OpsJob job) { await JobsBiz.UpdateJobStatusAsync(job.GId, JobStatus.Running); - await JobsBiz.LogJobAsync(job.GId, $"Bulk job {job.SubType} started..."); + await JobsBiz.LogJobAsync(job.GId, $"Batch job {job.SubType} started..."); List idList = new List(); long ProcessedObjectCount = 0; JObject jobData = JObject.Parse(job.JobInfo); @@ -399,7 +399,7 @@ namespace AyaNova.Biz await JobsBiz.LogJobAsync(job.GId, ExceptionUtil.ExtractAllExceptionMessages(ex)); } } - await JobsBiz.LogJobAsync(job.GId, $"Bulk job {job.SubType} processed {ProcessedObjectCount} of {idList.Count}"); + await JobsBiz.LogJobAsync(job.GId, $"Batch job {job.SubType} processed {ProcessedObjectCount} of {idList.Count}"); await JobsBiz.UpdateJobStatusAsync(job.GId, JobStatus.Completed); } diff --git a/server/AyaNova/biz/WidgetBiz.cs b/server/AyaNova/biz/WidgetBiz.cs index 316d2cb9..af2a2d81 100644 --- a/server/AyaNova/biz/WidgetBiz.cs +++ b/server/AyaNova/biz/WidgetBiz.cs @@ -389,7 +389,7 @@ namespace AyaNova.Biz private async Task ProcessBulkJobAsync(OpsJob job) { await JobsBiz.UpdateJobStatusAsync(job.GId, JobStatus.Running); - await JobsBiz.LogJobAsync(job.GId, $"Bulk job {job.SubType} started..."); + await JobsBiz.LogJobAsync(job.GId, $"Batch job {job.SubType} started..."); List idList = new List(); long ProcessedObjectCount = 0; JObject jobData = JObject.Parse(job.JobInfo); @@ -443,7 +443,7 @@ namespace AyaNova.Biz await JobsBiz.LogJobAsync(job.GId, ExceptionUtil.ExtractAllExceptionMessages(ex)); } } - await JobsBiz.LogJobAsync(job.GId, $"Bulk job {job.SubType} processed {ProcessedObjectCount} of {idList.Count}"); + await JobsBiz.LogJobAsync(job.GId, $"Batch job {job.SubType} processed {ProcessedObjectCount} of {idList.Count}"); await JobsBiz.UpdateJobStatusAsync(job.GId, JobStatus.Completed); } diff --git a/server/AyaNova/biz/WorkOrderBiz.cs b/server/AyaNova/biz/WorkOrderBiz.cs index 984e1854..bbeeddfc 100644 --- a/server/AyaNova/biz/WorkOrderBiz.cs +++ b/server/AyaNova/biz/WorkOrderBiz.cs @@ -2517,7 +2517,7 @@ namespace AyaNova.Biz private async Task ProcessBulkJobAsync(OpsJob job) { await JobsBiz.UpdateJobStatusAsync(job.GId, JobStatus.Running); - await JobsBiz.LogJobAsync(job.GId, $"Bulk job {job.SubType} started..."); + await JobsBiz.LogJobAsync(job.GId, $"Batch job {job.SubType} started..."); List idList = new List(); long ProcessedObjectCount = 0; JObject jobData = JObject.Parse(job.JobInfo); @@ -2572,7 +2572,7 @@ namespace AyaNova.Biz await JobsBiz.LogJobAsync(job.GId, ExceptionUtil.ExtractAllExceptionMessages(ex)); } } - await JobsBiz.LogJobAsync(job.GId, $"Bulk job {job.SubType} processed {ProcessedObjectCount} of {idList.Count}"); + await JobsBiz.LogJobAsync(job.GId, $"Batch job {job.SubType} processed {ProcessedObjectCount} of {idList.Count}"); await JobsBiz.UpdateJobStatusAsync(job.GId, JobStatus.Completed); }