[파일 업로드] tusHook 작업

- 진행중

src/main/java/com/alist/api/common/modules/file/FileController.java

@@ -83,10 +83,21 @@ public class FileController {
     }
 
     @PostMapping("/tusHook")
-    public ResponseEntity<ApiResponse<String>> tusHook(@RequestBody Map<String, Object> payload) {
+    public ResponseEntity<ApiResponse<String>> tusHook(@RequestBody TusHookForm tusHookForm) {
         // log.info("tusHookForm: {}", tusHookForm);
         // fileService.insertFileAndSave(tusHookForm.tusHookDto());
-        log.info("[tusHook] payload={}", payload);
+        log.info("[tusHook] type={}", tusHookForm.getType());
+        log.info("[tusHook] uploadId={}", tusHookForm.getTusHookEventForm().getTusHookUploadForm().getId());
+        log.info("[tusHook] size={}", tusHookForm.getTusHookEventForm().getTusHookUploadForm().getSize());
+        log.info("[tusHook] metaData={}", tusHookForm.getTusHookEventForm().getTusHookUploadForm().getMetaData());
+
+        log.info("[tusHookDto] type={}", tusHookForm.tusHookDto().getType());
+        log.info("[tusHookDto] uploadId={}", tusHookForm.tusHookDto().getUploadId());
+        log.info("[tusHookDto] size={}", tusHookForm.tusHookDto().getSize());
+        log.info("[tusHookDto] fileMasterKey={}", tusHookForm.tusHookDto().getFileMasterKey());
+        log.info("[tusHookDto] filename={}", tusHookForm.tusHookDto().getFilename());
+        log.info("[tusHookDto] filetype={}", tusHookForm.tusHookDto().getFiletype());
+
         return ApiResponse.entity("", ApiResponseCode.CODE_200);
     }
 }

src/main/java/com/alist/api/common/modules/file/dto/TusHookDto.java

@@ -1,13 +1,15 @@
 package com.alist.api.common.modules.file.dto;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.Getter;
 import lombok.Setter;
 
 @Getter
 @Setter
-@JsonIgnoreProperties(ignoreUnknown = true)
 public class TusHookDto {
-    private TusHookEventDto tusHookEventDto;
+    private String type;
-    private TusHookUploadDto tusHookUploadDto;
+    private String uploadId;
+    private Long size;
+    private String fileMasterKey;
+    private String filename;
+    private String filetype;
 }

src/main/java/com/alist/api/common/modules/file/form/TusHookEventForm.java

@@ -0,0 +1,14 @@
+package com.alist.api.common.modules.file.form;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class TusHookEventForm {
+    @JsonProperty("Upload")
+    private TusHookUploadForm tusHookUploadForm;
+}

src/main/java/com/alist/api/common/modules/file/form/TusHookForm.java

@@ -1,9 +1,8 @@
 package com.alist.api.common.modules.file.form;
 
 import com.alist.api.common.modules.file.dto.TusHookDto;
-import com.alist.api.common.modules.file.dto.TusHookEventDto;
-import com.alist.api.common.modules.file.dto.TusHookUploadDto;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -11,14 +10,31 @@ import lombok.Setter;
 @Setter
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class TusHookForm {
-    private TusHookEventDto event;
+    @JsonProperty("Type")
-    private TusHookUploadDto upload;
+    private String type;
+
+    @JsonProperty("Event")
+    private TusHookEventForm tusHookEventForm;
 
     public TusHookDto tusHookDto() {
-        TusHookDto tusHookDto = new TusHookDto();
+        TusHookDto dto = new TusHookDto();
-        tusHookDto.setTusHookEventDto(this.event);
-        tusHookDto.setTusHookUploadDto(this.upload);
 
-        return tusHookDto;
+        dto.setType(this.type);
+
+        if (this.tusHookEventForm == null || this.tusHookEventForm.getTusHookUploadForm() == null) {
+            return dto;
+        }
+
+        TusHookUploadForm upload = this.tusHookEventForm.getTusHookUploadForm();
+        dto.setUploadId(upload.getId());
+        dto.setSize(upload.getSize());
+
+        if (upload.getMetaData() != null) {
+            dto.setFileMasterKey(upload.getMetaData().get("fileMasterKey"));
+            dto.setFilename(upload.getMetaData().get("filename"));
+            dto.setFiletype(upload.getMetaData().get("filetype"));
+        }
+
+        return dto;
     }
 }

src/main/java/com/alist/api/common/modules/file/form/TusHookUploadForm.java

@@ -0,0 +1,22 @@
+package com.alist.api.common.modules.file.form;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Map;
+
+@Getter
+@Setter
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class TusHookUploadForm {
+    @JsonProperty("ID")
+    private String id;
+
+    @JsonProperty("Size")
+    private Long size;
+
+    @JsonProperty("MetaData")
+    private Map<String, String> metaData;
+}

src/main/java/com/alist/api/common/modules/file/service/FileService.java

@@ -74,22 +74,6 @@ public class FileService {
     }
 
     public void insertFileAndSave(TusHookDto tusHookDto) {
-        if (tusHookDto == null || tusHookDto.getTusHookEventDto() == null || tusHookDto.getTusHookUploadDto() == null) {
-            log.info("[tusHook] invalid payload");
-            return;
-        }
 
-        String eventType = tusHookDto.getTusHookEventDto().getType();
-        TusHookUploadDto upload = tusHookDto.getTusHookUploadDto();
-        Map<String, String> meta = upload.getMetaData();
-
-        String uploadId = upload.getId();
-        Long size = upload.getSize();
-        String fileMasterKey = meta == null ? null : meta.get("fileMasterKey");
-        String filename = meta == null ? null : meta.get("filename");
-        String filetype = meta == null ? null : meta.get("filetype");
-
-        log.info("[tusHook] eventType={}, uploadId={}, size={}, fileMasterKey={}, filename={}, filetype={}",
-                eventType, uploadId, size, fileMasterKey, filename, filetype);
     }
 }