fix: use provided content-type if any (#51) (#52)

Co-authored-by: Maksim_Hadalau <[email protected]>
epam · Nov 22, 2023 · 779063c · 779063c
1 parent f30c89b
commit 779063c
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/src/main/java/com/epam/aidial/core/controller/UploadFileController.java b/src/main/java/com/epam/aidial/core/controller/UploadFileController.java
@@ -33,13 +33,15 @@ public Future<?> upload(String path) {
         context.getRequest()
                 .setExpectMultipart(true)
                 .uploadHandler(upload -> {
+                    String contentType = upload.contentType();
                     String filename = upload.filename();
                     Pipe<Buffer> pipe = new PipeImpl<>(upload).endOnFailure(false);
                     BlobWriteStream writeStream = new BlobWriteStream(
                             proxy.getVertx(),
                             proxy.getStorage(),
                             filename,
-                            absoluteFilePath);
+                            absoluteFilePath,
+                            contentType);
                     pipe.to(writeStream, result);
 
                     result.future()

diff --git a/src/main/java/com/epam/aidial/core/storage/BlobStorage.java b/src/main/java/com/epam/aidial/core/storage/BlobStorage.java
@@ -167,7 +167,7 @@ private static FileMetadataBase buildFileMetadata(StorageMetadata metadata) {
 
         return switch (metadata.getType()) {
             case BLOB ->
-                    new FileMetadata(lastElement, path, metadata.getSize(), BlobStorageUtil.getContentType(lastElement));
+                    new FileMetadata(lastElement, path, metadata.getSize(), ((BlobMetadata) metadata).getContentMetadata().getContentType());
             case FOLDER, RELATIVE_PATH ->
                     new FolderMetadata(BlobStorageUtil.removeLeadingAndTrailingPathSeparators(lastElement),
                             BlobStorageUtil.removeTrailingPathSeparator(path));

diff --git a/src/main/java/com/epam/aidial/core/storage/BlobWriteStream.java b/src/main/java/com/epam/aidial/core/storage/BlobWriteStream.java
@@ -52,12 +52,13 @@ public class BlobWriteStream implements WriteStream<Buffer> {
     public BlobWriteStream(Vertx vertx,
                            BlobStorage storage,
                            String fileName,
-                           String parentPath) {
+                           String parentPath,
+                           String contentType) {
         this.vertx = vertx;
         this.storage = storage;
         this.fileName = fileName;
         this.parentPath = parentPath;
-        this.contentType = BlobStorageUtil.getContentType(fileName);
+        this.contentType = contentType != null ? contentType : BlobStorageUtil.getContentType(fileName);
     }
 
     @Override

diff --git a/src/test/java/com/epam/aidial/core/FileApiTest.java b/src/test/java/com/epam/aidial/core/FileApiTest.java
@@ -109,7 +109,7 @@ public void testFileUpload(Vertx vertx, VertxTestContext context) {
         Checkpoint checkpoint = context.checkpoint(3);
         WebClient client = WebClient.create(vertx);
 
-        FileMetadata expectedFileMetadata = new FileMetadata("file.txt", "Users/User1/files", 17, "text/plain");
+        FileMetadata expectedFileMetadata = new FileMetadata("file.txt", "Users/User1/files", 17, "text/custom");
 
         Future.succeededFuture().compose((mapper) -> {
             Promise<Void> promise = Promise.promise();
@@ -136,7 +136,7 @@ public void testFileUpload(Vertx vertx, VertxTestContext context) {
                     .putHeader("Api-key", "proxyKey2")
                     .bearerTokenAuthentication(generateJwtToken("User1"))
                     .as(BodyCodec.json(FileMetadata.class))
-                    .sendMultipartForm(generateMultipartForm("file.txt", TEST_FILE_CONTENT),
+                    .sendMultipartForm(generateMultipartForm("file.txt", TEST_FILE_CONTENT, "text/custom"),
                             context.succeeding(response -> {
                                 context.verify(() -> {
                                     assertEquals(200, response.statusCode());
@@ -294,7 +294,11 @@ private static BlobStorage buildFsBlobStorage(Path baseDir) {
     }
 
     private static MultipartForm generateMultipartForm(String fileName, String content) {
-        return MultipartForm.create().textFileUpload("attachment", fileName, Buffer.buffer(content), "text/plain");
+        return generateMultipartForm(fileName, content, "text/plan");
+    }
+
+    private static MultipartForm generateMultipartForm(String fileName, String content, String contentType) {
+        return MultipartForm.create().textFileUpload("attachment", fileName, Buffer.buffer(content), contentType);
     }
 
     private static String generateJwtToken(String user) {