Merge pull request #381 from DKU-Dgaja/378-be-fix-커밋-패치-미작동-에러

[BE] refactor(#378): 커밋 상태 필드 복구
DKU-Dgaja · Jul 2, 2024 · 9f375f0 · 9f375f0
2 parents b7522dd + 44308f3
commit 9f375f0
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 21 deletions.
diff --git a/backend/src/main/java/com/example/backend/domain/define/study/commit/StudyCommit.java b/backend/src/main/java/com/example/backend/domain/define/study/commit/StudyCommit.java
@@ -47,7 +47,7 @@ public class StudyCommit extends BaseEntity {
 
     @Enumerated(EnumType.STRING)
     @Column(name = "COMMIT_STATUS")
-    @ColumnDefault(value = "'WAITING'")
+    @ColumnDefault(value = "'COMMIT_WAITING'")
     private CommitStatus status;                // 커밋 상태 (승인 여부)
 
     @Column(name = "REJECTION_REASON")
@@ -70,11 +70,11 @@ public StudyCommit(Long studyInfoId, Long studyTodoId, Long userId, String commi
     }
 
     public void approveCommit() {
-        this.status = CommitStatus.APPROVAL;
+        this.status = CommitStatus.COMMIT_APPROVAL;
     }
 
     public void rejectCommit(String rejectionReason) {
-        this.status = CommitStatus.REJECTION;
+        this.status = CommitStatus.COMMIT_REJECTION;
         this.rejectionReason = rejectionReason;
     }
 

diff --git a/...d/src/main/java/com/example/backend/domain/define/study/commit/constant/CommitStatus.java b/...d/src/main/java/com/example/backend/domain/define/study/commit/constant/CommitStatus.java
@@ -6,10 +6,10 @@
 @Getter
 @RequiredArgsConstructor
 public enum CommitStatus {
-    APPROVAL("승인"),
-    REJECTION("거절"),
-    WAITING("대기"),
-    DELETE("삭제");
+    COMMIT_APPROVAL("승인"),
+    COMMIT_REJECTION("거절"),
+    COMMIT_WAITING("대기"),
+    COMMIT_DELETE("삭제");
 
     private final String text;
 }
diff --git a/backend/src/main/java/com/example/backend/study/api/service/commit/StudyCommitService.java b/backend/src/main/java/com/example/backend/study/api/service/commit/StudyCommitService.java
@@ -193,7 +193,7 @@ private List<StudyCommit> filterCommit(StudyTodo todo, List<GithubCommitResponse
                         }
                     }
 
-                    return StudyCommit.of(findUser.getId(), todo, commit, CommitStatus.WAITING);
+                    return StudyCommit.of(findUser.getId(), todo, commit, CommitStatus.COMMIT_WAITING);
                 })
                 .toList();
 
