[Release] v2.1.3 login v2 적용 & Slack 채널명 변경

src/main/java/ssu/eatssu/domain/auth/dto/AppleLoginRequestV2.java

@@ -0,0 +1,15 @@
+package ssu.eatssu.domain.auth.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import ssu.eatssu.domain.user.entity.DeviceType;
+import ssu.eatssu.global.log.annotation.LogMask;
+
+// 애플 계정을 통해서 갤럭시 기기에도 접속을 할 수도 있다고 생각해서, DeviceType을 받도록 설계
+@Schema(title = "애플 로그인 및 회원가입 V2")
+public record AppleLoginRequestV2(
+        @LogMask
+        @Schema(description = "identityToken", example = "eyJraWQiOiJXNldjT0tCIiwiYWxnIjoi...")
+        String identityToken,
+        @Schema(description = "deviceType", example = "IOS")
+        DeviceType deviceType
+) {}

src/main/java/ssu/eatssu/domain/auth/dto/KakaoLoginRequestV2.java

@@ -0,0 +1,21 @@
+package ssu.eatssu.domain.auth.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.Email;
+import jakarta.validation.constraints.NotBlank;
+import ssu.eatssu.domain.user.entity.DeviceType;
+import ssu.eatssu.global.log.annotation.LogMask;
+
+@Schema(title = "카카오 로그인 및 회원가입 V2")
+public record KakaoLoginRequestV2(
+        @LogMask
+        @NotBlank(message = "이메일을 입력해주세요.")
+        @Email(message = "올바른 이메일 주소를 입력해주세요.")
+        @Schema(description = "이메일", example = "test@email.com")
+        String email,
+        @LogMask
+        @Schema(description = "providerId", example = "10378247832195")
+        String providerId,
+        @Schema(description = "deviceType", example = "IOS")
+        DeviceType deviceType
+) {}

src/main/java/ssu/eatssu/domain/auth/infrastructure/SecurityConfig.java

@@ -27,7 +27,7 @@ public class SecurityConfig {
     };
 
     private static final String[] AUTH_WHITELIST = {
-            "/", "/oauths/kakao", "/oauths/apple", "/menus/**", "/meals/**", "/admin/login",
+            "/", "/oauths/kakao", "/oauths/apple", "/menus/**", "/meals/**", "/admin/login", "/oauths/v2/kakao","/oauths/v2/apple",
             "/reviews", "/reviews/menus/**", "/reviews/meals/**", "/v2/reviews/statistics/**",
             "/v2/reviews/menus/**", "/v2/reviews/meals/**", "/actuator/**", "/error-test/**"
     };

src/main/java/ssu/eatssu/domain/auth/presentation/OAuthController.java

@@ -13,9 +13,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import ssu.eatssu.domain.auth.dto.AppleLoginRequest;
-import ssu.eatssu.domain.auth.dto.KakaoLoginRequest;
-import ssu.eatssu.domain.auth.dto.ValidRequest;
+import ssu.eatssu.domain.auth.dto.*;
 import ssu.eatssu.domain.auth.service.OAuthService;
 import ssu.eatssu.domain.user.dto.Tokens;
 import ssu.eatssu.global.handler.response.BaseResponse;
