Merge pull request #70 from SeoyeonPark1223/feature-67

#67 Feature: 검색, 컬렉션 기능에서 로그인 안 된 유저 처리 로직 추가

Author: SeoyeonPark1223

src/main/java/com/memesphere/domain/collection/controller/CollectionRestController.java

@@ -5,6 +5,8 @@
 import com.memesphere.domain.collection.entity.Collection;
 import com.memesphere.domain.collection.dto.response.CollectionPageResponse;
 import com.memesphere.domain.collection.service.CollectionQueryService;
+import com.memesphere.global.apipayload.code.status.ErrorStatus;
+import com.memesphere.global.apipayload.exception.GeneralException;
 import com.memesphere.global.jwt.CustomUserDetails;
 import com.memesphere.global.jwt.TokenProvider;
 import com.memesphere.global.validation.annotation.CheckPage;
@@ -22,7 +24,6 @@
 @Tag(name="콜렉션", description = "콜렉션 관련  API")
 @RestController
 @RequiredArgsConstructor
-//@RequestMapping("/collection")
 public class CollectionRestController {
     private final CollectionQueryService collectionQueryService;
     private final CollectionCommandService collectionCommandService;
@@ -31,12 +32,14 @@ public class CollectionRestController {
     @GetMapping("/collection")
     @Operation(summary = "사용자의 밈코인 콜렉션 모음 조회 API")
     public ApiResponse<CollectionPageResponse> getCollectionList (
-//            @AuthenticationPrincipal User user, // 현재 로그인한 사용자 (아직 구현 x)
+            @AuthenticationPrincipal CustomUserDetails userDetails, // 현재 로그인한 사용자
             @CheckPage @RequestParam(name = "page") Integer page // 페이지 번호
     ) {
         Integer pageNumber = page - 1;
-//        Long userId = user.getId();
-        Long userId = 1L;
+        Long userId = (userDetails == null) ? null : userDetails.getUser().getId();
+
+        // 유저를 찾지 못하면(로그인을 안 했으면) 콜렉션 접근 못하도록 에러 처리
+        if (userId == null) throw new GeneralException(ErrorStatus.USER_NOT_FOUND);
 
         Page<Collection> collectionPage = collectionQueryService.getCollectionPage(userId, pageNumber);
         return ApiResponse.onSuccess(CollectionConverter.toCollectionPageDTO(collectionPage));

src/main/java/com/memesphere/domain/collection/service/CollectionQueryServiceImpl.java

@@ -9,13 +9,13 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
 @Service
 @RequiredArgsConstructor
 public class CollectionQueryServiceImpl implements CollectionQueryService {
-    private final UserRepository userRepository;
     private final CollectionRepository collectionRepository;
 
     @Transactional(readOnly = true)
@@ -28,6 +28,8 @@ public Page<Collection> getCollectionPage(Long userId, Integer pageNumber) {
     @Transactional(readOnly = true)
     @Override
     public List<Long> getUserCollectionIds(Long userId) {
+        if (userId == null) return Collections.emptyList();
+
         return collectionRepository.findAllByUserId(userId).stream()
                 .map(Collection::getMemeCoinId)
                 .collect(Collectors.toList());

src/main/java/com/memesphere/domain/search/controller/SearchRestController.java

@@ -8,10 +8,13 @@
 import com.memesphere.domain.collection.service.CollectionQueryService;
 import com.memesphere.domain.search.service.SearchQueryService;
 import com.memesphere.domain.search.converter.SearchConverter;
+import com.memesphere.global.jwt.CustomUserDetails;
 import com.memesphere.global.validation.annotation.CheckPage;
 import io.swagger.v3.oas.annotations.Operation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
@@ -20,7 +23,6 @@
 
 @RestController
 @RequiredArgsConstructor
-//@RequestMapping("/")
 public class SearchRestController {
     private final SearchQueryService searchQueryService;
     private final CollectionQueryService collectionQueryService;
@@ -31,12 +33,11 @@ public ApiResponse<SearchPageResponse> getSearchPage(
             @RequestParam(name = "searchWord") String searchWord, // 검색어
             @RequestParam(name = "viewType", defaultValue = "GRID") ViewType viewType, // 뷰 타입 (grid 또는 list)
             @RequestParam(name = "sortType", defaultValue = "PRICE_CHANGE") SortType sortType, // 정렬 기준 (MKTCap, 24h Volume, Price)
-            @CheckPage @RequestParam(name = "page") Integer page // 페이지 번호
-//            @AuthenticationPrincipal UserDetails user // 현재 로그인한 유저
+            @CheckPage @RequestParam(name = "page") Integer page, // 페이지 번호
+            @AuthenticationPrincipal CustomUserDetails userDetails // 현재 로그인한 유저
     ) {
         Integer pageNumber = page - 1;
-//        Long userId = user.getId();
-        Long userId = 1L;
+        Long userId = (userDetails == null) ? null : userDetails.getUser().getId();
 
         Page<MemeCoin> searchPage = searchQueryService.getSearchPage(searchWord, viewType, sortType, pageNumber);
         List<Long> userCollectionIds = collectionQueryService.getUserCollectionIds(userId);