Merge pull request #114 from SWEET-DEVELOPERS/feature/#113-gift

[refactor] 토너먼트 중복 참여 예외처리 & 로그인 로컬 환경 분리

src/main/java/org/sopt/sweet/domain/gift/controller/GiftController.java

@@ -43,7 +43,7 @@ public ResponseEntity<SuccessResponse<?>> deleteMyGift(@UserId Long userId, @Pat
 
     @GetMapping("/tournament/{roomId}")
     public ResponseEntity<SuccessResponse<?>> getTournamentGiftList(@UserId Long userId, @PathVariable Long roomId) {
-        List<TournamentListsResponseDto> tournamentGiftList = giftService.getTournamentGiftList(roomId);
+        List<TournamentListsResponseDto> tournamentGiftList = giftService.getTournamentGiftList(userId, roomId);
         return SuccessResponse.ok(tournamentGiftList);
     }
 

src/main/java/org/sopt/sweet/domain/gift/service/GiftService.java

@@ -136,8 +136,14 @@ private Gift findByIdOrThrow(Long giftId) {
     }
 
     @Transactional(readOnly = true)
-    public List<TournamentListsResponseDto> getTournamentGiftList(Long roomId) {
+    public List<TournamentListsResponseDto> getTournamentGiftList(Long memberId, Long roomId) {
         Room room = findRoomByIdOrThrow(roomId);
+        RoomMember roomMember = roomMemberRepository.findByRoomIdAndMemberId(roomId, memberId);
+
+        if(roomMember.isTournamentParticipation()){
+            throw new BusinessException(ALREADY_PARTICIPATED_TOURNAMENT);
+        }
+
         List<Gift> gifts = giftRepository.findByRoom(room);
         return mapGiftsToTournamentLists(gifts);
     }

src/main/java/org/sopt/sweet/domain/member/controller/OAuthApi.java

@@ -14,6 +14,7 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestParam;
 
 @Tag(name = "소셜로그인", description = "소셜로그인 관련 API")
@@ -38,7 +39,13 @@ ResponseEntity<SuccessResponse<?>> kakaoLogin(
                     required = true,
                     example = "gGMvN1u_dgHdTizP8uUf7HZHNls_3G4X8qbKTwihE0x5W6f3E6acGDDsc80KPXLrAAABjO-2eHHUNEQ5evY1pg"
             )
-            @RequestParam("code") String code
+            @RequestParam("code") String code,
+            @Parameter(
+                    description = "환경변수",
+                    required = true,
+                    example = "development"
+            )
+            @RequestHeader("X-Environment") String environment
     );
 
     @ApiResponses(

src/main/java/org/sopt/sweet/domain/member/controller/OAuthController.java

@@ -22,8 +22,8 @@ public class OAuthController implements OAuthApi {
     private final OAuthService oAuthService;
 
     @GetMapping("/kakao/login")
-    public ResponseEntity<SuccessResponse<?>> kakaoLogin(@RequestParam("code") String code) {
-        KakaoUserInfoResponseDto userInfo = oAuthService.kakaoCallback(code);
+    public ResponseEntity<SuccessResponse<?>> kakaoLogin(@RequestParam("code") String code, @RequestHeader("X-Environment") String environment) {
+        KakaoUserInfoResponseDto userInfo = oAuthService.kakaoCallback(code, environment);
         MemberTokenResponseDto memberToken = oAuthService.saveToken(userInfo.memberId());
 
         Map<String, Object> loginResponse = new HashMap<>();

src/main/java/org/sopt/sweet/domain/member/service/OAuthService.java

@@ -59,7 +59,7 @@ private String issueNewRefreshToken(Long memberId) {
     private final RedisTemplate<String, String> redisTemplate;
 
     // 카카오 로그인 시 회원 정보 조회
-    public KakaoUserInfoResponseDto kakaoCallback(String code) {
+    public KakaoUserInfoResponseDto kakaoCallback(String code, String environment) {
         RestTemplate restTemplate = new RestTemplate();
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-type", "application/x-www-form-urlencoded;charset=utf-8");
@@ -68,6 +68,11 @@ public KakaoUserInfoResponseDto kakaoCallback(String code) {
         params.add("grant_type", "authorization_code");
         params.add("client_id", clientId);
         params.add("redirect_uri", redirectUri);
+        if ("development".equals(environment)) {
+            params.add("redirect_uri", redirectUri);
+        } else {
+            params.add("redirect_uri", "http://localhost:5137/api/oauth/kakao/login");
+        }
         params.add("code", code);
 
         HttpEntity<MultiValueMap<String, String>> kakaoTokenRequest =

src/main/java/org/sopt/sweet/global/error/ErrorCode.java

@@ -18,7 +18,7 @@ public enum ErrorCode {
     MEMBER_GIFT_COUNT_EXCEEDED(HttpStatus.BAD_REQUEST, "최대 선물 등록 개수를 초과하였습니다."),
     TOURNAMENT_START_DATE_PASSED(HttpStatus.BAD_REQUEST, "토너먼트 시작 날짜가 지났습니다"),
     ROOM_OWNER_CANNOT_DELETE_SELF(HttpStatus.BAD_REQUEST, "방 개설자는 스스로를 삭제할 수 없습니다."),
-
+    ALREADY_PARTICIPATED_TOURNAMENT(HttpStatus.BAD_REQUEST, "이미 참가한 토너먼트입니다."),
     /**
      * 401 Unauthorized
      */
@@ -30,7 +30,6 @@ public enum ErrorCode {
     INVALID_REFRESH_TOKEN_VALUE(HttpStatus.UNAUTHORIZED, "리프레시 토큰의 값이 올바르지 않습니다."),
     EXPIRED_REFRESH_TOKEN(HttpStatus.UNAUTHORIZED, "리프레시 토큰이 만료되었습니다. 다시 로그인해 주세요."),
     NOT_MATCH_REFRESH_TOKEN(HttpStatus.UNAUTHORIZED, "일치하지 않는 리프레시 토큰입니다."),
-
     /**
      * 403 Forbidden
      */