Merge pull request #45 from YAPP-Github/refactor/T3-142

[T3-142] User 테이블 PK 변경

Author: yuseok0215

src/main/java/bitnagil/bitnagil_backend/auth/jwt/AuthRedisService.java

@@ -6,7 +6,6 @@
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Component;
 
-import bitnagil.bitnagil_backend.global.entity.HistoryPk;
 import lombok.RequiredArgsConstructor;
 
 @Component
@@ -16,21 +15,18 @@ public class AuthRedisService {
     private final StringRedisTemplate stringRedisTemplate;
 
     // 저장
-    public void saveRefreshToken(HistoryPk userPk, String token) {
-        String redisKey = buildRefreshTokenKey(userPk);
-
+    public void saveRefreshToken(Long userId, String token) {
         RefreshToken refreshToken = RefreshToken.builder()
-            .userId(redisKey)  // 복합키를 문자열 ID로 저장
+            .userId(String.valueOf(userId))  // 복합키를 문자열 ID로 저장
             .refreshToken(token)
             .build();
 
         refreshTokenRedisRepository.save(refreshToken);
     }
 
     // 조회 by 복합키
-    public Optional<RefreshToken> getRefreshTokenByUserPk(HistoryPk userPk) {
-        String redisKey = buildRefreshTokenKey(userPk);
-        return refreshTokenRedisRepository.findById(redisKey);
+    public Optional<RefreshToken> getRefreshTokenByUserId(Long userId) {
+        return refreshTokenRedisRepository.findById(String.valueOf(userId));
     }
 
     // 조회 by refreshToken
@@ -39,16 +35,10 @@ public Optional<RefreshToken> getRefreshTokenByToken(String token) {
     }
 
     // 삭제
-    public void deleteRefreshToken(HistoryPk userPk) {
-        String redisKey = buildRefreshTokenKey(userPk);
-        refreshTokenRedisRepository.deleteById(redisKey);
-    }
-
-    private String buildRefreshTokenKey(HistoryPk userPk) {
-        return userPk.getId().toString() + ":" + userPk.getHistorySeq();
+    public void deleteRefreshToken(Long userId) {
+        refreshTokenRedisRepository.deleteById(String.valueOf(userId));
     }
 
-
     // Access Token 블랙리스트 등록
     public void addAccessTokenToBlacklist(String accessToken, long expirationMillis) {
         String key = "blacklist:" + accessToken;

src/main/java/bitnagil/bitnagil_backend/auth/jwt/JwtUtil.java

@@ -15,7 +15,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
-import bitnagil.bitnagil_backend.global.entity.HistoryPk;
 import bitnagil.bitnagil_backend.global.errorcode.ErrorCode;
 import bitnagil.bitnagil_backend.global.exception.CustomException;
 import bitnagil.bitnagil_backend.user.repository.UserRepository;
@@ -58,16 +57,15 @@ protected void init() {
         this.key = Keys.hmacShaKeyFor(keyBytes);
     }
 
-    public Token generateToken(HistoryPk userPk) {
+    public Token generateToken(Long userId) {
         Date now = new Date();
 
         // Access Token 생성
         Date accessTokenExpiresIn = new Date(now.getTime() + ACCESS_TOKEN_EXPIRE_TIME);
 
         String accessToken = Jwts.builder()
             .setSubject(ACCESS_TOKEN_SUBJECT)
-            .claim("userId", userPk.getId())
-            .claim("userHistorySeq", userPk.getHistorySeq())
+            .claim("userId", userId)
             .setExpiration(accessTokenExpiresIn)
             .signWith(key, SignatureAlgorithm.HS512)
             .compact();
@@ -76,13 +74,12 @@ public Token generateToken(HistoryPk userPk) {
         Date refreshTokenExpiresIn = new Date(now.getTime() + REFRESH_TOKEN_EXPIRE_TIME);
         String refreshToken = Jwts.builder()
             .setSubject(REFRESH_TOKEN_SUBJECT)
-            .claim("userId", userPk.getId())
-            .claim("userHistorySeq", userPk.getHistorySeq())
+            .claim("userId", userId)
             .setExpiration(refreshTokenExpiresIn)
             .signWith(key, SignatureAlgorithm.HS512)
             .compact();
 
-        authRedisService.saveRefreshToken(userPk, refreshToken);
+        authRedisService.saveRefreshToken(userId, refreshToken);
 
         return Token.builder()
             .accessToken(accessToken)
@@ -110,14 +107,11 @@ public Authentication getAuthentication(String accessToken) {
 
     // RefreshToken 혹은 AccessToken으로 인증된 유효 User 조회
     public User findValidUserByRefreshTokenOrAccessToken(String token) {
-        LocalDateTime now = LocalDateTime.now();
 
-        // JWT에서 유저 관련 정보 추출 후, UserPk 생성
-        UUID userId = UUID.fromString(parseClaims(token).get("userId", String.class));
+        Long userId = Long.valueOf(parseClaims(token).get("userId", String.class));
 
         return userRepository
-            .findByUserPk_IdAndHistoryStartDateTimeLessThanAndHistoryEndDateTimeGreaterThanEqual(
-                userId, now, now)
+            .findByUserId(userId)
             .orElseThrow(() -> new CustomException(ErrorCode.NOT_FOUND_USER));
     }
 

src/main/java/bitnagil/bitnagil_backend/auth/kakao/domain/CustomOAuth2User.java

@@ -19,13 +19,13 @@
 @Getter
 public class CustomOAuth2User extends DefaultOAuth2User {
 
-    private final HistoryPk userPk;
+    private final Long userId;
     private final Role userRole;
 
     public CustomOAuth2User(Collection<? extends GrantedAuthority> authorities,
-        Map<String, Object> attributes, String nameAttributeKey, HistoryPk userPk, Role userRole) {
+        Map<String, Object> attributes, String nameAttributeKey, Long userId, Role userRole) {
         super(authorities, attributes, nameAttributeKey);
-        this.userPk = userPk;
+        this.userId = userId;
         this.userRole = userRole;
     }
 }

src/main/java/bitnagil/bitnagil_backend/auth/kakao/service/CustomOAuth2UserService.java

@@ -46,8 +46,6 @@ public class CustomOAuth2UserService implements OAuth2UserService<OAuth2UserRequ
      */
     @Override
     public OAuth2User loadUser(OAuth2UserRequest userRequest) throws OAuth2AuthenticationException {
-        log.info("CustomOAuth2UserService 진입-----");
-
 
         OAuth2UserService<OAuth2UserRequest, OAuth2User> delegate = new DefaultOAuth2UserService();
         OAuth2User oAuth2User = delegate.loadUser(userRequest);
@@ -65,7 +63,7 @@ public OAuth2User loadUser(OAuth2UserRequest userRequest) throws OAuth2Authentic
 
         return new CustomOAuth2User(
             Collections.singleton(new SimpleGrantedAuthority(createdUser.getRole().getDescription())),
-            attributes, extractAttributes.getNameAttributeKey(), createdUser.getUserPk(), createdUser.getRole());
+            attributes, extractAttributes.getNameAttributeKey(), createdUser.getUserId(), createdUser.getRole());
     }
 
     private String getUserNameAttributeName(final OAuth2UserRequest userRequest) {
@@ -84,11 +82,9 @@ private SocialType getSocialType(String registrationId) {
     }
 
     private User getMember(OAuth2Attribute attributes, SocialType socialType) {
-        LocalDateTime now = LocalDateTime.now();
 
         User findUser = userRepository
-            .findBySocialTypeAndSocialIdAndHistoryStartDateTimeLessThanAndHistoryEndDateTimeGreaterThanEqual(
-                socialType, attributes.getSocialId(), now, now)
+            .findBySocialTypeAndSocialId(socialType, attributes.getSocialId())
             .orElseThrow(() -> new CustomException(ErrorCode.NOT_FOUND_USER));
 
         if (findUser == null) {

src/main/java/bitnagil/bitnagil_backend/changedRoutine/domain/ChangedRoutine.java

@@ -54,14 +54,14 @@ public class ChangedRoutine extends BaseTimeEntity {
     private ChangedDivCode changedDivCode; // 변경 구분 코드 (시간 변경, 내일 미루기, 오늘만 루틴 삭제 등)
 
     @NotNull
-    private UUID userId;
+    private Long userId;
 
     private UUID routineId;
 
     @Builder
     public ChangedRoutine(HistoryPk changedRoutinePk, String changedRoutineName, LocalTime changedExecutionTime,
         LocalDate originalRoutineDate, LocalDate changedRoutineDate, LocalDateTime historyStartDateTime,
-        LocalDateTime historyEndDateTime, UUID userId, UUID routineId, ChangedDivCode changedDivCode) {
+        LocalDateTime historyEndDateTime, Long userId, UUID routineId, ChangedDivCode changedDivCode) {
         this.changedRoutinePk = changedRoutinePk;
         this.changedRoutineName = changedRoutineName;
         this.changedExecutionTime = changedExecutionTime;

src/main/java/bitnagil/bitnagil_backend/changedRoutine/repository/ChangedRoutineRepository.java

@@ -22,7 +22,7 @@ public interface ChangedRoutineRepository extends JpaRepository<ChangedRoutine,
      * historyStartDateTime < systime <= historyEndDateTime
      */
     List<ChangedRoutine> findByUserIdAndDeletedAtIsNullAndHistoryStartDateTimeBeforeAndHistoryEndDateTimeGreaterThanEqualAndChangedRoutineDateBetween(
-            UUID userId,
+            Long userId,
             LocalDateTime now1,
             LocalDateTime now2,
             LocalDate startDate,

src/main/java/bitnagil/bitnagil_backend/changedRoutine/service/ChangedRoutineFactory.java

@@ -30,7 +30,7 @@ public ChangedRoutine createChangedRoutineForOnboarding(
             .changedRoutineDate(today) // 변경된 루틴 날짜도 현재 날짜로 설정
             .historyStartDateTime(now)
             .historyEndDateTime(TimeUtils.END_DATE_TIME)
-            .userId(user.getUserPk().getId())
+            .userId(user.getUserId())
             .changedDivCode(ChangedDivCode.ONBOARDING)
             .build();
     }

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

@@ -36,7 +36,7 @@ public class EmotionMarble extends BaseTimeEntity {
     private LocalDate date;
 
     @NotNull
-    private UUID userId;
+    private Long userId;
 
     @NotNull
     private LocalDateTime historyStartDateTime;
@@ -49,7 +49,7 @@ public class EmotionMarble extends BaseTimeEntity {
     private Case resultCase;
 
     @Builder
-    public EmotionMarble(HistoryPk emotionMarblePk, EmotionMarbleType emotionMarbleType, LocalDate date, UUID userId,
+    public EmotionMarble(HistoryPk emotionMarblePk, EmotionMarbleType emotionMarbleType, LocalDate date, Long userId,
                          LocalDateTime historyStartDateTime, LocalDateTime historyEndDateTime, Case resultCase) {
         this.emotionMarblePk = emotionMarblePk;
         this.emotionMarbleType = emotionMarbleType;

src/main/java/bitnagil/bitnagil_backend/emotionMarble/repository/EmotionMarbleRepository.java

@@ -10,9 +10,9 @@
 
 @Repository
 public interface EmotionMarbleRepository extends JpaRepository<EmotionMarble, HistoryPk> {
-    EmotionMarble findByUserId(UUID id);
+    EmotionMarble findByUserId(Long userId);
 
-    EmotionMarble findByUserIdAndDateIs(UUID userId, LocalDate now);
+    EmotionMarble findByUserIdAndDateIs(Long userId, LocalDate now);
 
-    boolean existsByUserIdAndDate(UUID userId, LocalDate nowDate);
+    boolean existsByUserIdAndDate(Long userId, LocalDate nowDate);
 }

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

@@ -27,7 +27,7 @@ public EmotionMarble createTodayEmotionMarble(User user, RegisterEmotionMarbleRe
             .emotionMarblePk(new HistoryPk(UUID.randomUUID(), 1L))
             .emotionMarbleType(request.getEmotionMarbleType())
             .date(nowDate)
-            .userId(user.getUserPk().getId())
+            .userId(user.getUserId())
             .historyStartDateTime(nowDateTime)
             .historyEndDateTime(endDateTime) // historyEndDateTime은 당일 11시 59분 59초로 설정(하루씩 설정되기 때문. 이러면 매일 감정 갱신이 불필요함)
             .resultCase( // 감정 구슬에 따른 추천 루틴을 찾기 위해 Case 객체를 생성