fix: visitlist error check

TEAM-SYLUV · Jul 31, 2024 · bcdd6cc · bcdd6cc
1 parent 9dac4ef
commit bcdd6cc
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 12 deletions.
diff --git a/api-module/src/main/java/com/likelion/apimodule/market/application/MarketInfoUseCase.java b/api-module/src/main/java/com/likelion/apimodule/market/application/MarketInfoUseCase.java
@@ -11,6 +11,8 @@
 import com.likelion.coremodule.market.service.MarketQueryService;
 import com.likelion.coremodule.store.domain.Store;
 import com.likelion.coremodule.store.service.StoreQueryService;
+import com.likelion.coremodule.user.application.UserQueryService;
+import com.likelion.coremodule.user.domain.User;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
@@ -24,6 +26,7 @@ public class MarketInfoUseCase {
     private final MarketQueryService marketQueryService;
     private final VisitListQueryService visitListQueryService;
     private final StoreQueryService storeQueryService;
+    private final UserQueryService userQueryService;
     private final JwtUtil jwtUtil;
 
     public MarketInfo findMarketInfo(Long marketId) {
@@ -47,10 +50,13 @@ public void saveVisitList(Long storeId, String accessToken) {
         marketQueryService.saveVisitList(storeId, email);
     }
 
-    public List<VisitListInfo> findVisitList() {
+    public List<VisitListInfo> findVisitList(String accessToken) {
+
+        String email = jwtUtil.getEmail(accessToken);
+        User user = userQueryService.findByEmail(email);
 
         List<VisitListInfo> visitListInfos = new ArrayList<>();
-        List<VisitList> visitLists = visitListQueryService.findAllVisitList();
+        List<VisitList> visitLists = visitListQueryService.findVisitListsByUserId(user.getUserId());
 
         for (VisitList i : visitLists) {
             Long id = i.getId();

diff --git a/api-module/src/main/java/com/likelion/apimodule/market/application/VisitListSaveUseCase.java b/api-module/src/main/java/com/likelion/apimodule/market/application/VisitListSaveUseCase.java
@@ -13,13 +13,13 @@ public class VisitListSaveUseCase {
 
     private final VisitListQueryService visitListQueryService;
 
-    public void updateToPrepared(Long visitListId) {
+    public void updateToPrepared(String accessToken, Long visitListId) {
 
         VisitList visitList = visitListQueryService.findVisitListById(visitListId);
         visitList.updateToPrepared();
     }
 
-    public void updateToVisited(Long visitListId) {
+    public void updateToVisited(String accessToken, Long visitListId) {
 
         VisitList visitList = visitListQueryService.findVisitListById(visitListId);
         visitList.updateToPrepared();

diff --git a/api-module/src/main/java/com/likelion/apimodule/market/presentation/MarketController.java b/api-module/src/main/java/com/likelion/apimodule/market/presentation/MarketController.java
@@ -97,14 +97,14 @@ public ApplicationResponse<String> saveVisitList(@PathVariable Long storeId,
             }
     )
     @Operation(summary = "방문 리스트 조회 API", description = "방문 리스트 조회 API 입니다.")
-    public ApplicationResponse<List<VisitListInfo>> findVisitList() {
+    public ApplicationResponse<List<VisitListInfo>> findVisitList(@RequestHeader(AuthConsts.ACCESS_TOKEN_HEADER) String accessToken) {
 
-        final List<VisitListInfo> visitList = marketInfoUseCase.findVisitList();
+        final List<VisitListInfo> visitList = marketInfoUseCase.findVisitList(accessToken);
         return ApplicationResponse.ok(visitList);
     }
 
     // 방문 리스트 - 준비 완료로 변경
-    @PatchMapping("/{visitlistId}/visitlist/prepared}")
+    @PatchMapping("/{visitlistId}/visitlist/prepared")
     @ApiResponses(
             value = {
                     @ApiResponse(
@@ -115,14 +115,15 @@ public ApplicationResponse<List<VisitListInfo>> findVisitList() {
             }
     )
     @Operation(summary = "방문 리스트 준비 완료로 변경 API", description = "방문 리스트 준비 완료로 변경 API 입니다.")
-    public ApplicationResponse<String> changeToPrepared(@PathVariable Long visitlistId) {
+    public ApplicationResponse<String> changeToPrepared(@RequestHeader(AuthConsts.ACCESS_TOKEN_HEADER) String accessToken,
+                                                        @PathVariable Long visitlistId) {
 
-        visitListSaveUseCase.updateToPrepared(visitlistId);
+        visitListSaveUseCase.updateToPrepared(accessToken, visitlistId);
         return ApplicationResponse.ok("준비 완료로 변경했습니다.");
     }
 
     // 방문 리스트 - 방문 완료로 변경
-    @PatchMapping("/{visitlistId}/visitlist/visited}")
+    @PatchMapping("/{visitlistId}/visitlist/visited")
     @ApiResponses(
             value = {
                     @ApiResponse(
@@ -133,9 +134,10 @@ public ApplicationResponse<String> changeToPrepared(@PathVariable Long visitlist
             }
     )
     @Operation(summary = "방문 리스트 방문 완료로 변경 API", description = "방문 리스트 방문 완료로 변경 API 입니다.")
-    public ApplicationResponse<String> changeToVisited(@PathVariable Long visitlistId) {
+    public ApplicationResponse<String> changeToVisited(@RequestHeader(AuthConsts.ACCESS_TOKEN_HEADER) String accessToken,
+                                                       @PathVariable Long visitlistId) {
 
-        visitListSaveUseCase.updateToVisited(visitlistId);
+        visitListSaveUseCase.updateToVisited(accessToken, visitlistId);
         return ApplicationResponse.ok("준비 완료로 변경했습니다.");
     }
 

diff --git a/...odule/src/main/java/com/likelion/coremodule/VisitList/repository/VisitListRepository.java b/...odule/src/main/java/com/likelion/coremodule/VisitList/repository/VisitListRepository.java
@@ -3,7 +3,11 @@
 import com.likelion.coremodule.VisitList.domain.VisitList;
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import java.util.List;
+
 public interface VisitListRepository extends JpaRepository<VisitList, Long> {
 
     VisitList findVisitListByUserUserIdAndStoreId(Long userId, Long storeId);
+
+    List<VisitList> findVisitListsByUserUserId(Long userId);
 }
diff --git a/...module/src/main/java/com/likelion/coremodule/VisitList/service/VisitListQueryService.java b/...module/src/main/java/com/likelion/coremodule/VisitList/service/VisitListQueryService.java
@@ -22,4 +22,8 @@ public List<VisitList> findAllVisitList() {
     public VisitList findVisitListById(Long id) {
         return visitListRepository.findById(id).orElseThrow(() -> new VisitException(VisitErrorCode.NO_VISIT_LIST_INFO));
     }
+
+    public List<VisitList> findVisitListsByUserId(Long userId) {
+        return visitListRepository.findVisitListsByUserUserId(userId);
+    }
 }