YAPP-Github
diff --git a/‎build.gradle‎
Lines changed: 5 additions & 0 deletions b/‎build.gradle‎
Lines changed: 5 additions & 0 deletions
diff --git a/‎config‎ b/‎config‎
diff --git a/‎src/main/java/bitnagil/bitnagil_backend/auth/jwt/AuthRedisService.java‎
Lines changed: 6 additions & 16 deletions b/‎src/main/java/bitnagil/bitnagil_backend/auth/jwt/AuthRedisService.java‎
Lines changed: 6 additions & 16 deletions
diff --git a/‎src/main/java/bitnagil/bitnagil_backend/auth/jwt/JwtUtil.java‎
Lines changed: 6 additions & 12 deletions b/‎src/main/java/bitnagil/bitnagil_backend/auth/jwt/JwtUtil.java‎
Lines changed: 6 additions & 12 deletions
diff --git a/‎src/main/java/bitnagil/bitnagil_backend/auth/kakao/domain/CustomOAuth2User.java‎
Lines changed: 3 additions & 3 deletions b/‎src/main/java/bitnagil/bitnagil_backend/auth/kakao/domain/CustomOAuth2User.java‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎src/main/java/bitnagil/bitnagil_backend/auth/kakao/service/CustomOAuth2UserService.java‎
Lines changed: 2 additions & 6 deletions b/‎src/main/java/bitnagil/bitnagil_backend/auth/kakao/service/CustomOAuth2UserService.java‎
Lines changed: 2 additions & 6 deletions
diff --git a/‎src/main/java/bitnagil/bitnagil_backend/changedRoutine/domain/ChangedRoutine.java‎
Lines changed: 6 additions & 2 deletions b/‎src/main/java/bitnagil/bitnagil_backend/changedRoutine/domain/ChangedRoutine.java‎
Lines changed: 6 additions & 2 deletions
diff --git a/‎src/main/java/bitnagil/bitnagil_backend/changedRoutine/repository/ChangedRoutineRepository.java‎
Lines changed: 1 addition & 1 deletion b/‎src/main/java/bitnagil/bitnagil_backend/changedRoutine/repository/ChangedRoutineRepository.java‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/main/java/bitnagil/bitnagil_backend/changedRoutine/service/ChangedRoutineFactory.java‎
Lines changed: 9 additions & 8 deletions b/‎src/main/java/bitnagil/bitnagil_backend/changedRoutine/service/ChangedRoutineFactory.java‎
Lines changed: 9 additions & 8 deletions
diff --git a/‎src/main/java/bitnagil/bitnagil_backend/emotionMarble/domain/EmotionMarble.java‎
Lines changed: 9 additions & 10 deletions b/‎src/main/java/bitnagil/bitnagil_backend/emotionMarble/domain/EmotionMarble.java‎
Lines changed: 9 additions & 10 deletions
@@ -2,6 +2,7 @@ plugins {
 	id 'java'
 	id 'org.springframework.boot' version '3.5.0'
 	id 'io.spring.dependency-management' version '1.1.7'
+	id 'org.flywaydb.flyway' version '10.14.0'
 }
 
 group = 'bitnagil'
@@ -62,6 +63,10 @@ dependencies {
 
 	// aws
 	implementation 'org.springframework.cloud:spring-cloud-starter-aws:2.2.6.RELEASE'
+
+	// flyway
+	implementation 'org.flywaydb:flyway-core'
+	implementation 'org.flywaydb:flyway-mysql'
 }
 
 tasks.named('test') {
 
@@ -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;
 
@@ -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", Integer.class));
 
         return userRepository
-            .findByUserPk_IdAndHistoryStartDateTimeLessThanAndHistoryEndDateTimeGreaterThanEqual(
-                userId, now, now)
+            .findByUserId(userId)
             .orElseThrow(() -> new CustomException(ErrorCode.NOT_FOUND_USER));
     }
 
 
@@ -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;
     }
 }
@@ -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) {
 
@@ -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;
@@ -74,4 +74,8 @@ public ChangedRoutine(HistoryPk changedRoutinePk, String changedRoutineName, Loc
         this.routineId = routineId;
     }
 
+    public void updateChangedDivCode(ChangedDivCode changedDivCode) {
+        this.changedDivCode = changedDivCode;
+    }
+
 }
@@ -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,
 
@@ -2,6 +2,7 @@
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.util.UUID;
 
 import org.springframework.stereotype.Service;
@@ -19,29 +20,29 @@
 public class ChangedRoutineFactory {
 
     // 유저 초기 온보딩 시 추천 루틴을 등록할 때 변경 루틴에 저장
-    public ChangedRoutine createChangedRoutineForOnboarding(
-        User user, RecommendedRoutine recommendedRoutine, LocalDate today, LocalDateTime now) {
+    public ChangedRoutine createChangedRoutineForToday(
+        User user, String RoutineName, LocalTime executionTime, LocalDate today, LocalDateTime now) {
 
         return ChangedRoutine.builder()
             .changedRoutinePk(new HistoryPk(UUID.randomUUID(), 1L))
-            .changedRoutineName(recommendedRoutine.getRecommendedRoutineName())
-            .changedExecutionTime(recommendedRoutine.getExecutionTime())
+            .changedRoutineName(RoutineName)
+            .changedExecutionTime(executionTime)
             .originalRoutineDate(today) // 원본 루틴 날짜는 현재 날짜로 설정
             .changedRoutineDate(today) // 변경된 루틴 날짜도 현재 날짜로 설정
             .historyStartDateTime(now)
             .historyEndDateTime(TimeUtils.END_DATE_TIME)
-            .userId(user.getUserPk().getId())
+            .userId(user.getUserId())
             .changedDivCode(ChangedDivCode.ONBOARDING)
             .build();
     }
 
     // 유저 초기 온보딩 시 추천 루틴을 등록할 때 변경 서브루틴에 저장
-    public ChangedSubRoutine createChangedSubRoutineForOnboarding(
-        int sortOrder, RecommendedSubRoutine recommendedSubRoutine, LocalDateTime now, ChangedRoutine changedRoutine) {
+    public ChangedSubRoutine createChangedSubRoutineForToday(
+        int sortOrder, String subRoutineName, LocalDateTime now, ChangedRoutine changedRoutine) {
 
         return ChangedSubRoutine.builder()
             .changedSubRoutinePk(new HistoryPk(UUID.randomUUID(), 1L))
-            .changedSubRoutineName(recommendedSubRoutine.getSubRoutineName())
+            .changedSubRoutineName(subRoutineName)
             .historyStartDateTime(now)
             .historyEndDateTime(TimeUtils.END_DATE_TIME)
             .changedRoutineId(changedRoutine.getChangedRoutinePk().getId())
 
@@ -10,22 +10,22 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.SQLDelete;
+import org.hibernate.annotations.Where;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.util.UUID;
 
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Entity
+@SQLDelete(sql = "UPDATE emotion_marble SET deleted_at = NOW() WHERE emotion_marble_id = ?")
+@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)
@@ -36,7 +36,7 @@ public class EmotionMarble extends BaseTimeEntity {
     private LocalDate date;
 
     @NotNull
-    private UUID userId;
+    private Long userId;
 
     @NotNull
     private LocalDateTime historyStartDateTime;
@@ -49,9 +49,8 @@ public class EmotionMarble extends BaseTimeEntity {
     private Case resultCase;
 
     @Builder
-    public EmotionMarble(HistoryPk emotionMarblePk, EmotionMarbleType emotionMarbleType, LocalDate date, UUID 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;