Merge pull request #49 from YAPP-Github/refactor/T3-147

[T3-147] EmotionMarble PK 타입 LONG으로 변경

Author: yuseok0215

src/main/java/bitnagil/bitnagil_backend/emotionMarble/domain/EmotionMarble.java

@@ -23,12 +23,9 @@
 @Where(clause = "deleted_at IS NULL")
 public class EmotionMarble extends BaseTimeEntity {
 
-    @EmbeddedId
-    @AttributeOverrides({
-            @AttributeOverride(name = "id", column = @Column(name = "emotion_marble_id")),
-            @AttributeOverride(name = "historySeq", column = @Column(name = "history_seq"))
-    })
-    private HistoryPk emotionMarblePk;
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long emotionMarbleId;
 
     @NotNull
     @Enumerated(EnumType.STRING)
@@ -52,9 +49,8 @@ public class EmotionMarble extends BaseTimeEntity {
     private Case resultCase;
 
     @Builder
-    public EmotionMarble(HistoryPk emotionMarblePk, EmotionMarbleType emotionMarbleType, LocalDate date, Long userId,
+    public EmotionMarble(EmotionMarbleType emotionMarbleType, LocalDate date, Long userId,
                          LocalDateTime historyStartDateTime, LocalDateTime historyEndDateTime, Case resultCase) {
-        this.emotionMarblePk = emotionMarblePk;
         this.emotionMarbleType = emotionMarbleType;
         this.date = date;
         this.userId = userId;

src/main/java/bitnagil/bitnagil_backend/emotionMarble/service/EmotionMarbleFactory.java

@@ -24,7 +24,6 @@ public EmotionMarble createTodayEmotionMarble(User user, RegisterEmotionMarbleRe
         LocalDateTime nowDateTime, LocalDateTime endDateTime) {
 
         return EmotionMarble.builder()
-            .emotionMarblePk(new HistoryPk(UUID.randomUUID(), 1L))
             .emotionMarbleType(request.getEmotionMarbleType())
             .date(nowDate)
             .userId(user.getUserId())

src/main/java/bitnagil/bitnagil_backend/user/controller/UserAuthController.java

@@ -4,11 +4,10 @@
 import bitnagil.bitnagil_backend.user.request.UserLoginRequest;
 import org.springframework.web.bind.annotation.*;
 
-import bitnagil.bitnagil_backend.user.response.UserLoginResponse;
+import bitnagil.bitnagil_backend.user.response.UserTokenResponse;
 import bitnagil.bitnagil_backend.global.annotation.CurrentUser;
 import bitnagil.bitnagil_backend.user.controller.spec.UserAuthSpec;
 import bitnagil.bitnagil_backend.user.domain.User;
-import bitnagil.bitnagil_backend.user.response.UserReissueResponse;
 import bitnagil.bitnagil_backend.user.service.UserAuthService;
 import bitnagil.bitnagil_backend.global.response.CustomResponseDto;
 import lombok.RequiredArgsConstructor;
@@ -20,16 +19,16 @@ public class UserAuthController implements UserAuthSpec {
     private final UserAuthService userAuthService;
 
     @PostMapping("/login")
-    public CustomResponseDto<UserLoginResponse> login(
+    public CustomResponseDto<UserTokenResponse> login(
             @RequestBody UserLoginRequest userLoginRequest,
             @RequestHeader("SocialAccessToken") String socialAccessToken) {
 
-        UserLoginResponse userLoginResponse = userAuthService.socialLogin(
+        UserTokenResponse userTokenResponse = userAuthService.socialLogin(
             userLoginRequest.getSocialType(),
             userLoginRequest.getNickname(),
             socialAccessToken);
 
-        return CustomResponseDto.from(userLoginResponse);
+        return CustomResponseDto.from(userTokenResponse);
     }
 
     @PostMapping("/logout")
@@ -40,10 +39,8 @@ public CustomResponseDto<Object> logout(@CurrentUser User user) {
     }
 
     @PostMapping("/token/reissue")
-    public CustomResponseDto<UserReissueResponse> reissueToken(@RequestHeader("Refresh-Token") String refreshToken) {
-        UserReissueResponse userReissueResponse = userAuthService.reissueToken(refreshToken);
-
-        return CustomResponseDto.from(userReissueResponse);
+    public CustomResponseDto<UserTokenResponse> reissueToken(@RequestHeader("Refresh-Token") String refreshToken) {
+        return CustomResponseDto.from(userAuthService.reissueToken(refreshToken));
     }
 
     @PostMapping("/withdrawal")

src/main/java/bitnagil/bitnagil_backend/user/controller/spec/UserAuthSpec.java

@@ -3,13 +3,12 @@
 import bitnagil.bitnagil_backend.user.request.UserAgreementsRequest;
 import bitnagil.bitnagil_backend.user.request.UserLoginRequest;
 
-import bitnagil.bitnagil_backend.user.response.UserLoginResponse;
+import bitnagil.bitnagil_backend.user.response.UserTokenResponse;
 import bitnagil.bitnagil_backend.global.errorcode.ErrorCode;
 import bitnagil.bitnagil_backend.global.response.CustomResponseDto;
 import bitnagil.bitnagil_backend.global.swagger.ApiErrorCodeExamples;
 import bitnagil.bitnagil_backend.global.swagger.ApiTags;
 import bitnagil.bitnagil_backend.user.domain.User;
-import bitnagil.bitnagil_backend.user.response.UserReissueResponse;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Parameters;
@@ -31,7 +30,7 @@ public interface UserAuthSpec {
             @Parameter(name = "SocialAccessToken", description = "소셜로그인 플랫폼에서 발급해준 access token 입니다.(Bearer를 붙히지 않습니다.)", required = true,
             example = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9", in = ParameterIn.HEADER),
     })
-    CustomResponseDto<UserLoginResponse> login(UserLoginRequest userLoginRequest,
+    CustomResponseDto<UserTokenResponse> login(UserLoginRequest userLoginRequest,
                                            String socialAccessToken);
 
 
@@ -50,7 +49,7 @@ CustomResponseDto<UserLoginResponse> login(UserLoginRequest userLoginRequest,
             @Parameter(name = "Refresh-Token", description = "서버에서 발급해준 refresh token 입니다.(Bearer를 붙히지 않습니다.)", required = true,
             example = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9", in = ParameterIn.HEADER)
     })
-    CustomResponseDto<UserReissueResponse> reissueToken(String refreshToken);
+    CustomResponseDto<UserTokenResponse> reissueToken(String refreshToken);
 
 
     @Operation(summary = "소셜로그인으로 연결된 유저가 회원탈퇴합니다. 반환 정보는 없습니다.")

src/main/java/bitnagil/bitnagil_backend/user/response/UserReissueResponse.java

@@ -13,7 +13,7 @@
 @Getter
 @AllArgsConstructor
 @Builder
-public class UserLoginResponse {
+public class UserTokenResponse {
     @NotEmpty
     private String accessToken;
 
@@ -23,8 +23,8 @@ public class UserLoginResponse {
     @NotEmpty
     private Role role;
 
-    public static UserLoginResponse of(Token token, Role role) {
-        return UserLoginResponse.builder()
+    public static UserTokenResponse of(Token token, Role role) {
+        return UserTokenResponse.builder()
                 .accessToken(token.getAccessToken())
                 .refreshToken(token.getRefreshToken())
                 .role(role)

…end/user/response/UserLoginResponse.java …end/user/response/UserTokenResponse.javasrc/main/java/bitnagil/bitnagil_backend/user/response/UserLoginResponse.java renamed to src/main/java/bitnagil/bitnagil_backend/user/response/UserTokenResponse.java src/main/java/bitnagil/bitnagil_backend/user/response/UserLoginResponse.java renamed to src/main/java/bitnagil/bitnagil_backend/user/response/UserTokenResponse.java

@@ -18,11 +18,10 @@
 import bitnagil.bitnagil_backend.global.exception.CustomException;
 import bitnagil.bitnagil_backend.user.repository.UserRepository;
 import bitnagil.bitnagil_backend.enums.SocialType;
-import bitnagil.bitnagil_backend.user.response.UserLoginResponse;
+import bitnagil.bitnagil_backend.user.response.UserTokenResponse;
 import bitnagil.bitnagil_backend.user.domain.User;
 import bitnagil.bitnagil_backend.enums.Role;
 import bitnagil.bitnagil_backend.user.domain.UserAuthInfo;
-import bitnagil.bitnagil_backend.user.response.UserReissueResponse;
 import lombok.RequiredArgsConstructor;
 
 /**
@@ -42,20 +41,20 @@ public class UserAuthService {
 
     // 소셜 로그인을 통해 로그인 혹은 회원가입을 진행
     @Transactional
-    public UserLoginResponse socialLogin(SocialType socialType, String nickname, String socialAccessToken) {
+    public UserTokenResponse socialLogin(SocialType socialType, String nickname, String socialAccessToken) {
 
         UserAuthInfo userAuthInfo = getUserAuthInfo(socialType, socialAccessToken);
 
         User user = signUpOrLogin(socialType, nickname, userAuthInfo);
 
         Token token = jwtUtil.generateToken(user.getUserId());
 
-        return UserLoginResponse.of(token, user.getRole());
+        return UserTokenResponse.of(token, user.getRole());
     }
 
     // refreshToken으로 accessToken 재발행
     @Transactional
-    public UserReissueResponse reissueToken(String refreshToken) {
+    public UserTokenResponse reissueToken(String refreshToken) {
 
         if (!jwtUtil.validateToken(refreshToken)) {
             throw new CustomException(ErrorCode.INVALID_JWT_TOKEN);
@@ -72,7 +71,7 @@ public UserReissueResponse reissueToken(String refreshToken) {
 
         Token token = jwtUtil.generateToken(user.getUserId());
 
-        return UserReissueResponse.of(token);
+        return UserTokenResponse.of(token, user.getRole());
     }
 
     // refreshToken 삭제 및 카카오 토큰 무효화