Merge pull request #60 from swyp-app-team-4/feat#12-region-api

Feat#12 region api

Author: chltmdgh522

build.gradle

@@ -76,6 +76,7 @@ dependencies {
 	implementation 'com.google.firebase:firebase-admin:9.5.0'
 	implementation 'org.springframework.boot:spring-boot-starter-batch'
 
+
 	//s3
 	implementation 'software.amazon.awssdk:s3:2.20.56'
 

src/main/java/boombimapi/domain/alarm/presentation/controller/AlarmController.java

@@ -9,20 +9,25 @@
 import boombimapi.domain.alarm.presentation.dto.res.HistoryResponse;
 import boombimapi.domain.alarm.presentation.dto.res.RegisterFcmTokenResponse;
 import boombimapi.domain.alarm.presentation.dto.res.SendAlarmResponse;
+import boombimapi.global.response.BaseOKResponse;
 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.Valid;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 
+import static boombimapi.global.response.ResponseMessage.GET_ALARM_SUCCESS;
+import static boombimapi.global.response.ResponseMessage.VOTE_SUCCESS;
+
 @RestController
 @RequestMapping("/api/alarm")
 @RequiredArgsConstructor
@@ -85,24 +90,33 @@ public ResponseEntity<List<HistoryResponse>> getAlarmHistory(
             @ApiResponse(responseCode = "404", description = "알림 및 유저 존재하지 않음"),
     })
     @PatchMapping
-    public void updateAlarmRead(
+    public ResponseEntity<BaseOKResponse<Void>> updateAlarmRead(
             @AuthenticationPrincipal String userId,
             @RequestBody UpdateAlarmStatusReq req
     ) {
         alarmService.updateAlarmRead(userId, req);
+
+        return ResponseEntity.ok(
+                BaseOKResponse.of(
+                        HttpStatus.OK,
+                        GET_ALARM_SUCCESS));
     }
 
+
     @Operation(summary = "알림 설정 활성화", description = "알림을 활성화 및 비활성화를 합니다.")
     @ApiResponses(value = {
             @ApiResponse(responseCode = "200", description = "조회 성공"),
             @ApiResponse(responseCode = "404", description = "유저 존재하지 않음"),
     })
     @PatchMapping("/status")
-    public void updateAlarmStatus(
+    public ResponseEntity<BaseOKResponse<Void>> updateAlarmStatus(
             @AuthenticationPrincipal String userId
     ) {
         alarmService.updateAlarmStatus(userId);
+        return ResponseEntity.ok(
+                BaseOKResponse.of(
+                        HttpStatus.OK,
+                        GET_ALARM_SUCCESS));
     }
 
-
 }

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

@@ -3,7 +3,10 @@
 import boombimapi.domain.congestion.entity.MemberCongestion;
 import java.time.LocalDateTime;
 import java.util.Optional;
+
+import feign.Param;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 
 public interface MemberCongestionRepository extends JpaRepository<MemberCongestion, Long> {
 
@@ -17,4 +20,12 @@ Optional<MemberCongestion> findFirstByMemberPlaceIdAndExpiresAtAfterOrderByCreat
         LocalDateTime now
     );
 
+    @Query("""
+           SELECT COUNT(mc) 
+           FROM MemberCongestion mc
+           WHERE mc.memberPlace.id = :placeId
+             AND CAST(mc.createdAt AS DATE) = CURRENT_DATE
+           """)
+    long countTodayByPlace(@Param("placeId") Long placeId);
+
 }

src/main/java/boombimapi/domain/favorite/repository/FavoriteRepository.java

@@ -2,7 +2,11 @@
 
 import boombimapi.domain.favorite.entity.Favorite;
 import java.util.List;
+
+import boombimapi.domain.member.domain.entity.Member;
+import feign.Param;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 
 public interface FavoriteRepository extends JpaRepository<Favorite, Long> {
 
@@ -20,4 +24,13 @@ List<Favorite> findAllByMemberId(
         String memberId
     );
 
+
+    @Query("SELECT f FROM Favorite f " +
+            "JOIN FETCH f.memberPlace mp " +
+            "JOIN FETCH mp.memberCongestions mc " +
+            "JOIN FETCH mc.congestionLevel cl " +
+            "WHERE f.member = :member")
+    List<Favorite> findByMemberWithJoin(@Param("member") Member member);
+
+
 }

src/main/java/boombimapi/domain/member/application/service/MemberService.java

@@ -2,11 +2,8 @@
 
 
 import boombimapi.domain.member.presentation.dto.member.req.MemberLeaveReq;
-import boombimapi.domain.member.presentation.dto.member.res.GetMemberRes;
-import boombimapi.domain.member.presentation.dto.member.res.GetNicknameRes;
+import boombimapi.domain.member.presentation.dto.member.res.*;
 
