refactor: 과제 휴강시에도 정적 팩토리 메서드 사용하도록 수정

GDSC-Hongik · Oct 6, 2024 · b60e067 · b60e067
1 parent 223286d
commit b60e067
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/...ava/com/gdschongik/gdsc/domain/study/dto/response/AssignmentSubmissionStatusResponse.java b/...ava/com/gdschongik/gdsc/domain/study/dto/response/AssignmentSubmissionStatusResponse.java
@@ -1,6 +1,7 @@
 package com.gdschongik.gdsc.domain.study.dto.response;
 
 import com.gdschongik.gdsc.domain.study.domain.AssignmentHistory;
+import com.gdschongik.gdsc.domain.study.domain.StudyDetail;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
@@ -14,7 +15,10 @@ public enum AssignmentSubmissionStatusResponse {
 
     private final String value;
 
-    public static AssignmentSubmissionStatusResponse from(AssignmentHistory assignmentHistory) {
+    public static AssignmentSubmissionStatusResponse of(AssignmentHistory assignmentHistory, StudyDetail studyDetail) {
+        if (studyDetail.getAssignment().isCancelled()) {
+            return CANCELLED;
+        }
         if (assignmentHistory == null) {
             return NOT_SUBMITTED;
         }

diff --git a/...in/java/com/gdschongik/gdsc/domain/study/dto/response/StudyStudentCurriculumResponse.java b/...in/java/com/gdschongik/gdsc/domain/study/dto/response/StudyStudentCurriculumResponse.java
@@ -37,7 +37,7 @@ public static StudyStudentCurriculumResponse of(
                 studyDetail.getCurriculum().getDifficulty(),
                 AttendanceStatusResponse.of(studyDetail, now.toLocalDate(), isAttended),
                 studyDetail.getAssignment().getStatus(),
-                AssignmentSubmissionStatusResponse.from(assignmentHistory),
+                AssignmentSubmissionStatusResponse.of(assignmentHistory, studyDetail),
                 assignmentHistory != null ? assignmentHistory.getSubmissionFailureType() : NOT_SUBMITTED,
                 assignmentHistory != null ? assignmentHistory.getSubmissionLink() : null);
     }

diff --git a/src/main/java/com/gdschongik/gdsc/domain/study/dto/response/StudyTodoResponse.java b/src/main/java/com/gdschongik/gdsc/domain/study/dto/response/StudyTodoResponse.java
@@ -51,7 +51,7 @@ public static StudyTodoResponse createAssignmentType(StudyDetail studyDetail, As
                     null,
                     null,
                     null,
-                    AssignmentSubmissionStatusResponse.CANCELLED);
+                    AssignmentSubmissionStatusResponse.of(null, studyDetail));
         }
 
         return new StudyTodoResponse(
@@ -61,7 +61,7 @@ public static StudyTodoResponse createAssignmentType(StudyDetail studyDetail, As
                 studyDetail.getAssignment().getDeadline(),
                 null,
                 studyDetail.getAssignment().getTitle(),
-                AssignmentSubmissionStatusResponse.from(assignmentHistory));
+                AssignmentSubmissionStatusResponse.of(assignmentHistory, studyDetail));
     }
 
     @Getter