@@ -31,6 +29,7 @@ public class OAuthController {
 
     private final OAuthService oauthService;
 
+    // TODO : 로그인 & 회원 가입 마이그레이션 이후에 지울 것.
     @Operation(summary = "카카오 회원가입, 로그인 [인증 토큰 필요 X]", description = """
             카카오 회원가입, 로그인 API 입니다.<br><br>
             가입된 회원일 경우 카카오 로그인, 미가입 회원일 경우 회원가입 후 자동 로그인됩니다.
@@ -49,6 +48,25 @@ public BaseResponse<Tokens> kakaoLogin(@Valid @RequestBody KakaoLoginRequest req
         return BaseResponse.success(tokens);
     }
 
+    @Operation(summary = "카카오 회원가입, 로그인 V2 [인증 토큰 필요 X]", description = """
+            카카오 회원가입, 로그인 V2 API 입니다.<br><br>
+            가입된 회원일 경우 카카오 로그인, 미가입 회원일 경우 회원가입 후 자동 로그인됩니다.
+            """)
+    @ApiResponses(value = {
+            @ApiResponse(responseCode = "200", description = "카카오 회원가입/로그인 성공")
+    })
+    @PostMapping("/v2/kakao")
+    public BaseResponse<Tokens> kakaoLoginV2(@Valid @RequestBody KakaoLoginRequestV2 request) {
+        long startTime = System.currentTimeMillis();
+        Tokens tokens = oauthService.kakaoLoginV2(request);
+        long endTime = System.currentTimeMillis();
+        long duration = endTime - startTime;
+        log.info("OAuthWarmupRunner 완료 - 소요 시간: {} ms", duration);
+
+        return BaseResponse.success(tokens);
+    }
+
+    // TODO : 로그인 & 회원 가입 마이그레이션 이후에 지울 것.
     @Operation(summary = "애플 회원가입, 로그인 [인증 토큰 필요 X]", description = """
             애플 로그인, 회원가입 API 입니다.<br><br>
             가입된 회원일 경우 카카오 로그인, 미가입 회원일 경우 회원가입 후 자동 로그인됩니다.
@@ -62,6 +80,19 @@ public BaseResponse<Tokens> appleLogin(@Valid @RequestBody AppleLoginRequest req
         return BaseResponse.success(tokens);
     }
 
+    @Operation(summary = "애플 회원가입, 로그인 V2 [인증 토큰 필요 X]", description = """
+            애플 로그인, 회원가입 API V2 입니다.<br><br>
+            가입된 회원일 경우 카카오 로그인, 미가입 회원일 경우 회원가입 후 자동 로그인됩니다.
+            """)
+    @ApiResponses(value = {
+            @ApiResponse(responseCode = "200", description = "애플 회원가입/로그인 성공")
+    })
+    @PostMapping("/v2/apple")
+    public BaseResponse<Tokens> appleLoginV2(@Valid @RequestBody AppleLoginRequestV2 request) {
+        Tokens tokens = oauthService.appleLoginV2(request);
+        return BaseResponse.success(tokens);
+    }
+
     @Operation(summary = "토큰 재발급", description = "accessToken, refreshToken 재발급 API 입니다.")
     @ApiResponses(value = {
             @ApiResponse(responseCode = "200", description = "토큰 재발급 성공")

src/main/java/ssu/eatssu/domain/auth/security/CustomUserDetails.java

@@ -5,6 +5,7 @@
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
+import ssu.eatssu.domain.user.entity.DeviceType;
 import ssu.eatssu.domain.user.entity.User;
 
 import java.util.ArrayList;
@@ -17,12 +18,14 @@ public class CustomUserDetails implements UserDetails {
     private final String email;
     private final String credentials;
     private final GrantedAuthority role;
+    private final DeviceType deviceType;
 
     public CustomUserDetails(User user) {
         this.id = user.getId();
         this.email = user.getEmail();
         this.credentials = user.getCredentials();
         this.role = user.getRole();
+        this.deviceType = user.getDeviceType();
     }
 
     @Override

src/main/java/ssu/eatssu/domain/auth/security/JwtAuthenticationFilter.java

@@ -31,8 +31,8 @@ public class JwtAuthenticationFilter extends GenericFilterBean {
             "/v2/reviews/menus/**", "/v2/reviews/meals/**", "/actuator/**", "/error-test/**",
             "/swagger-ui.html", "/swagger-ui/**", "/v3/api-docs/**", "/swagger-resources/**",
             "/oauths/valid/token", "/admin/img/**", "/css/**", "/js/**",
-            "/favicon.ico", "/error/**", "/webjars/**", "/h2-console/**"
-                                                              );
+            "/favicon.ico", "/error/**", "/webjars/**", "/h2-console/**",
+            "/oauths/v2/kakao", "/oauths/v2/apple");
     private final JwtTokenProvider jwtTokenProvider;
 
     @Override

src/main/java/ssu/eatssu/domain/auth/security/JwtTokenProvider.java

@@ -146,7 +146,7 @@ public Authentication getAuthentication(String token) throws JsonProcessingExcep
         UserPrincipalDto userPrincipalDto = objectMapper.readValue(claims.getSubject(), UserPrincipalDto.class);
 
         CustomUserDetails principal = new CustomUserDetails(userPrincipalDto.getId(), userPrincipalDto.getEmail(), "",
-                                                            authorities.get(0));
+                                                            authorities.get(0),userPrincipalDto.getDeviceType());
 
         return new UsernamePasswordAuthenticationToken(principal, token, authorities);
     }

src/main/java/ssu/eatssu/domain/auth/security/UserPrincipalDto.java

@@ -4,6 +4,7 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import ssu.eatssu.domain.user.entity.DeviceType;
 
 @Getter
 @Builder
@@ -12,13 +13,15 @@
 public class UserPrincipalDto {
     private Long id;
     private String email;
+    private DeviceType deviceType;
     private String role;
 
     public static UserPrincipalDto from(CustomUserDetails userDetails) {
         return UserPrincipalDto.builder()
                                .id(userDetails.getId())
                                .email(userDetails.getEmail())
+                               .deviceType(userDetails.getDeviceType())
                                .role(userDetails.getRole().getAuthority())
                                .build();
     }
-}
+}

src/main/java/ssu/eatssu/domain/auth/service/OAuthService.java

@@ -6,15 +6,13 @@
 import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import ssu.eatssu.domain.auth.dto.AppleLoginRequest;
-import ssu.eatssu.domain.auth.dto.KakaoLoginRequest;
-import ssu.eatssu.domain.auth.dto.OAuthInfo;
-import ssu.eatssu.domain.auth.dto.ValidRequest;
+import ssu.eatssu.domain.auth.dto.*;
 import ssu.eatssu.domain.auth.entity.AppleAuthenticator;
 import ssu.eatssu.domain.auth.entity.OAuthProvider;
 import ssu.eatssu.domain.auth.security.JwtTokenProvider;
 import ssu.eatssu.domain.auth.util.RandomNicknameUtil;
 import ssu.eatssu.domain.user.dto.Tokens;
+import ssu.eatssu.domain.user.entity.DeviceType;
 import ssu.eatssu.domain.user.entity.User;
 import ssu.eatssu.domain.user.repository.UserRepository;
 import ssu.eatssu.domain.user.service.UserService;
@@ -41,6 +39,21 @@ public Tokens kakaoLogin(KakaoLoginRequest request) {
         return generateOauthJwtTokens(user.getEmail(), KAKAO, request.providerId());
     }
 
+    /**
+     * V1 -> V2로 넘어가면서 DeviceType(IOS,ANDROID) 정보를 추가로 받게 되었고, 기존에 가입한 유저들은 추가로 기입해 주게 됩니다.
+     */
+    public Tokens kakaoLoginV2(KakaoLoginRequestV2 request) {
+        User user = userRepository.findByProviderId(request.providerId())
+                .orElseGet(() -> userService.joinV2(request.email(), KAKAO, request.providerId(),request.deviceType()));
+
+        if (user.getDeviceType() == null) {
+           user.updateDeviceType(request.deviceType());
+        }
+
+        return generateOauthJwtTokens(user.getEmail(), KAKAO, request.providerId());
+    }
+
+
     public Tokens appleLogin(AppleLoginRequest request) {
         OAuthInfo oAuthInfo = appleAuthenticator.getOAuthInfoByIdentityToken(request.identityToken());
 
@@ -52,6 +65,24 @@ public Tokens appleLogin(AppleLoginRequest request) {
         return generateOauthJwtTokens(user.getEmail(), APPLE, oAuthInfo.providerId());
     }
 
+    /**
+     * V1 -> V2로 넘어가면서 DeviceType(IOS,ANDROID) 정보를 추가로 받게 되었고, 기존에 가입한 유저들은 추가로 기입해 주게 됩니다.
+     */
+    public Tokens appleLoginV2(AppleLoginRequestV2 request) {
+        OAuthInfo oAuthInfo = appleAuthenticator.getOAuthInfoByIdentityToken(request.identityToken());
+
+        User user = userRepository.findByProviderId(oAuthInfo.providerId())
+                .orElseGet(() -> userService.joinV2(oAuthInfo.email(), APPLE, oAuthInfo.providerId(),request.deviceType()));
+
+        updateAppleUserEmail(user, oAuthInfo.email());
+
+        if (user.getDeviceType() == null) {
+            user.updateDeviceType(request.deviceType());
+        }
+
+        return generateOauthJwtTokens(user.getEmail(), APPLE, oAuthInfo.providerId());
+    }
+
     public Tokens refreshTokens(Authentication authentication) {
         return jwtTokenProvider.generateTokens(authentication);
     }
@@ -97,5 +128,4 @@ private Tokens generateOauthJwtTokens(String email, OAuthProvider provider, Stri
     private String makeOauthCredentials(OAuthProvider provider, String providerId) {
         return provider + providerId;
     }
-
 }

src/main/java/ssu/eatssu/domain/inquiry/presentation/InquiryController.java

@@ -21,6 +21,10 @@
 import ssu.eatssu.domain.slack.service.SlackService;
 import ssu.eatssu.global.handler.response.BaseResponse;
 
+/**
+ * 문의하기는 카카오톡으로 이동되어 사용되지 않고 있습니다.
+ */
+@Deprecated
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/inquiries")

src/main/java/ssu/eatssu/domain/review/dto/MealReviewResponse.java

@@ -1,17 +1,17 @@
 package ssu.eatssu.domain.review.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Getter;
-import ssu.eatssu.domain.review.entity.Review;
-import ssu.eatssu.domain.review.entity.ReviewMenuLike;
-
 import java.time.LocalDate;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import ssu.eatssu.domain.review.entity.Review;
+import ssu.eatssu.domain.review.entity.ReviewMenuLike;
 
 @AllArgsConstructor
 @Builder
@@ -31,7 +31,7 @@ public class MealReviewResponse {
     private String writerNickname;
 
     @Schema(description = "평점", example = "4")
-    private Double rating;
+    private Integer rating;
 
     @Schema(description = "리뷰 작성 날짜(format = yyyy-MM-dd)", example = "2023-04-07")
     private LocalDate writtenAt;
@@ -60,26 +60,40 @@ public class MealReviewResponse {
 
     public static MealReviewResponse from(Review review,
                                           Long userId,
-                                          List<ValidMenuForViewResponse.MenuDto> validMenus,Double rating) {
+        List<ValidMenuForViewResponse.MenuDto> validMenus, Integer rating) {
         List<String> imageUrls = new ArrayList<>();
         review.getReviewImages().forEach(i -> imageUrls.add(i.getImageUrl()));
 
-        // 좋아요한 메뉴 ID 모음
-        Set<Long> likedMenuIds = review.getMenuLikes().stream()
-                                       .filter(ReviewMenuLike::getIsLike)
-                                       .map(like -> like.getMenu().getId())
-                                       .collect(Collectors.toSet());
-
-        List<MenuIdNameLikeDto> menuNames = validMenus.stream()
-                                                      .map(valid -> new MenuIdNameLikeDto(
-                                                              valid.getMenuId(),
-                                                              valid.getName(),
-                                                              likedMenuIds.contains(valid.getMenuId())
-                                                      ))
-                                                      .toList();
+        List<MenuIdNameLikeDto> menuNames;
+        if (review.getMeal() != null) {
+            Set<Long> likedMenuIds = review.getMenuLikes().stream()
+                .filter(ReviewMenuLike::getIsLike)
+                .map(like -> like.getMenu().getId())
+                .collect(Collectors.toSet());
+
+            menuNames = validMenus.stream()
+                .map(valid -> new MenuIdNameLikeDto(
+                    valid.getMenuId(),
+                    valid.getName(),
+                    likedMenuIds.contains(valid.getMenuId())
+                ))
+                .toList();
+        } else if (review.getMenu() != null) {
+            menuNames = Collections.singletonList(
+                new MenuIdNameLikeDto(review.getMenu().getId(),
+                    review.getMenu().getName(),
+                    false)
+            );
+        } else {
+            menuNames = Collections.emptyList();
+        }
+        Integer resolvedRating = (review.getRating() != null)
+            ? review.getRating()
+            : (review.getRatings() != null ? review.getRatings().getMainRating() : null);
+
         MealReviewResponseBuilder builder = MealReviewResponse.builder()
                                                               .reviewId(review.getId())
-                                                              .rating(rating)
+            .rating(resolvedRating)
                                                               .writtenAt(review.getCreatedDate().toLocalDate())
                                                               .content(review.getContent())
                                                               .imageUrls(imageUrls)

src/main/java/ssu/eatssu/domain/review/dto/ReviewDetail.java

@@ -1,19 +1,18 @@
 package ssu.eatssu.domain.review.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
 import ssu.eatssu.domain.menu.entity.Menu;
 import ssu.eatssu.domain.review.entity.Review;
 import ssu.eatssu.domain.review.entity.ReviewMenuLike;
 
-import java.time.LocalDate;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-
 @AllArgsConstructor
 @Builder
 @Schema(title = "리뷰 상세")
@@ -58,9 +57,13 @@ public static ReviewDetail from(Review review, Long userId) {
                                        .map(like -> like.getMenu().getId())
                                        .collect(Collectors.toSet());
 
+        Integer rating = (review.getRating() != null)
+            ? review.getRating()
+            : review.getRatings().getMainRating();
+
         ReviewDetailBuilder builder = ReviewDetail.builder()
                                                   .reviewId(review.getId())
-                                                  .rating(review.getRatings().getMainRating())
+            .rating(rating)
                                                   .writtenAt(review.getCreatedDate().toLocalDate())
                                                   .content(review.getContent())
                                                   .imageUrls(imageUrls)