HOTFIX: 커밋 업데이트 날짜 추가

Leets-Official · Aug 1, 2024 · 2b7e512 · 2b7e512
1 parent 29eb0eb
commit 2b7e512
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 18 deletions.
diff --git a/...in/java/com/leets/commitatobe/domain/commit/presentation/dto/response/CommitResponse.java b/...in/java/com/leets/commitatobe/domain/commit/presentation/dto/response/CommitResponse.java
@@ -17,7 +17,7 @@ public record CommitResponse(
         Integer consecutiveCommitDays,
         Integer todayCommitCount,
         Integer totalCommitCount,
-        LocalDateTime updatedAt
+        LocalDateTime lastCommitUpdateTime
 ) {
     public static CommitResponse of(boolean isMyAccount, User user){
         return CommitResponse.builder()
@@ -30,7 +30,7 @@ public static CommitResponse of(boolean isMyAccount, User user){
                 .consecutiveCommitDays(user.getConsecutiveCommitDays())
                 .todayCommitCount(user.getTodayCommitCount())
                 .totalCommitCount(user.getTotalCommitCount())
-                .updatedAt(user.getUpdatedAt())
+                .lastCommitUpdateTime(user.getLastCommitUpdateTime())
                 .build();
     }
 }
diff --git a/src/main/java/com/leets/commitatobe/domain/commit/usecase/FetchCommits.java b/src/main/java/com/leets/commitatobe/domain/commit/usecase/FetchCommits.java
@@ -36,13 +36,9 @@ public CommitResponse execute(HttpServletRequest request) {
         User user = userRepository.findByGithubId(gitHubId)
                 .orElseThrow(() -> new UsernameNotFoundException("해당하는 깃허브 닉네임과 일치하는 유저를 찾을 수 없음: " + gitHubId));
 
-        LocalDateTime dateTime;
-        try {
-            dateTime = commitRepository.findAllByUser(user).stream()
-                    .max(Comparator.comparing(Commit::getUpdatedAt))
-                    .orElseThrow(() -> new ApiException(ErrorStatus._COMMIT_NOT_FOUND))
-                    .getUpdatedAt();
-        } catch (ApiException e) {
+        LocalDateTime dateTime = user.getLastCommitUpdateTime();
+
+        if(dateTime == null) {
             dateTime = user.getCreatedAt().toLocalDate().atStartOfDay();
         }
 
@@ -74,6 +70,9 @@ public CommitResponse execute(HttpServletRequest request) {
 
             executor.shutdown();
 
+            user.updateLastCommitUpdateTime(LocalDateTime.now());
+            userRepository.save(user);
+
             saveCommits(user);
 
             expService.calculateAndSaveExp(gitHubId);//커밋 가져온 후 경험치 계산 및 저장

diff --git a/src/main/java/com/leets/commitatobe/domain/commit/usecase/FetchCommitsTest.java b/src/main/java/com/leets/commitatobe/domain/commit/usecase/FetchCommitsTest.java
@@ -36,13 +36,9 @@ public CommitResponse execute(HttpServletRequest request) {
         User user = userRepository.findByGithubId(gitHubId)
                 .orElseThrow(() -> new UsernameNotFoundException("해당하는 깃허브 닉네임과 일치하는 유저를 찾을 수 없음: " + gitHubId));
 
-        LocalDateTime dateTime;
-        try {
-            dateTime = commitRepository.findAllByUser(user).stream()
-                    .max(Comparator.comparing(Commit::getUpdatedAt))
-                    .orElseThrow(() -> new ApiException(ErrorStatus._COMMIT_NOT_FOUND))
-                    .getUpdatedAt();
-        } catch (ApiException e) {
+        LocalDateTime dateTime = user.getLastCommitUpdateTime();
+
+        if(dateTime == null) {
             dateTime = LocalDateTime.of(2024, 7, 1, 0, 0, 0);
         }
 
@@ -71,6 +67,9 @@ public CommitResponse execute(HttpServletRequest request) {
 
             executor.shutdown();
 
+            user.updateLastCommitUpdateTime(LocalDateTime.now());
+            userRepository.save(user);
+
             saveCommits(user);
 
             expService.calculateAndSaveExp(gitHubId);//커밋 가져온 후 경험치 계산 및 저장

diff --git a/src/main/java/com/leets/commitatobe/domain/user/domain/User.java b/src/main/java/com/leets/commitatobe/domain/user/domain/User.java
@@ -5,6 +5,8 @@
 import jakarta.persistence.*;
 import lombok.*;
 
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.UUID;
 
 @Entity(name = "users")
@@ -54,6 +56,9 @@ public class User extends BaseTimeEntity {
     @JoinColumn(name = "tier_id")
     private Tier tier;
 
+    @Column
+    private LocalDateTime lastCommitUpdateTime;
+
     public void updateExp(Integer exp) {
         this.exp = exp;
     }
@@ -77,4 +82,8 @@ public void updateTodayCommitCount(Integer todayCommitCount) {
     public void updateRank(Integer ranking) {
         this.ranking = ranking;
     }
+
+    public void updateLastCommitUpdateTime (LocalDateTime lastCommitUpdateTime) {
+        this.lastCommitUpdateTime = lastCommitUpdateTime;
+    }
 }
diff --git a/...in/java/com/leets/commitatobe/domain/user/presentation/dto/response/UserInfoResponse.java b/...in/java/com/leets/commitatobe/domain/user/presentation/dto/response/UserInfoResponse.java
@@ -17,7 +17,7 @@ public record UserInfoResponse(
         Integer consecutiveCommitDays,
         Integer todayCommitCount,
         Integer totalCommitCount,
-        LocalDateTime updatedAt
+        LocalDateTime lastCommitUpdateTime
 ) {
     public static UserInfoResponse of(boolean isMyAccount, User user){
         return UserInfoResponse.builder()
@@ -30,7 +30,7 @@ public static UserInfoResponse of(boolean isMyAccount, User user){
                 .consecutiveCommitDays(user.getConsecutiveCommitDays())
                 .todayCommitCount(user.getTodayCommitCount())
                 .totalCommitCount(user.getTotalCommitCount())
-                .updatedAt(user.getUpdatedAt())
+                .lastCommitUpdateTime(user.getLastCommitUpdateTime())
                 .build();
     }
 }