diff --git a/LCU.API.Internal.FileOperations/LCU.Api.Internal.FileOperations/Controllers/DirectFileOperationsController.cs b/LCU.API.Internal.FileOperations/LCU.Api.Internal.FileOperations/Controllers/DirectFileOperationsController.cs index 2150640..6b20952 100644 --- a/LCU.API.Internal.FileOperations/LCU.Api.Internal.FileOperations/Controllers/DirectFileOperationsController.cs +++ b/LCU.API.Internal.FileOperations/LCU.Api.Internal.FileOperations/Controllers/DirectFileOperationsController.cs @@ -69,7 +69,7 @@ public class DirectFileOperationsController : ControllerBase [ProducesResponseType(500)] public async Task WriteBinaryFile([FromBody] WriteFileRequest request) { - return await HandleRequestResponse(request, FileOperationType.WriteFile, _writeFileService); + return await HandleRequestResponse(request, FileOperationType.WriteBinaryFile, _writeFileService); } [HttpPost("CreateDirectory")] diff --git a/LCU.API.Internal.FileOperations/LCU.Api.Internal.FileOperations/Controllers/FileOperationsController.cs b/LCU.API.Internal.FileOperations/LCU.Api.Internal.FileOperations/Controllers/FileOperationsController.cs index b861ff4..fdfb7c6 100644 --- a/LCU.API.Internal.FileOperations/LCU.Api.Internal.FileOperations/Controllers/FileOperationsController.cs +++ b/LCU.API.Internal.FileOperations/LCU.Api.Internal.FileOperations/Controllers/FileOperationsController.cs @@ -243,16 +243,6 @@ public class FileOperationsController : ControllerBase return await HandleRequestResponse(request, FileOperationType.WriteFile, _writeFileDataService); } - // POST api/WriteBinaryFileData - [HttpPost("WriteBinaryFileData")] - [ProducesResponseType(201)] - [ProducesResponseType(typeof(List), 400)] - [ProducesResponseType(500)] - public async Task WriteBinaryFileData([FromBody] WriteFileRequest request) - { - return await HandleRequestResponse(request, FileOperationType.WriteFile, _writeFileDataService); - } - [HttpPost("DeleteDirectory")] [ProducesResponseType(201)] [ProducesResponseType(typeof(List), 400)] diff --git a/LCU.API.Internal.FileOperations/LCU.Api.Internal.FileOperations/Program.cs b/LCU.API.Internal.FileOperations/LCU.Api.Internal.FileOperations/Program.cs index d71bf9f..654ebc8 100644 --- a/LCU.API.Internal.FileOperations/LCU.Api.Internal.FileOperations/Program.cs +++ b/LCU.API.Internal.FileOperations/LCU.Api.Internal.FileOperations/Program.cs @@ -160,6 +160,7 @@ void AddServiceFactoryServices(IServiceCollection services) services.AddScoped(); services.AddScoped(); services.AddScoped(); + services.AddScoped(); } void AddFileActionServices(IServiceCollection services) diff --git a/LCU.API.Internal.FileOperations/LCU.Api.Internal.FileOperations/Services/FileActionServices/WriteFileService.cs b/LCU.API.Internal.FileOperations/LCU.Api.Internal.FileOperations/Services/FileActionServices/WriteFileService.cs index 7643fe8..449f65d 100644 --- a/LCU.API.Internal.FileOperations/LCU.Api.Internal.FileOperations/Services/FileActionServices/WriteFileService.cs +++ b/LCU.API.Internal.FileOperations/LCU.Api.Internal.FileOperations/Services/FileActionServices/WriteFileService.cs @@ -44,13 +44,6 @@ namespace LCU.Api.Internal.FileOperations.Services.FileActionServices { try { - if (string.Equals(request.Extension?.TrimStart('.'), "wav", StringComparison.OrdinalIgnoreCase)) - { - var fileBytes = Convert.FromBase64String(request.FileData); - File.WriteAllBytes(request.FullFilePath, fileBytes); - return; - } - File.WriteAllText(request.FullFilePath, request.FileData); } catch (Exception exception) diff --git a/LCU.API.Internal.FileOperations/LCU.Api.Internal.FileOperations/appsettings.json b/LCU.API.Internal.FileOperations/LCU.Api.Internal.FileOperations/appsettings.json index 4034c9a..46f9b03 100644 --- a/LCU.API.Internal.FileOperations/LCU.Api.Internal.FileOperations/appsettings.json +++ b/LCU.API.Internal.FileOperations/LCU.Api.Internal.FileOperations/appsettings.json @@ -20,92 +20,96 @@ "ServiceFactoryRegistrations": [ { "ServiceInterfaceName": "IFileActionService", - "ServiceRegistrations": [ - { - "ServiceName": "MoveFileService", - "ServiceId": "0" - }, - { - "ServiceName": "CopyFileService", - "ServiceId": "1" - }, - { - "ServiceName": "DeleteFileService", - "ServiceId": "2" - }, - { - "ServiceName": "RenameFileService", - "ServiceId": "3" - }, - { - "ServiceName": "ZipDirectoryService", - "ServiceId": "4" - }, - { - "ServiceName": "CreateDirectoryService", - "ServiceId": "5" - }, - { - "ServiceName": "RenameDirectoryService", - "ServiceId": "6" - }, - { - "ServiceName": "BulkOperationService`1", - "ServiceId": "7" - }, - { - "ServiceName": "UnzipFileService", - "ServiceId": "8" - }, - { - "ServiceName": "EncryptFileDataService", - "ServiceId": "9" - }, - { - "ServiceName": "DecryptFileDataService", - "ServiceId": "10" - }, - { - "ServiceName": "ModifyFileService", - "ServiceId": "11" - }, - { - "ServiceName": "UnzipPasswordProtectedFileService", - "ServiceId": "12" - }, - { - "ServiceName": "BatchPdfParserService", - "ServiceId": "13" - }, - { - "ServiceName": "WriteFileService", - "ServiceId": "14" - }, - { - "ServiceName": "DeleteDirectoryService", - "ServiceId": "15" - }, - { - "ServiceName": "ValidateFileService", - "ServiceId": "16" - }, - { - "ServiceName": "AppendFileService", - "ServiceId": "17" - }, - { - "ServiceName": "ExtractIndexFileDataService", - "ServiceId": "18" - }, - { - "ServiceName": "DeleteEmptyDirectoryService", - "ServiceId": "19" - }, - { - "ServiceName": "ValidateFileSizeInRangeService", - "ServiceId": "20" - } - ] + "ServiceRegistrations": [ + { + "ServiceName": "MoveFileService", + "ServiceId": "0" + }, + { + "ServiceName": "CopyFileService", + "ServiceId": "1" + }, + { + "ServiceName": "DeleteFileService", + "ServiceId": "2" + }, + { + "ServiceName": "RenameFileService", + "ServiceId": "3" + }, + { + "ServiceName": "ZipDirectoryService", + "ServiceId": "4" + }, + { + "ServiceName": "CreateDirectoryService", + "ServiceId": "5" + }, + { + "ServiceName": "RenameDirectoryService", + "ServiceId": "6" + }, + { + "ServiceName": "BulkOperationService`1", + "ServiceId": "7" + }, + { + "ServiceName": "UnzipFileService", + "ServiceId": "8" + }, + { + "ServiceName": "EncryptFileDataService", + "ServiceId": "9" + }, + { + "ServiceName": "DecryptFileDataService", + "ServiceId": "10" + }, + { + "ServiceName": "ModifyFileService", + "ServiceId": "11" + }, + { + "ServiceName": "UnzipPasswordProtectedFileService", + "ServiceId": "12" + }, + { + "ServiceName": "BatchPdfParserService", + "ServiceId": "13" + }, + { + "ServiceName": "WriteFileService", + "ServiceId": "14" + }, + { + "ServiceName": "DeleteDirectoryService", + "ServiceId": "15" + }, + { + "ServiceName": "ValidateFileService", + "ServiceId": "16" + }, + { + "ServiceName": "AppendFileService", + "ServiceId": "17" + }, + { + "ServiceName": "ExtractIndexFileDataService", + "ServiceId": "18" + }, + { + "ServiceName": "DeleteEmptyDirectoryService", + "ServiceId": "19" + }, + { + "ServiceName": "ValidateFileSizeInRangeService", + "ServiceId": "20" + }, + { + "ServiceName": "WriteFileService", + "ServiceId": "21" + } + ] } ] }, diff --git a/LCU.API.Internal.FileOperations/LCU.Api.Internal.FileOperationsTests/Controllers/FileOperationsControllerTest.cs b/LCU.API.Internal.FileOperations/LCU.Api.Internal.FileOperationsTests/Controllers/FileOperationsControllerTest.cs index 6f19b1d..8377e84 100644 --- a/LCU.API.Internal.FileOperations/LCU.Api.Internal.FileOperationsTests/Controllers/FileOperationsControllerTest.cs +++ b/LCU.API.Internal.FileOperations/LCU.Api.Internal.FileOperationsTests/Controllers/FileOperationsControllerTest.cs @@ -75,27 +75,6 @@ public class FileOperationsControllerTest _mockDirectFileService.Object); } - [Fact] - public async Task WriteBinaryFileDataPost_OK() - { - var request = new WriteFileRequest - { - FileData = Convert.ToBase64String(new byte[] { 0x52, 0x49, 0x46, 0x46 }), - DestinationPath = "SomePath", - Extension = ".wav", - FileName = "FileName" - }; - - var validRequestResponse = new RequestResponse() { MessageStack = new List(), IsSuccessful = true }; - _mockWriteFileDataService.Setup(service => service.PreQueueValidation(It.IsAny())).Returns(validRequestResponse); - - var result = await _controller.WriteBinaryFileData(request); - var okResult = result as OkResult; - - Assert.NotNull(okResult); - Assert.Equal(200, okResult.StatusCode); - } - [Fact] public void GetFile_OK() { diff --git a/LCU.API.Internal.FileOperations/LCU.Library.Internal.FileOperationsModels/Models/FileOperationType.cs b/LCU.API.Internal.FileOperations/LCU.Library.Internal.FileOperationsModels/Models/FileOperationType.cs index 5aed5d8..aaca6c6 100644 --- a/LCU.API.Internal.FileOperations/LCU.Library.Internal.FileOperationsModels/Models/FileOperationType.cs +++ b/LCU.API.Internal.FileOperations/LCU.Library.Internal.FileOperationsModels/Models/FileOperationType.cs @@ -21,5 +21,6 @@ public enum FileOperationType AppendFile = 17, ExtractIndexFileData = 18, DeleteEmptyDirectory = 19, - ValidateFileSizeInRange = 20 + ValidateFileSizeInRange = 20, + WriteBinaryFile = 21 }