@@ -235,7 +235,7 @@ public void rejectCommit(Long commitId, String rejectionReason) {
     }
 
     public List<CommitInfoResponse> selectWaitingCommit(Long studyInfoId) {
-        return studyCommitRepository.findStudyCommitListByStudyInfoIdAndStatus(studyInfoId, CommitStatus.WAITING)
+        return studyCommitRepository.findStudyCommitListByStudyInfoIdAndStatus(studyInfoId, CommitStatus.COMMIT_WAITING)
                 .stream()
                 .map(CommitInfoResponse::of)
                 .toList();

diff --git a/backend/src/test/java/com/example/backend/domain/define/study/commit/StudyCommitFixture.java b/backend/src/test/java/com/example/backend/domain/define/study/commit/StudyCommitFixture.java
@@ -7,8 +7,8 @@
 import java.util.List;
 import java.util.Set;
 
-import static com.example.backend.domain.define.study.commit.constant.CommitStatus.APPROVAL;
-import static com.example.backend.domain.define.study.commit.constant.CommitStatus.WAITING;
+import static com.example.backend.domain.define.study.commit.constant.CommitStatus.COMMIT_APPROVAL;
+import static com.example.backend.domain.define.study.commit.constant.CommitStatus.COMMIT_WAITING;
 
 public class StudyCommitFixture {
     private static final int MAX_VALUE = 1000; // 최대값 설정
@@ -22,7 +22,7 @@ public static StudyCommit createDefaultStudyCommit(Long userId, Long studyInfoId
                 .commitSHA(commitSHA)
                 .message("메세지")
                 .commitDate(LocalDate.now())
-                .status(APPROVAL)
+                .status(COMMIT_APPROVAL)
                 .rejectionReason(null)
                 .build();
     }
@@ -35,7 +35,7 @@ public static StudyCommit createWaitingStudyCommit(Long userId, Long studyInfoId
                 .commitSHA(commitSHA)
                 .message("메세지")
                 .commitDate(LocalDate.now())
-                .status(WAITING)
+                .status(COMMIT_WAITING)
                 .rejectionReason(null)
                 .build();
     }

diff --git a/...rc/test/java/com/example/backend/study/api/service/commit/CommitFetchPerformanceTest.java b/...rc/test/java/com/example/backend/study/api/service/commit/CommitFetchPerformanceTest.java
@@ -137,7 +137,7 @@ public void testFetchRemoteCommitsAndSavePerformance() throws ExecutionException
                 .userId(user.getId())
                 .message("aBc123 [jusung-c] 백준: 컨벤션 수칙 지키기")
                 .commitDate(LocalDate.now())
-                .status(CommitStatus.APPROVAL)
+                .status(CommitStatus.COMMIT_APPROVAL)
                 .commitSHA("sha")
                 .build());
 

diff --git a/...nd/src/test/java/com/example/backend/study/api/service/commit/CommitFetchServiceTest.java b/...nd/src/test/java/com/example/backend/study/api/service/commit/CommitFetchServiceTest.java
@@ -394,7 +394,7 @@ void tearDown() {
 
         StudyCommit commit = allCommits.get(0);
         assertEquals(commit.getUserId(), activeUser.getId());
-        assertEquals(CommitStatus.WAITING, commit.getStatus());
+        assertEquals(CommitStatus.COMMIT_WAITING, commit.getStatus());
 
     }
 
@@ -441,7 +441,7 @@ void tearDown() {
         List<StudyCommit> allCommits = studyCommitRepository.findAll();
         assertEquals(1, allCommits.size());
         assertEquals(message, allCommits.get(0).getMessage());
-        assertEquals(CommitStatus.WAITING, allCommits.get(0).getStatus());
+        assertEquals(CommitStatus.COMMIT_WAITING, allCommits.get(0).getStatus());
     }
 
     @Test

diff --git a/...nd/src/test/java/com/example/backend/study/api/service/commit/StudyCommitServiceTest.java b/...nd/src/test/java/com/example/backend/study/api/service/commit/StudyCommitServiceTest.java
@@ -231,7 +231,7 @@ void tearDown() {
         // 저장된 커밋들 중 컨벤션을 지킨 APPROVAL 상태의 커밋만 필터링
         List<StudyCommit> allCommits = studyCommitRepository.findByStudyTodoId(todo.getId())
                 .stream()
-                .filter(commit -> commit.getStatus() == CommitStatus.WAITING)
+                .filter(commit -> commit.getStatus() == CommitStatus.COMMIT_WAITING)
                 .toList();
 //        System.out.println("allCommits.size() = " + allCommits.size());
 //        for (var c : allCommits) {
@@ -269,7 +269,7 @@ void tearDown() {
 
         // then
         StudyCommit commit = studyCommitRepository.findById(savedCommit.getId()).get();
-        assertEquals(commit.getStatus(), CommitStatus.APPROVAL);
+        assertEquals(commit.getStatus(), CommitStatus.COMMIT_APPROVAL);
     }
 
     @Test
@@ -293,7 +293,7 @@ void tearDown() {
 
         // then
         StudyCommit commit = studyCommitRepository.findById(savedCommit.getId()).get();
-        assertEquals(CommitStatus.APPROVAL, commit.getStatus());
+        assertEquals(CommitStatus.COMMIT_APPROVAL, commit.getStatus());
         assertNotNull(commit.getModifiedDateTime());
     }
 
@@ -315,7 +315,7 @@ void tearDown() {
 
         // then
         StudyCommit commit = studyCommitRepository.findById(savedCommit.getId()).get();
-        assertEquals(commit.getStatus(), CommitStatus.REJECTION);
+        assertEquals(commit.getStatus(), CommitStatus.COMMIT_REJECTION);
         assertEquals(commit.getRejectionReason(), rejectionReason);
     }
 
@@ -339,7 +339,7 @@ void tearDown() {
         // then
         assertEquals(waintingList.size(), waitingCommits.size());
         for (var a : waintingList) {
-            assertEquals(a.getStatus(), CommitStatus.WAITING);
+            assertEquals(a.getStatus(), CommitStatus.COMMIT_WAITING);
         }
 
     }