This commit is contained in:
2020-12-09 15:40:01 +00:00
parent 8317aac35f
commit 3470d76b8b
5 changed files with 72 additions and 9 deletions

2
.vscode/launch.json vendored
View File

@@ -53,7 +53,7 @@
"AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles", "AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles",
"AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles", "AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles",
"AYANOVA_FOLDER_TEMPORARY_SERVER_FILES": "c:\\temp\\RavenTestData\\tempfiles", "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_SEEDLEVEL": "small",
"AYANOVA_SERVER_TEST_MODE_TZ_OFFSET": "-7", "AYANOVA_SERVER_TEST_MODE_TZ_OFFSET": "-7",
"AYANOVA_BACKUP_PG_DUMP_PATH": "C:\\data\\code\\postgres_13\\bin\\" "AYANOVA_BACKUP_PG_DUMP_PATH": "C:\\data\\code\\postgres_13\\bin\\"

View File

@@ -9,6 +9,7 @@ using Microsoft.Extensions.Logging;
using AyaNova.Models; using AyaNova.Models;
using AyaNova.Api.ControllerHelpers; using AyaNova.Api.ControllerHelpers;
using AyaNova.Biz; using AyaNova.Biz;
using Newtonsoft.Json.Linq;
namespace AyaNova.Api.Controllers namespace AyaNova.Api.Controllers
@@ -177,6 +178,59 @@ namespace AyaNova.Api.Controllers
return Accepted(new { JobId = j.GId });//202 accepted return Accepted(new { JobId = j.GId });//202 accepted
} }
////////////////////////////////////////////////////////////////////////////////////////////////
// EXTENSION BULK JOBS
//
//
/// <summary>
/// Bulk DELETE list of object id's specified
/// </summary>
/// <param name="dataListSelection"></param>
/// <returns>Job Id</returns>
[HttpPost("bulk-delete")]
public async Task<IActionResult> BulkAdd([FromBody] DataListSelection dataListSelection)
{
if (!serverState.IsOpen)
return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason));
if (!ModelState.IsValid)
return BadRequest(new ApiErrorResponse(ModelState));
if (dataListSelection.IsEmpty)
return BadRequest(new ApiErrorResponse(ApiErrorCode.VALIDATION_REQUIRED, null, "DataListSelection is required"));
if (!Authorized.HasDeleteRole(HttpContext.Items, dataListSelection.ObjectType))
return StatusCode(403, new ApiNotAuthorizedResponse());
await dataListSelection.RehydrateIdList(ct, UserRolesFromContext.Roles(HttpContext.Items), log);
if (dataListSelection.SelectedRowIds.Length == 0)
return BadRequest(new ApiErrorResponse(ApiErrorCode.VALIDATION_REQUIRED, null, "List of ids"));
var JobName = $"Bulk operation: DELETE on {dataListSelection.ObjectType} ({dataListSelection.SelectedRowIds.LongLength} specified)";
JObject o = JObject.FromObject(new
{
idList = dataListSelection.SelectedRowIds
});
OpsJob j = new OpsJob();
j.Name = JobName;
j.ObjectType = dataListSelection.ObjectType;
j.JobType = JobType.BulkCoreBizObjectOperation;
j.SubType = JobSubType.Delete;
j.Exclusive = false;
j.JobInfo = o.ToString();
await JobsBiz.AddJobAsync(j);
await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserIdFromContext.Id(HttpContext.Items), 0, AyaType.ServerJob, AyaEvent.Created, JobName), ct);
return Accepted(new { JobId = j.GId });
}
//------------ //------------

View File

@@ -1,4 +1,3 @@
using System.Collections.Generic;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Routing;

View File

@@ -13,7 +13,7 @@ namespace AyaNova.Biz
SeedTestData = 4, SeedTestData = 4,
BulkCoreBizObjectOperation = 5, BulkCoreBizObjectOperation = 5,
Backup = 6, Backup = 6,
AttachmentMaintenance=7 AttachmentMaintenance = 7
} }
@@ -28,7 +28,8 @@ namespace AyaNova.Biz
TagRemove = 3, TagRemove = 3,
TagRemoveAny = 4, TagRemoveAny = 4,
TagReplace = 5, TagReplace = 5,
TagReplaceAny = 6 TagReplaceAny = 6,
Delete = 7
} }
}//eons }//eons

View File

@@ -154,7 +154,8 @@ namespace AyaNova.Biz
try try
{ {
Widget dbObject = await ct.Widget.SingleOrDefaultAsync(z => z.Id == id); Widget dbObject = await ct.Widget.SingleOrDefaultAsync(z => z.Id == id);
if (dbObject == null){ if (dbObject == null)
{
AddError(ApiErrorCode.NOT_FOUND); AddError(ApiErrorCode.NOT_FOUND);
return false; return false;
} }
@@ -230,8 +231,8 @@ namespace AyaNova.Biz
// //
private async Task ValidateAsync(Widget proposedObj) private async Task ValidateAsync(Widget proposedObj)
{ {
//skip validation if seeding //skip validation if seeding
if(ServerBootConfig.SEEDING) return; if (ServerBootConfig.SEEDING) return;
//NOTE: In DB schema only name and serial are not nullable //NOTE: In DB schema only name and serial are not nullable
@@ -403,7 +404,10 @@ namespace AyaNova.Biz
{ {
SaveIt = false; SaveIt = false;
ClearErrors(); ClearErrors();
var o = await GetAsync(id, false); Widget o = null;
//save a fetch if it's a delete
if (job.SubType != JobSubType.Delete)
o = await GetAsync(id, false);
switch (job.SubType) switch (job.SubType)
{ {
case JobSubType.TagAddAny: case JobSubType.TagAddAny:
@@ -414,6 +418,11 @@ namespace AyaNova.Biz
case JobSubType.TagReplace: case JobSubType.TagReplace:
SaveIt = TagBiz.ProcessBulkTagOperation(o.Tags, (string)jobData["tag"], jobData.ContainsKey("toTag") ? (string)jobData["toTag"] : null, job.SubType); SaveIt = TagBiz.ProcessBulkTagOperation(o.Tags, (string)jobData["tag"], jobData.ContainsKey("toTag") ? (string)jobData["toTag"] : null, job.SubType);
break; break;
case JobSubType.Delete:
if(!await DeleteAsync(id)){
await JobsBiz.LogJobAsync(job.GId, $"Error processing item {id}: {GetErrorsAsString()}");
}
break;
default: default:
throw new System.ArgumentOutOfRangeException($"ProcessBulkJob -> Invalid job Subtype{job.SubType}"); throw new System.ArgumentOutOfRangeException($"ProcessBulkJob -> Invalid job Subtype{job.SubType}");
} }