[Fix] dev merge

Author: chltmdgh522

.gitignore

@@ -40,4 +40,7 @@ out/
 src/main/resources/*.sql
 
 ### application-dev ###
-src/main/resources/application-dev.yml
+src/main/resources/application-dev.yml
+
+### env ###
+/env

src/main/java/boombimapi/domain/congestion/api/MemberCongestionController.java

@@ -6,6 +6,10 @@
 import boombimapi.domain.congestion.dto.request.CreateMemberCongestionRequest;
 import boombimapi.domain.congestion.dto.response.CreateMemberCongestionResponse;
 import boombimapi.global.response.BaseResponse;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -18,10 +22,15 @@
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/member-congestion")
+@Tag(name = "Member Congestion", description = "사용자 혼잡도 관련 API")
 public class MemberCongestionController {
 
     private final MemberCongestionService memberCongestionService;
 
+    @Operation(summary = "사용자 혼잡도 생성", description = "사용자 장소에 새로운 사용자 혼잡도를 추가합니다.")
+    @ApiResponses(value = {
+        @ApiResponse(responseCode = "200", description = "사용자 혼잡도 생성 성공")
+    })
     @PostMapping("/create")
     public ResponseEntity<BaseResponse<CreateMemberCongestionResponse>> createMemberCongestion(
         @AuthenticationPrincipal String memberId,
@@ -37,5 +46,4 @@ public ResponseEntity<BaseResponse<CreateMemberCongestionResponse>> createMember
     }
 
 
-
 }

src/main/java/boombimapi/domain/congestion/dto/response/MemberCongestionItemResponse.java

@@ -0,0 +1,24 @@
+package boombimapi.domain.congestion.dto.response;
+
+import boombimapi.domain.congestion.entity.MemberCongestion;
+import java.time.LocalDateTime;
+
+public record MemberCongestionItemResponse(
+    Long memberCongestionId,
+    String congestionLevelName,
+    String congestionLevelMessage,
+    LocalDateTime createdAt
+) {
+
+    public static MemberCongestionItemResponse of(
+        MemberCongestion memberCongestion
+    ) {
+        return new MemberCongestionItemResponse(
+            memberCongestion.getId(),
+            memberCongestion.getCongestionLevel().getName(),
+            memberCongestion.getCongestionMessage(),
+            memberCongestion.getCreatedAt()
+        );
+    }
+
+}

src/main/java/boombimapi/domain/congestion/repository/MemberCongestionRepository.java

@@ -8,6 +8,9 @@
 import boombimapi.domain.place.entity.MemberPlace;
 import org.springframework.data.repository.query.Param;
 import org.springframework.data.domain.Pageable;
+
+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;
 
@@ -24,7 +27,7 @@ Optional<MemberCongestion> findFirstByMemberPlaceIdAndExpiresAtAfterOrderByCreat
     );
 
     @Query("""
-           SELECT COUNT(mc)\s
+           SELECT COUNT(mc)
            FROM MemberCongestion mc
            WHERE mc.memberPlace.id = :placeId
              AND CAST(mc.createdAt AS DATE) = CURRENT_DATE
@@ -35,4 +38,15 @@ AND CAST(mc.createdAt AS DATE) = CURRENT_DATE
     Optional<MemberCongestion> findTop1ByMemberPlaceIdOrderByCreatedAtDesc(Long placeId);
 
 
+    Slice<MemberCongestion> findByMemberPlaceIdOrderByIdDesc(
+        Long memberPlaceId,
+        Pageable pageable
+    );
+
+    Slice<MemberCongestion> findByMemberPlaceIdAndIdLessThanOrderByIdDesc(
+        Long memberPlaceId,
+        Long cursor,
+        Pageable pageable
+    );
+
 }

src/main/java/boombimapi/domain/favorite/api/FavoriteController.java

@@ -7,6 +7,10 @@
 import boombimapi.domain.favorite.dto.response.AddFavoriteResponse;
 import boombimapi.domain.favorite.dto.response.GetFavoriteResponse;
 import boombimapi.global.response.BaseResponse;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
@@ -23,10 +27,15 @@
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/favorite")
+@Tag(name = "Favorite", description = "사용자 즐겨찾기 관련 API")
 public class FavoriteController {
 
     private final FavoriteService favoriteService;
 
+    @Operation(summary = "즐겨찾기 추가", description = "해당 장소를 즐겨찾기에 추가합니다.")
+    @ApiResponses(value = {
+        @ApiResponse(responseCode = "200", description = "즐겨찾기 추가 성공")
+    })
     @PostMapping
     public ResponseEntity<BaseResponse<AddFavoriteResponse>> addFavorite(
         @AuthenticationPrincipal String memberId,
@@ -41,6 +50,10 @@ public ResponseEntity<BaseResponse<AddFavoriteResponse>> addFavorite(
         );
     }
 
+    @Operation(summary = "즐겨찾기 삭제", description = "해당 장소를 즐겨찾기에서 삭제합니다.")
+    @ApiResponses(value = {
+        @ApiResponse(responseCode = "200", description = "즐겨찾기 삭제 성공")
+    })
     @DeleteMapping
     public ResponseEntity<BaseResponse<Void>> deleteFavorite(
         @AuthenticationPrincipal String memberId,
@@ -57,6 +70,10 @@ public ResponseEntity<BaseResponse<Void>> deleteFavorite(
         );
     }
 
+    @Operation(summary = "즐겨찾기 조회", description = "사용자가 즐겨찾기한 장소들의 최신 혼잡도를 조회합니다.")
+    @ApiResponses(value = {
+        @ApiResponse(responseCode = "200", description = "사용자 즐겨찾기 최신 혼잡도 조회 성공")
+    })
     @GetMapping
     public ResponseEntity<BaseResponse<List<GetFavoriteResponse>>> getFavorites(
         @AuthenticationPrincipal String memberId

src/main/java/boombimapi/domain/place/api/MemberPlaceController.java

@@ -5,20 +5,27 @@
 import boombimapi.domain.place.application.MemberPlaceService;
 import boombimapi.domain.place.dto.request.ResolveMemberPlaceRequest;
 import boombimapi.domain.place.dto.request.ViewportRequest;
-import boombimapi.domain.place.dto.response.ResolveMemberPlaceResponse;
+import boombimapi.domain.place.dto.response.member.GetMemberPlaceDetailResponse;
+import boombimapi.domain.place.dto.response.member.ResolveMemberPlaceResponse;
 import boombimapi.domain.place.dto.response.node.ViewportNodeResponse;
 import boombimapi.global.response.BaseResponse;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
@@ -52,15 +59,45 @@ public ResponseEntity<BaseResponse<ResolveMemberPlaceResponse>> resolveMemberPla
     })
     @PostMapping
     public ResponseEntity<BaseResponse<List<ViewportNodeResponse>>> getMemberPlacesInViewport(
+        @AuthenticationPrincipal String memberId,
         @RequestBody ViewportRequest request
     ) {
         return ResponseEntity.ok(
             BaseResponse.of(
                 HttpStatus.OK,
                 GET_MEMBER_PLACES_IN_VIEWPORT_SUCCESS,
-                memberPlaceService.getViewportNodes(request)
+                memberPlaceService.getViewportNodes(memberId, request)
             )
         );
     }
 
+    @Operation(summary = "특정 사용자 장소 상세 조회", description = "특정 사용자 장소를 상세 조회하여 해당 장소에 작성된 혼잡도들을 확인합니다.")
+    @ApiResponses(value = {
+        @ApiResponse(responseCode = "200", description = "특정 사용자 장소 상세 조회 성공")
+    })
+    @GetMapping("/{memberPlaceId}")
+    public ResponseEntity<BaseResponse<GetMemberPlaceDetailResponse>> getMemberPlaceDetail(
+        @PathVariable Long memberPlaceId,
+        @RequestParam(required = false) @Min(1) @Max(100) Integer size,
+        @RequestParam(required = false) Long cursor,
+        @AuthenticationPrincipal String memberId
+    ) {
+
+        GetMemberPlaceDetailResponse memberPlaceDetailResponse = memberPlaceService.getMemberPlaceDetail(
+            memberId,
+            memberPlaceId,
+            size,
+            cursor
+        );
+
+        return ResponseEntity.ok(
+            BaseResponse.of(
+                HttpStatus.OK,
+                GET_MEMBER_PLACE_DETAIL_SUCCESS,
+                memberPlaceDetailResponse
+            )
+        );
+
+    }
+
 }