feat : 저장한 암장 목록 조회 구현

GBGreenBravo · GBGreenBravo · commit 1b34bd6c3c1b · 2024-05-14T01:36:02.000+09:00
diff --git a/orury-client/src/main/java/org/orury/client/gym/application/GymService.java b/orury-client/src/main/java/org/orury/client/gym/application/GymService.java
@@ -13,6 +13,8 @@ public interface GymService {
 
     List<GymDto> getGymDtosByAreaGridOrderByDistanceAsc(AreaGrid areaGrid, float latitude, float longitude);
 
+    List<GymDto> getGymDtosByUserLiked(Long userId, Long cursor);
+
     void createGymLike(GymLikeDto gymLikeDto);
 
     void deleteGymLike(GymLikeDto gymLikeDto);
diff --git a/orury-client/src/main/java/org/orury/client/gym/application/GymServiceImpl.java b/orury-client/src/main/java/org/orury/client/gym/application/GymServiceImpl.java
@@ -6,11 +6,13 @@
 import org.orury.common.error.code.GymErrorCode;
 import org.orury.common.error.exception.BusinessException;
 import org.orury.common.util.BusinessHoursConverter;
+import org.orury.domain.global.constants.NumberConstants;
 import org.orury.domain.gym.domain.GymReader;
 import org.orury.domain.gym.domain.GymStore;
 import org.orury.domain.gym.domain.dto.GymDto;
 import org.orury.domain.gym.domain.dto.GymLikeDto;
 import org.orury.domain.gym.domain.entity.Gym;
+import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -49,6 +51,16 @@ public List<GymDto> getGymDtosByAreaGridOrderByDistanceAsc(AreaGrid areaGrid, fl
         return sortGymsByDistanceAsc(gyms, latitude, longitude);
     }
 
+    @Override
+    @Transactional(readOnly = true)
+    public List<GymDto> getGymDtosByUserLiked(Long userId, Long cursor) {
+        var pageRequest = PageRequest.of(0, NumberConstants.GYM_PAGINATION_SIZE);
+        return gymReader.findGymsByUserLiked(userId, cursor, pageRequest)
+                .stream()
+                .map(GymDto::from)
+                .toList();
+    }
+
     @Override
     @Transactional
     public void createGymLike(GymLikeDto gymLikeDto) {
diff --git a/orury-client/src/main/java/org/orury/client/user/application/UserFacade.java b/orury-client/src/main/java/org/orury/client/user/application/UserFacade.java
@@ -6,21 +6,19 @@
 import org.orury.client.crew.application.CrewService;
 import org.orury.client.global.IdIdentifiable;
 import org.orury.client.global.WithCursorResponse;
+import org.orury.client.gym.application.GymService;
 import org.orury.client.meeting.application.MeetingService;
 import org.orury.client.post.application.PostService;
 import org.orury.client.review.application.ReviewService;
 import org.orury.client.user.interfaces.request.MeetingViewedRequest;
 import org.orury.client.user.interfaces.request.UserInfoRequest;
-import org.orury.client.user.interfaces.response.*;
 import org.orury.client.user.interfaces.request.UserReportRequest;
-import org.orury.client.user.interfaces.response.MyCommentResponse;
-import org.orury.client.user.interfaces.response.MyMeetingResponse;
-import org.orury.client.user.interfaces.response.MyPostResponse;
-import org.orury.client.user.interfaces.response.MyReviewResponse;
+import org.orury.client.user.interfaces.response.*;
 import org.orury.domain.comment.domain.dto.CommentDto;
 import org.orury.domain.crew.domain.dto.CrewDto;
 import org.orury.domain.crew.domain.entity.CrewMemberPK;
 import org.orury.domain.global.constants.NumberConstants;
+import org.orury.domain.gym.domain.dto.GymDto;
 import org.orury.domain.meeting.domain.dto.MeetingDto;
 import org.orury.domain.post.domain.dto.PostDto;
 import org.orury.domain.review.domain.dto.ReviewDto;
@@ -42,6 +40,7 @@ public class UserFacade {
     private final CommentService commentService;
     private final MeetingService meetingService;
     private final CrewService crewService;
+    private final GymService gymService;
 
     public UserDto readMypage(Long id) {
         return userService.getUserDtoById(id);
@@ -78,6 +77,12 @@ public WithCursorResponse<MyCommentResponse> getCommentsByUserId(Long id, Long c
         return convertDtosToWithCursorResponse(commmentDtos, MyCommentResponse::of, cursor);
     }
 
+    public WithCursorResponse<MyGymResponse> getGymsByUserLiked(Long userId, Long cursor) {
+        List<GymDto> gymDtos = gymService.getGymDtosByUserLiked(userId, cursor);
+
+        return convertDtosToWithCursorResponse(gymDtos, MyGymResponse::of, cursor);
+    }
+
     public List<MyMeetingResponse> getMeetingsByUserId(Long userId) {
         List<MeetingDto> meetingDtos = meetingService.getUpcomingMeetingDtosByUserId(userId);
 
diff --git a/orury-client/src/main/java/org/orury/client/user/interfaces/UserController.java b/orury-client/src/main/java/org/orury/client/user/interfaces/UserController.java
@@ -81,6 +81,14 @@ public ApiResponse getCommentsByUserId(@AuthenticationPrincipal UserPrincipal us
         return ApiResponse.of(UserMessage.USER_COMMENTS_READ.getMessage(), cursorResponse);
     }
 
+    @Operation(summary = "내가 저장한 암장목록 조회", description = "user_id로 내가 저장한 암장목록을 조회한다.")
+    @GetMapping("/gyms")
+    public ApiResponse getGymsByUserLiked(@AuthenticationPrincipal UserPrincipal userPrincipal, @RequestParam Long cursor) {
+        WithCursorResponse<MyGymResponse> cursorResponse = userFacade.getGymsByUserLiked(userPrincipal.id(), cursor);
+
+        return ApiResponse.of(UserMessage.USER_GYMS_READ.getMessage(), cursorResponse);
+    }
+
     @Operation(summary = "다가오는 크루일정 조회", description = "user_id로 다가오는 크루일정 목록을 조회한다.")
     @GetMapping("/meetings")
     public ApiResponse getMeetingsByUserId(@AuthenticationPrincipal UserPrincipal userPrincipal) {
diff --git a/orury-client/src/main/java/org/orury/client/user/interfaces/message/UserMessage.java b/orury-client/src/main/java/org/orury/client/user/interfaces/message/UserMessage.java
@@ -12,6 +12,7 @@ public enum UserMessage {
     USER_POSTS_READ("작성한 게시글을 조회했습니다."),
     USER_COMMENTS_READ("작성한 댓글을 조회했습니다."),
     USER_REVIEWS_READ("작성한 리뷰를 조회했습니다."),
+    USER_GYMS_READ("저장한 암장을 조회했습니다."),
     USER_CREW_MEMBERS_READ("크루 일정 조회여부를 조회했습니다."),
     USER_MEETING_VIEWED_UPDATED("크루 일정 조회여부를 수정했습니다."),
     USER_MEETINGS_READ("다가오는 크루 일정을 조회했습니다."),
diff --git a/orury-client/src/main/java/org/orury/client/user/interfaces/response/MyGymResponse.java b/orury-client/src/main/java/org/orury/client/user/interfaces/response/MyGymResponse.java
@@ -0,0 +1,21 @@
+package org.orury.client.user.interfaces.response;
+
+import org.orury.client.global.IdIdentifiable;
+import org.orury.domain.global.domain.Region;
+import org.orury.domain.gym.domain.dto.GymDto;
+
+public record MyGymResponse(
+        Long id,
+        String gymName,
+        String gymType,
+        String region
+) implements IdIdentifiable {
+    public static MyGymResponse of(GymDto gymDto) {
+        return new MyGymResponse(
+                gymDto.id(),
+                gymDto.name(),
+                gymDto.gymType().getDescription(),
+                Region.getDescriptionFromAddress(gymDto.address())
+        );
+    }
+}
diff --git a/orury-domain/src/main/java/org/orury/domain/global/domain/Region.java b/orury-domain/src/main/java/org/orury/domain/global/domain/Region.java
@@ -44,4 +44,13 @@ public static Region getEnumFromValue(String value) {
         }
         return null;
     }
+
+    public static String getDescriptionFromAddress(String address) {
+        for (Region region : Region.values()) {
+            if (address.contains(region.getDescription())) {
+                return region.description;
+            }
+        }
+        return null;
+    }
 }
diff --git a/orury-domain/src/main/java/org/orury/domain/gym/domain/GymReader.java b/orury-domain/src/main/java/org/orury/domain/gym/domain/GymReader.java
@@ -2,6 +2,7 @@
 
 import org.orury.domain.gym.domain.entity.Gym;
 import org.orury.domain.gym.domain.entity.GymLikePK;
+import org.springframework.data.domain.Pageable;
 
 import java.util.List;
 import java.util.Map;
@@ -16,6 +17,8 @@ public interface GymReader {
 
     List<Gym> findGymsInAreaGrid(Map<String, Double> gridMap);
 
+    List<Gym> findGymsByUserLiked(Long userId, Long cursor, Pageable pageRequest);
+
     boolean existsGymLikeById(GymLikePK gymLikePK);
 
     boolean existsGymLikeByUserIdAndGymId(Long userId, Long gymId);
diff --git a/orury-domain/src/main/java/org/orury/domain/gym/infrastructure/GymLikeRepository.java b/orury-domain/src/main/java/org/orury/domain/gym/infrastructure/GymLikeRepository.java
@@ -1,7 +1,8 @@
 package org.orury.domain.gym.infrastructure;
 
-import org.orury.domain.gym.domain.entity.GymLikePK;
 import org.orury.domain.gym.domain.entity.GymLike;
+import org.orury.domain.gym.domain.entity.GymLikePK;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;
@@ -10,4 +11,8 @@ public interface GymLikeRepository extends JpaRepository<GymLike, GymLikePK> {
     boolean existsByGymLikePK_UserIdAndGymLikePK_GymId(Long userId, Long gymId);
 
     List<GymLike> findByGymLikePK_UserId(Long userId);
+
+    List<GymLike> findByGymLikePK_UserIdOrderByGymLikePKDesc(Long userId, Pageable pageable);
+
+    List<GymLike> findByGymLikePK_UserIdAndGymLikePK_GymIdLessThanOrderByGymLikePKDesc(Long userId, Long cursor, Pageable pageable);
 }
diff --git a/orury-domain/src/main/java/org/orury/domain/gym/infrastructure/GymReaderImpl.java b/orury-domain/src/main/java/org/orury/domain/gym/infrastructure/GymReaderImpl.java
@@ -1,9 +1,12 @@
 package org.orury.domain.gym.infrastructure;
 
 import lombok.RequiredArgsConstructor;
+import org.orury.domain.global.constants.NumberConstants;
 import org.orury.domain.gym.domain.GymReader;
 import org.orury.domain.gym.domain.entity.Gym;
+import org.orury.domain.gym.domain.entity.GymLike;
 import org.orury.domain.gym.domain.entity.GymLikePK;
+import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -40,6 +43,16 @@ public List<Gym> findGymsInAreaGrid(Map<String, Double> gridMap) {
         );
     }
 
+    @Override
+    public List<Gym> findGymsByUserLiked(Long userId, Long cursor, Pageable pageRequest) {
+        List<GymLike> gymLikes = (cursor.equals(NumberConstants.FIRST_CURSOR))
+                ? gymLikeRepository.findByGymLikePK_UserIdOrderByGymLikePKDesc(userId, pageRequest)
+                : gymLikeRepository.findByGymLikePK_UserIdAndGymLikePK_GymIdLessThanOrderByGymLikePKDesc(userId, cursor, pageRequest);
+        return gymLikes.stream()
+                .map(gymLike -> gymRepository.findById(gymLike.getGymLikePK().getGymId()).orElse(null))
+                .toList();
+    }
+
     @Override
     public boolean existsGymLikeById(GymLikePK gymLikePK) {
         return gymLikeRepository.existsById(gymLikePK);

Original file line number	Diff line number	Diff line change
`@@ -44,4 +44,13 @@ public static Region getEnumFromValue(String value) {`
`44`	`44`	`}`
`45`	`45`	`return null;`
`46`	`46`	`}`
	`47`	`+`
	`48`	`+ public static String getDescriptionFromAddress(String address) {`
	`49`	`+ for (Region region : Region.values()) {`
	`50`	`+ if (address.contains(region.getDescription())) {`
	`51`	`+ return region.description;`
	`52`	`+ }`
	`53`	`+ }`
	`54`	`+ return null;`
	`55`	`+ }`
`47`	`56`	`}`