-import boombimapi.domain.member.presentation.dto.member.res.MyPageVoteRes;
-import boombimapi.domain.member.presentation.dto.member.res.ProfileRes;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
@@ -17,6 +14,9 @@ public interface MemberService {
     // 1번 구간
     GetMemberRes getMember(String userId);
 
+    // 2번 구간
+    List<GetFavoriteRes>  getFavorites(String userId);
+
     // 3번 구간
     List<MyPageVoteRes> getMyVoteAnswer(String userId);
 

src/main/java/boombimapi/domain/member/application/service/impl/MemberServiceImpl.java

@@ -1,17 +1,17 @@
 package boombimapi.domain.member.application.service.impl;
 
 
+import boombimapi.domain.congestion.repository.MemberCongestionRepository;
+import boombimapi.domain.favorite.entity.Favorite;
+import boombimapi.domain.favorite.repository.FavoriteRepository;
 import boombimapi.domain.member.application.service.MemberService;
 
 import boombimapi.domain.member.domain.entity.Member;
 import boombimapi.domain.member.domain.entity.MemberLeave;
 import boombimapi.domain.member.domain.repository.MemberLeaveRepository;
 import boombimapi.domain.member.domain.repository.MemberRepository;
 import boombimapi.domain.member.presentation.dto.member.req.MemberLeaveReq;
-import boombimapi.domain.member.presentation.dto.member.res.GetMemberRes;
-import boombimapi.domain.member.presentation.dto.member.res.GetNicknameRes;
-import boombimapi.domain.member.presentation.dto.member.res.MyPageVoteRes;
-import boombimapi.domain.member.presentation.dto.member.res.ProfileRes;
+import boombimapi.domain.member.presentation.dto.member.res.*;
 import boombimapi.domain.member.presentation.dto.member.res.mypage.MPVoteRes;
 import boombimapi.domain.vote.domain.entity.Vote;
 import boombimapi.domain.vote.domain.entity.VoteAnswer;
@@ -47,6 +47,8 @@ public class MemberServiceImpl implements MemberService {
     private final VoteRepository voteRepository;
     private final S3Service s3Service;
     private final MemberLeaveRepository memberLeaveRepository;
+    private final FavoriteRepository favoriteRepository;
+    private final MemberCongestionRepository memberCongestionRepository;
 
     @Override
     public GetMemberRes getMember(String userId) {
@@ -63,6 +65,31 @@ public GetMemberRes getMember(String userId) {
         return GetMemberRes.of(user, (long) voteAnswers.size(), (long) (voteDus.size() + votes.size()));
     }
 
+    @Override
+    public List<GetFavoriteRes> getFavorites(String userId) {
+        Member user = userRepository.findById(userId).orElse(null);
+        if (user == null) throw new BoombimException(ErrorCode.USER_NOT_EXIST);
+
+        List<GetFavoriteRes> result = new ArrayList<>();
+
+
+        List<Favorite> byFavorites = favoriteRepository.findByMemberWithJoin(user);
+
+
+        for (Favorite byFavorite : byFavorites) {
+
+            long todyPeopleCnt = memberCongestionRepository.countTodayByPlace(byFavorite.getMemberPlace().getId());
+            GetFavoriteRes getFavoriteRes = GetFavoriteRes.of("",
+                    byFavorite.getMemberPlace().getName(),
+                    byFavorite.getMemberPlace().getId(),
+                    byFavorite.getMemberPlace().getMemberCongestions().get(0).getCongestionLevel().getName(),
+                    String.valueOf(todyPeopleCnt));
+            result.add(getFavoriteRes);
+        }
+
+        return result;
+    }
+
     // 3번 api 투표
     @Override
     public List<MyPageVoteRes> getMyVoteAnswer(String userId) {

src/main/java/boombimapi/domain/member/presentation/controller/MemberController.java

@@ -3,16 +3,16 @@
 import boombimapi.domain.member.application.service.MemberService;
 import boombimapi.domain.member.presentation.dto.member.req.MemberLeaveReq;
 import boombimapi.domain.member.presentation.dto.member.req.NicknameReq;
-import boombimapi.domain.member.presentation.dto.member.res.GetMemberRes;
-import boombimapi.domain.member.presentation.dto.member.res.GetNicknameRes;
-import boombimapi.domain.member.presentation.dto.member.res.MyPageVoteRes;
-import boombimapi.domain.member.presentation.dto.member.res.ProfileRes;
+import boombimapi.domain.member.presentation.dto.member.res.*;
+import boombimapi.global.response.BaseOKResponse;
+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 lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
@@ -21,6 +21,8 @@
 import java.io.IOException;
 import java.util.List;
 
+import static boombimapi.global.response.ResponseMessage.*;
+
 @RestController
 @RequestMapping("/api/member")
 @RequiredArgsConstructor
@@ -36,8 +38,12 @@ public class MemberController {
             @ApiResponse(responseCode = "404", description = "유저 존재하지 않음")
     })
     @PatchMapping("/name")
-    public void updateNickname(@AuthenticationPrincipal String userId, @RequestBody NicknameReq req) {
+    public ResponseEntity<BaseOKResponse<Void>> updateNickname(@AuthenticationPrincipal String userId, @RequestBody NicknameReq req) {
         memberService.updateNickname(userId, req.name());
+        return ResponseEntity.ok(
+                BaseOKResponse.of(
+                        HttpStatus.OK,
+                        POST_NICKNAME_SUCCESS));
     }
 
     @Operation(summary = "마이페이지(1번 구간) 사용자 정보 조회 API", description = "사용자 정보를 조회합니다.")
@@ -50,6 +56,16 @@ public ResponseEntity<GetMemberRes> getMember(@AuthenticationPrincipal String us
         return ResponseEntity.ok(memberService.getMember(userId));
     }
 
+    @Operation(summary = "마이페이지(2번 구간) 즐겨찾기 조회 API", description = "사용자가 즐겨찾기한 장소를 조회합니다.")
+    @ApiResponses(value = {
+            @ApiResponse(responseCode = "200", description = "사용자 조회 성공"),
+            @ApiResponse(responseCode = "404", description = "유저 존재하지 않음")
+    })
+    @GetMapping("/favorite")
+    public ResponseEntity<List<GetFavoriteRes>>  getFavorite(@AuthenticationPrincipal String userId) {
+        return ResponseEntity.ok(memberService.getFavorites(userId));
+    }
+
     @Operation(summary = "마이페이지(3번 구간) 나의 투표 조회 API", description = "나의 투표를 조회합니다.")
     @ApiResponses(value = {
             @ApiResponse(responseCode = "200", description = "사용자 조회 성공"),
@@ -76,8 +92,12 @@ public ResponseEntity<List<MyPageVoteRes>> getMpVote(@AuthenticationPrincipal St
             @ApiResponse(responseCode = "404", description = "유저 존재하지 않음")
     })
     @DeleteMapping
-    public void memberDelete(@AuthenticationPrincipal String userId, @RequestBody MemberLeaveReq req) {
+    public ResponseEntity<BaseOKResponse<Void>> memberDelete(@AuthenticationPrincipal String userId, @RequestBody MemberLeaveReq req) {
         memberService.memberDelete(userId, req);
+        return ResponseEntity.ok(
+                BaseOKResponse.of(
+                        HttpStatus.OK,
+                        MEMBER_DELETE));
     }
 
     @Operation(summary = "프로필 사진 바꾸기 API", description = "회원의 프로필 사진을 바꿉니다.")

src/main/java/boombimapi/domain/member/presentation/dto/member/res/GetFavoriteRes.java

@@ -0,0 +1,34 @@
+package boombimapi.domain.member.presentation.dto.member.res;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+@Schema(description = "즐겨찾기 응답 DTO")
+public record GetFavoriteRes(
+
+        @Schema(description = "장소 프로필 이미지 URL", example = "https://cdn.boombim.com/profile/user123.png")
+        String profile,
+
+        @Schema(description = "장소 이름", example = "강남역 스타벅스")
+        String posName,
+
+        @Schema(description = "장소 고유 ID", example = "1")
+        Long placeId,
+
+        @Schema(description = "혼잡도 응답 타입", example = "CROWDED")
+        String answerType,
+
+        @Schema(description = "오늘 올린 인원 수", example = "120")
+        String peopleCnt
+) {
+
+
+    public static GetFavoriteRes of(
+            String profile,
+            String posName,
+            Long placeId,
+            String answerType,
+            String peopleCnt
+    ) {
+        return new GetFavoriteRes(profile, posName, placeId, answerType, peopleCnt);
+    }
+}

src/main/java/boombimapi/domain/oauth2/presentation/controller/LogoutController.java

@@ -1,12 +1,17 @@
 package boombimapi.domain.oauth2.presentation.controller;
 
 import boombimapi.domain.oauth2.application.service.LogoutService;
+import boombimapi.global.response.BaseOKResponse;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
+import static boombimapi.global.response.ResponseMessage.LOGOUT_SUCCESS;
+import static boombimapi.global.response.ResponseMessage.VOTE_SUCCESS;
+
 
 @RestController
 @RequiredArgsConstructor
@@ -17,10 +22,15 @@ public class LogoutController {
 
     @Operation(summary = "로그아웃", description = "사용자를 로그아웃하고 토큰을 무효화합니다.")
     @PostMapping("/api/oauth2/logout")
-    public ResponseEntity<Void> logout(@RequestBody LogoutRequest request) {
+    public ResponseEntity<BaseOKResponse<Void>> logout(@RequestBody LogoutRequest request) {
         logoutService.logout(request.refreshToken());
-        return ResponseEntity.ok().build();
+
+        return ResponseEntity.ok(
+                BaseOKResponse.of(
+                        HttpStatus.OK,
+                        LOGOUT_SUCCESS));
     }
 
-    public record LogoutRequest(String refreshToken) {}
+    public record LogoutRequest(String refreshToken) {
+    }
 }