[fix] merge 충돌 해결 및 테스트 오류 해결 (#70)

Team-Recordy · Jul 15, 2024 · b82f51d · b82f51d
1 parent 6599f0b
commit b82f51d
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 23 deletions.
diff --git a/src/main/java/org/recordy/server/record/controller/RecordApi.java b/src/main/java/org/recordy/server/record/controller/RecordApi.java
@@ -9,7 +9,6 @@
 import org.recordy.server.common.message.ErrorMessage;
 import org.recordy.server.record.controller.dto.request.RecordCreateRequest;
 import org.recordy.server.record.controller.dto.response.RecordInfoWithBookmark;
-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;
@@ -78,7 +77,7 @@ public interface RecordApi {
                     )
             }
     )
-    public ResponseEntity<Record> createRecord(
+    ResponseEntity<Record> createRecord(
             @UserId Long uploaderId,
             @RequestPart RecordCreateRequest request,
             @RequestPart MultipartFile thumbnail,
@@ -126,7 +125,7 @@ public ResponseEntity<Record> createRecord(
                     )
             }
     )
-    public ResponseEntity<Void> deleteRecord(
+    ResponseEntity<Void> deleteRecord(
             @UserId Long uploaderId,
             @PathVariable Long recordId
     );
@@ -167,7 +166,7 @@ public ResponseEntity<Void> deleteRecord(
                     )
             }
     )
-    public ResponseEntity<Slice<RecordInfoWithBookmark>> getRecentRecordInfosWithBookmarksByUser(
+    ResponseEntity<Slice<RecordInfoWithBookmark>> getRecentRecordInfosWithBookmarksByUser(
             @UserId Long userId,
             @RequestParam(required = false, defaultValue = "0") long cursorId,
             @RequestParam(required = false, defaultValue = "10") int size
@@ -204,7 +203,7 @@ public ResponseEntity<Slice<RecordInfoWithBookmark>> getRecentRecordInfosWithBoo
                     )
             }
     )
-    public ResponseEntity<Void> watch(
+    ResponseEntity<Void> watch(
             @UserId Long userId,
             @PathVariable Long recordId
     );
@@ -245,9 +244,9 @@ public ResponseEntity<Void> watch(
                     )
             }
     )
-    public ResponseEntity<Slice<RecordInfoWithBookmark>> getFamousRecordInfoWithBookmarks(
+    ResponseEntity<Slice<RecordInfoWithBookmark>> getFamousRecordInfoWithBookmarks(
             @UserId Long userId,
-            @RequestParam(required = false) List<String> keywords,
+            @RequestParam(required = false) String keywords,
             @RequestParam(required = false, defaultValue = "0") int pageNumber,
             @RequestParam(required = false, defaultValue = "10") int pageSize
     ) ;
@@ -288,9 +287,9 @@ public ResponseEntity<Slice<RecordInfoWithBookmark>> getFamousRecordInfoWithBook
                     )
             }
     )
-    public ResponseEntity<Slice<RecordInfoWithBookmark>> getRecentRecordInfosWithBookmarks(
+    ResponseEntity<Slice<RecordInfoWithBookmark>> getRecentRecordInfosWithBookmarks(
             @UserId Long userId,
-            @RequestParam(required = false) List<String> keywords,
+            @RequestParam(required = false) String keywords,
             @RequestParam(required = false, defaultValue = "0") Long cursorId,
             @RequestParam(required = false, defaultValue = "10") int size
     );
@@ -331,7 +330,7 @@ public ResponseEntity<Slice<RecordInfoWithBookmark>> getRecentRecordInfosWithBoo
                     )
             }
     )
-    public ResponseEntity<Slice<RecordInfoWithBookmark>> getSubscribingRecordInfosWithBookmarks(
+    ResponseEntity<Slice<RecordInfoWithBookmark>> getSubscribingRecordInfosWithBookmarks(
             @UserId Long userId,
             @RequestParam(required = false, defaultValue = "0") long cursorId,
             @RequestParam(required = false, defaultValue = "10") int size
@@ -373,7 +372,7 @@ public ResponseEntity<Slice<RecordInfoWithBookmark>> getSubscribingRecordInfosWi
                     )
             }
     )
