[fix] MVC 컨트롤러에서 byte[] 아닌 String으로 받도록 수정 (#70)

Team-Recordy · Jul 15, 2024 · 1116297 · 1116297
1 parent 5526edf
commit 1116297
Show file tree

Hide file tree

Showing 7 changed files with 61 additions and 18 deletions.
diff --git a/src/main/java/org/recordy/server/keyword/domain/Keyword.java b/src/main/java/org/recordy/server/keyword/domain/Keyword.java
@@ -2,6 +2,7 @@
 
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
+import java.util.Base64;
 import java.util.List;
 
 public enum Keyword {
@@ -20,12 +21,20 @@ public enum Keyword {
     트렌디한,
     ;
 
-    public byte[] encode() {
-        return name().getBytes(StandardCharsets.UTF_8);
+    public static String encode() {
+        return Base64.getEncoder().encodeToString(
+                Arrays.stream(Keyword.values())
+                        .map(Enum::name)
+                        .reduce((a, b) -> a + "," + b)
+                        .orElseThrow()
+                        .getBytes(StandardCharsets.UTF_8)
+        );
     }
 
-    public static List<Keyword> decode(byte[] utf8Bytes) {
-        String[] keywords = new String(utf8Bytes, StandardCharsets.UTF_8).split(",");
+    public static List<Keyword> decode(String utf8Bytes) {
+        String[] keywords = new String(Base64.getDecoder().decode(utf8Bytes), StandardCharsets.UTF_8).split(",");
+
+        System.out.println(Arrays.toString(keywords));
 
         return Arrays.stream(keywords)
                 .map(Keyword::valueOf)

diff --git a/src/main/java/org/recordy/server/keyword/domain/KeywordEntity.java b/src/main/java/org/recordy/server/keyword/domain/KeywordEntity.java
@@ -16,15 +16,12 @@ public class KeywordEntity extends JpaMetaInfoEntity {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
-    private String name;
-
     @Column(unique = true, nullable = false)
     @Enumerated(EnumType.STRING)
     private Keyword keyword;
 
     public KeywordEntity(Keyword keyword) {
         this.keyword = keyword;
-        this.name = keyword.name();
     }
 
     public static KeywordEntity from(Keyword keyword) {

diff --git a/src/main/java/org/recordy/server/record/controller/RecordApi.java b/src/main/java/org/recordy/server/record/controller/RecordApi.java
@@ -8,16 +8,13 @@
 import org.recordy.server.auth.security.UserId;
 import org.recordy.server.common.message.ErrorMessage;
 import org.recordy.server.record.controller.dto.request.RecordCreateRequest;
-import org.recordy.server.record.domain.File;
 import org.recordy.server.record.domain.Record;
 import org.springframework.data.domain.Slice;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.util.List;
-
 @Tag(name = "기록 관련 API")
 public interface RecordApi {
 
@@ -245,7 +242,7 @@ public ResponseEntity<Void> watch(
             }
     )
     public ResponseEntity<Slice<Record>> getFamousRecords(
-            @RequestParam(required = false) byte[] keywords,
+            @RequestParam(required = false) String keywords,
             @RequestParam(required = false, defaultValue = "0") int pageNumber,
             @RequestParam(required = false, defaultValue = "10") int pageSize
     ) ;
@@ -287,7 +284,7 @@ public ResponseEntity<Slice<Record>> getFamousRecords(
             }
     )
     public ResponseEntity<Slice<Record>> getRecentRecords(
-            @RequestParam(required = false) byte[] keywords,
+            @RequestParam(required = false) String keywords,
             @RequestParam(required = false, defaultValue = "0") Long cursorId,
             @RequestParam(required = false, defaultValue = "10") int size
     );

diff --git a/src/main/java/org/recordy/server/record/controller/RecordController.java b/src/main/java/org/recordy/server/record/controller/RecordController.java
@@ -32,7 +32,7 @@ public ResponseEntity<Record> createRecord(
             @RequestPart MultipartFile thumbnail,
             @RequestPart MultipartFile video
     ) {
-        RecordCreate recordCreate = RecordCreate.from(uploaderId, request);
+        RecordCreate recordCreate = RecordCreate.of(uploaderId, request);
         Record record = recordService.create(recordCreate, File.of(video, thumbnail));
 
         return ResponseEntity
@@ -56,7 +56,7 @@ public ResponseEntity<Void> deleteRecord(
     @Override
     @GetMapping("/recent")
     public ResponseEntity<Slice<Record>> getRecentRecords(
-            @RequestParam(required = false) byte[] keywords,
+            @RequestParam(required = false) String keywords,
             @RequestParam(required = false, defaultValue = "0") Long cursorId,
             @RequestParam(required = false, defaultValue = "10") int size
     ) {
@@ -70,7 +70,7 @@ public ResponseEntity<Slice<Record>> getRecentRecords(
     @Override
     @GetMapping("/famous")
     public ResponseEntity<Slice<Record>> getFamousRecords(
-            @RequestParam(required = false) byte[] keywords,
+            @RequestParam(required = false) String keywords,
             @RequestParam(required = false, defaultValue = "0") int pageNumber,
             @RequestParam(required = false, defaultValue = "10") int pageSize
     ) {

diff --git a/src/main/java/org/recordy/server/record/controller/dto/request/RecordCreateRequest.java b/src/main/java/org/recordy/server/record/controller/dto/request/RecordCreateRequest.java
@@ -3,5 +3,5 @@
 public record RecordCreateRequest(
         String location,
         String content,
-        byte[] keywords) {
+        String keywords) {
 }
diff --git a/src/main/java/org/recordy/server/record/domain/usecase/RecordCreate.java b/src/main/java/org/recordy/server/record/domain/usecase/RecordCreate.java
@@ -12,11 +12,12 @@ public record RecordCreate(
         List<Keyword> keywords
 ) {
 
-    public static RecordCreate from(Long uploaderId, RecordCreateRequest recordCreateRequest) {
+    public static RecordCreate of(Long uploaderId, RecordCreateRequest recordCreateRequest) {
         return new RecordCreate(
                 uploaderId,
                 recordCreateRequest.location(),
                 recordCreateRequest.content(),
-                Keyword.decode(recordCreateRequest.keywords()));
+                Keyword.decode(recordCreateRequest.keywords())
+        );
     }
 }
diff --git a/src/test/java/org/recordy/server/keyword/domain/KeywordTest.java b/src/test/java/org/recordy/server/keyword/domain/KeywordTest.java
@@ -0,0 +1,39 @@
+package org.recordy.server.keyword.domain;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.Base64;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertAll;
+
+class KeywordTest {
+
+    @Test
+    void encode를_통해_모든_키워드를_utf8로_인코딩할_수_있다() {
+        // given, when
+        String encodedKeywords = Keyword.encode();
+        List<Keyword> keywords = Keyword.decode(encodedKeywords);
+
+        // then
+        assertAll(
+                () -> assertThat(keywords.size()).isEqualTo(Keyword.values().length)
+        );
+    }
+
+    @Test
+    void decode를_통해_콤마로_연결된_채_인코딩된_문자열_utf8_코드를_해독하여_키워드_리스트로_디코딩할_수_있다() {
+        // given
+        String code = Base64.getEncoder().encodeToString("감각적인,강렬한".getBytes());
+
+        // when
+        List<Keyword> keywords = Keyword.decode(code);
+
+        // then
+        assertAll(
+                () -> assertThat(keywords.get(0)).isEqualTo(Keyword.감각적인),
+                () -> assertThat(keywords.get(1)).isEqualTo(Keyword.강렬한)
+        );
+    }
+}