Main배포 v0.2.7

src/main/java/com/climeet/climeet_backend/domain/climbinggym/ClimbingGymController.java

@@ -60,7 +60,7 @@ public ResponseEntity<PageResponseDto<List<AcceptedClimbingGymSimpleResponse>>>
     @GetMapping("/{gymId}")
     public ResponseEntity<ClimbingGymDetailResponse> getClimbingGymInfo(
         @PathVariable Long gymId, @CurrentUser User user) {
-        return ResponseEntity.ok(climbingGymService.getClimbingGymInfo(gymId));
+        return ResponseEntity.ok(climbingGymService.getClimbingGymInfo(gymId, user));
     }
 
 

src/main/java/com/climeet/climeet_backend/domain/climbinggym/ClimbingGymRepository.java

@@ -1,10 +1,13 @@
 package com.climeet.climeet_backend.domain.climbinggym;
 
+import io.lettuce.core.dynamic.annotation.Param;
 import java.util.List;
 import java.util.Optional;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Slice;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
 @Repository
@@ -14,5 +17,6 @@ public interface ClimbingGymRepository extends JpaRepository<ClimbingGym, Long>
 
     Page<ClimbingGym> findByNameContaining(String gymName, Pageable pageable);
 
-    Page<ClimbingGym> findByNameContainingAndManagerIsNotNull(String gymName, Pageable pageable);
+    @Query("SELECT cg FROM ClimbingGym cg LEFT JOIN Manager m on cg.id = m.climbingGym.id WHERE cg.name LIKE %:name% AND m.id IS NOT NULL")
+    Page<ClimbingGym> findByNameContainingAndManagerIsNotNull(@Param("name") String name, Pageable pageable);
 }

src/main/java/com/climeet/climeet_backend/domain/climbinggym/ClimbingGymService.java

@@ -109,7 +109,7 @@ public PageResponseDto<List<AcceptedClimbingGymSimpleResponse>> searchAcceptedCl
 
     }
 
-    public ClimbingGymDetailResponse getClimbingGymInfo(Long gymId) {
+    public ClimbingGymDetailResponse getClimbingGymInfo(Long gymId, User user) {
         ClimbingGym climbingGym = climbingGymRepository.findById(gymId)
             .orElseThrow(() -> new GeneralException(ErrorStatus._EMPTY_CLIMBING_GYM));
 
@@ -119,8 +119,11 @@ public ClimbingGymDetailResponse getClimbingGymInfo(Long gymId) {
         ClimbingGymBackgroundImage backgroundImage = climbingGymBackgroundImageRepository.findByClimbingGym(
                 climbingGym)
             .orElseThrow(() -> new GeneralException(ErrorStatus._EMPTY_BACKGROUND_IMAGE));
-
-        return ClimbingGymDetailResponse.toDTO(climbingGym, manager, backgroundImage.getImgUrl());
+        Boolean status = false;
+        if(followRelationshipRepository.findByFollowerIdAndFollowingId(user.getId(),climbingGym.getManager().getId()).isPresent()){
+            status = true;
+        }
+        return ClimbingGymDetailResponse.toDTO(climbingGym, manager, backgroundImage.getImgUrl(),status);
     }
 
     public ClimbingGymTabInfoResponse getClimbingGymTabInfo(Long gymId) {

src/main/java/com/climeet/climeet_backend/domain/climbinggym/dto/ClimbingGymResponseDto.java

@@ -76,9 +76,10 @@ public static class ClimbingGymDetailResponse {
         private Long followingCount;
         private float averageRating;
         private int reviewCount;
+        private Boolean isFollower;
 
         public static ClimbingGymDetailResponse toDTO(ClimbingGym climbingGym, Manager manager,
-            String gymBackGroundImageUrl) {
+            String gymBackGroundImageUrl, Boolean isFollower) {
             return ClimbingGymDetailResponse.builder()
                 .gymId(climbingGym.getId())
                 .gymProfileImageUrl(climbingGym.getProfileImageUrl())
@@ -88,6 +89,7 @@ public static ClimbingGymDetailResponse toDTO(ClimbingGym climbingGym, Manager m
                 .followingCount(manager.getFollowingCount())
                 .averageRating(climbingGym.getAverageRating())
                 .reviewCount(climbingGym.getReviewCount())
+                .isFollower(isFollower)
                 .build();
         }
     }

src/main/java/com/climeet/climeet_backend/domain/climbingrecord/ClimbingRecordController.java

@@ -197,4 +197,13 @@ public ResponseEntity<List<VisitedClimbingGym>> getVisitedGymList(
             @RequestParam int month) {
         return ResponseEntity.ok(climbingRecordService.getVisitedGymList(userId, year, month));
     }
+
+    @Operation(summary = "나의 운동한 암장 리스트 조회")
+    @GetMapping("/users/months/list")
+    public ResponseEntity<List<VisitedClimbingGym>> getVisitedGymList(
+        @CurrentUser User user,
+        @RequestParam int year,
+        @RequestParam int month) {
+        return ResponseEntity.ok(climbingRecordService.getVisitedGymList(user.getId(), year, month));
+    }
 }