-    public ResponseEntity<List<RecordInfoWithBookmark>> getTotalRecordInfosWithBookmarks(
+    ResponseEntity<List<RecordInfoWithBookmark>> getTotalRecordInfosWithBookmarks(
             @UserId Long userId,
             @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
@@ -2,6 +2,7 @@
 
 import lombok.RequiredArgsConstructor;
 import org.recordy.server.auth.security.UserId;
+import org.recordy.server.keyword.domain.Keyword;
 import org.recordy.server.record.controller.dto.request.RecordCreateRequest;
 import org.recordy.server.record.controller.dto.response.RecordInfoWithBookmark;
 import org.recordy.server.record.domain.File;
@@ -10,14 +11,12 @@
 import org.recordy.server.record.domain.usecase.RecordCreate;
 import org.recordy.server.record.service.RecordService;
 import org.recordy.server.record_stat.service.RecordStatService;
-import org.recordy.server.record.service.S3Service;
 import org.springframework.data.domain.Slice;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 @RequiredArgsConstructor
@@ -36,7 +35,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
@@ -61,11 +60,11 @@ public ResponseEntity<Void> deleteRecord(
     @GetMapping("/recent")
     public ResponseEntity<Slice<RecordInfoWithBookmark>> getRecentRecordInfosWithBookmarks(
             @UserId Long userId,
-            @RequestParam(required = false) List<String> keywords,
+            @RequestParam(required = false) String keywords,
             @RequestParam(required = false, defaultValue = "0") Long cursorId,
             @RequestParam(required = false, defaultValue = "10") int size
     ) {
-        Slice<Record> records = recordService.getRecentRecords(keywords, cursorId, size);
+        Slice<Record> records = recordService.getRecentRecords(Keyword.decode(keywords), cursorId, size);
         List<Boolean> bookmarks = recordStatService.findBookmarks(userId, records.getContent());
 
         return ResponseEntity.ok().body(RecordInfoWithBookmark.of(records, bookmarks));
@@ -75,11 +74,11 @@ public ResponseEntity<Slice<RecordInfoWithBookmark>> getRecentRecordInfosWithBoo
     @GetMapping("/famous")
     public ResponseEntity<Slice<RecordInfoWithBookmark>> getFamousRecordInfoWithBookmarks(
             @UserId Long userId,
-            @RequestParam(required = false) List<String> keywords,
+            @RequestParam(required = false) String keywords,
             @RequestParam(required = false, defaultValue = "0") int pageNumber,
             @RequestParam(required = false, defaultValue = "10") int pageSize
     ){
-        Slice<Record> records = recordService.getFamousRecords(keywords, pageNumber, pageSize);
+        Slice<Record> records = recordService.getFamousRecords(Keyword.decode(keywords), pageNumber, pageSize);
         List<Boolean> bookmarks = recordStatService.findBookmarks(userId, records.getContent());
 
         return ResponseEntity

diff --git a/src/main/java/org/recordy/server/record/repository/RecordRepository.java b/src/main/java/org/recordy/server/record/repository/RecordRepository.java
@@ -23,6 +23,7 @@ public interface RecordRepository {
     Slice<Record> findAllByIdAfterAndKeywordsOrderByIdDesc(List<Keyword> keywords, long cursor, Pageable pageable);
     Slice<Record> findAllByUserIdOrderByIdDesc(long userId, long cursor, Pageable pageable);
     Slice<Record> findAllBySubscribingUserIdOrderByIdDesc(long userId, long cursor, Pageable pageable);
+    Map<Keyword, Long> countAllByUserIdGroupByKeyword(long userId);
     long countAllByUserId(long userId);
     Optional<Long> findMaxId();
     Long count();

diff --git a/src/main/java/org/recordy/server/record/service/impl/RecordServiceImpl.java b/src/main/java/org/recordy/server/record/service/impl/RecordServiceImpl.java
@@ -1,7 +1,6 @@
 package org.recordy.server.record.service.impl;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.Optional;
 import java.util.Random;

diff --git a/src/test/java/org/recordy/server/record/service/RecordServiceTest.java b/src/test/java/org/recordy/server/record/service/RecordServiceTest.java
@@ -28,8 +28,8 @@ void init() {
         recordService = fakeContainer.recordService;
         UserRepository userRepository = fakeContainer.userRepository;
 
-        userRepository.save(DomainFixture.createUser(UserStatus.ACTIVE));
-        userRepository.save(DomainFixture.createUser(UserStatus.ACTIVE));
+        userRepository.save(DomainFixture.createUser(1));
+        userRepository.save(DomainFixture.createUser(2));
     }
 
     @Test

diff --git a/src/test/java/org/recordy/server/record_stat/service/RecordStatServiceTest.java b/src/test/java/org/recordy/server/record_stat/service/RecordStatServiceTest.java
@@ -26,8 +26,8 @@ void init() {
         UserRepository userRepository = fakeContainer.userRepository;
         RecordRepository recordRepository = fakeContainer.recordRepository;
 
-        userRepository.save(DomainFixture.createUser(UserStatus.ACTIVE));
-        userRepository.save(DomainFixture.createUser(UserStatus.ACTIVE));
+        userRepository.save(DomainFixture.createUser(1));
+        userRepository.save(DomainFixture.createUser(2));
         recordRepository.save(DomainFixture.createRecord());
         recordRepository.save(DomainFixture.createRecord());
         recordRepository.save(DomainFixture.createRecord());