From aa1afd29fc9e7ece3accbf5b16f340e8ff0fa7c2 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Tue, 30 Jun 2020 20:21:03 +0000 Subject: [PATCH] --- .../Controllers/AttachmentController.cs | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/server/AyaNova/Controllers/AttachmentController.cs b/server/AyaNova/Controllers/AttachmentController.cs index 33f8712a..4d4c636e 100644 --- a/server/AyaNova/Controllers/AttachmentController.cs +++ b/server/AyaNova/Controllers/AttachmentController.cs @@ -465,7 +465,7 @@ namespace AyaNova.Api.Controllers /// No content [HttpPost("bulk-move")] [Authorize] - public async Task PostBulkMove([FromBody] List idList, [FromBody] AyaType toType, [FromBody] long toId) + public async Task PostBulkMove([FromBody] dtoBulkMove dt) { if (serverState.IsClosed) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -473,21 +473,21 @@ namespace AyaNova.Api.Controllers return BadRequest(new ApiErrorResponse(ModelState)); if (!Authorized.HasModifyRole(HttpContext.Items, AyaType.FileAttachment)) return StatusCode(403, new ApiNotAuthorizedResponse()); - if (!await BizObjectExistsInDatabase.ExistsAsync(toType, toId, ct)) + if (!await BizObjectExistsInDatabase.ExistsAsync(dt.ToType, dt.ToId, ct)) return BadRequest(new ApiErrorResponse(ApiErrorCode.NOT_FOUND, null, "LT:ErrorAPI2010")); long UserId = UserIdFromContext.Id(HttpContext.Items); - foreach (long id in idList) + foreach (long id in dt.IdList) { var dbObject = await ct.FileAttachment.FirstOrDefaultAsync(z => z.Id == id); if (dbObject == null) continue; //do the move - var msg = $"{dbObject.DisplayFileName} moved from {dbObject.AttachToObjectType}-{dbObject.AttachToObjectId} to {toType}-{toId} "; - dbObject.AttachToObjectId = toId; - dbObject.AttachToObjectType = toType; + var msg = $"{dbObject.DisplayFileName} moved from {dbObject.AttachToObjectType}-{dbObject.AttachToObjectId} to {dt.ToType}-{dt.ToId} "; + dbObject.AttachToObjectId = dt.ToId; + dbObject.AttachToObjectType = dt.ToType; await ct.SaveChangesAsync(); //Event log process move @@ -497,6 +497,12 @@ namespace AyaNova.Api.Controllers return NoContent(); } + public class dtoBulkMove + { + public List IdList { get; set; } + public AyaType ToType { get; set; } + public long ToId { get; set; } + } /// /// Download a file attachment