feat: changed file controller #41 (#42)

backend/src/main/java/com/quiz/converter/controller/FileController.java

 package com.quiz.converter.controller;
 
+import com.quiz.converter.models.FileDto;
+import com.quiz.converter.models.QuizDetails;
 import com.quiz.converter.services.ConverterService;
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.math3.util.Pair;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.http.client.MultipartBodyBuilder;
+import org.springframework.http.*;
 import org.springframework.stereotype.Controller;
-import org.springframework.util.MultiValueMap;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -17,6 +16,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.TransformerException;
 import java.io.IOException;
+import java.util.Objects;
 
 @Controller
 @RequestMapping(value = "/file/convert")
@@ -25,39 +25,27 @@ public class FileController {
     @Autowired
     ConverterService service;
 
-    @PostMapping(value = "/moodleXML")
-    public ResponseEntity<MultiValueMap<String, HttpEntity<?>>> convertDocFileToMoodleXML(@RequestBody MultipartFile file) throws IOException, ParserConfigurationException, TransformerException {
-        var convertedFileName = file.getOriginalFilename().replace(".docx", "") + "_moodle.xml";
-        var attachments = service.convertDocToMoodle(file);
-
-        var builder = new MultipartBodyBuilder();
-        builder.part("details", attachments.getSecond())
-                .contentType(MediaType.APPLICATION_JSON);
-        builder.part("file", attachments.getFirst())
-                .contentType(MediaType.APPLICATION_XML)
-                .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + convertedFileName);
-        var body = builder.build();
-
-        return ResponseEntity.ok()
-                .contentType(MediaType.MULTIPART_FORM_DATA)
-                .body(body);
+    @PostMapping("/moodleXML")
+    public ResponseEntity<FileDto> convertDocFileToMoodleXML(@RequestBody MultipartFile file) throws IOException, ParserConfigurationException, TransformerException {
+        var conversionResult = service.convertDocToMoodle(file);
+        var fileContent = conversionResult.getFirst();
+        var details = conversionResult.getSecond();
+        var base64EncodedFile = Base64.encodeBase64String(fileContent);
+
+        FileDto response = new FileDto(Objects.requireNonNull(file.getOriginalFilename()).replace(".docx", "") + "_moodle.xml", base64EncodedFile, details);
+
+        return ResponseEntity.ok(response);
     }
 
-    @PostMapping(value = "/courseraDocx")
-    public ResponseEntity<MultiValueMap<String, HttpEntity<?>>> convertDocFileToCourseraDocx(@RequestBody MultipartFile file) throws IOException {
-        var convertedFileName = file.getOriginalFilename().replace(".docx", "") + "_coursera.docx";
-        var attachments = service.convertDocToCoursera(file);
-
-        var builder = new MultipartBodyBuilder();
-        builder.part("details", attachments.getSecond())
-                .contentType(MediaType.APPLICATION_JSON);
-        builder.part("file", attachments.getFirst())
-                .contentType(MediaType.valueOf("application/vnd.ms-word"))
-                .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + convertedFileName);
-        var body = builder.build();
-
-        return ResponseEntity.ok()
-                .contentType(MediaType.MULTIPART_FORM_DATA)
-                .body(body);
+    @PostMapping("/courseraDocx")
+    public ResponseEntity<FileDto> convertDocFileToCourseraDocx(@RequestBody MultipartFile file) throws IOException {
+        var conversionResult = service.convertDocToCoursera(file);
+        var fileContent = conversionResult.getFirst();
+        var details = conversionResult.getSecond();
+        var base64EncodedFile = Base64.encodeBase64String(fileContent);
+
+        FileDto response = new FileDto(Objects.requireNonNull(file.getOriginalFilename()).replace(".docx", "") + "_coursera.docx", base64EncodedFile, details);
+
+        return ResponseEntity.ok(response);
     }
-}
+}
\ No newline at end of file

backend/src/main/java/com/quiz/converter/models/FileDto.java

+package com.quiz.converter.models;
+
+public record FileDto(String fileName, String file, QuizDetails details) {
+}
\ No newline at end of file