perf(#137): changeToRegular 이름 변경 및 changeToRegularSecondRound 메서드 추가

- changeToRegularSecondRound 메서드를 추가했어요. - 위 메서드 추가를 위해 changeToRegular 메서드를 changeToRegularFirstRound로 변경했어요.
Bamdoliro · Sep 24, 2024 · ccb352d · ccb352d
1 parent 9998cf3
commit ccb352d
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/src/main/java/com/bamdoliro/maru/domain/form/domain/Form.java b/src/main/java/com/bamdoliro/maru/domain/form/domain/Form.java
@@ -191,14 +191,33 @@ public boolean isFailedNow() {
         return status.equals(FormStatus.FAILED);
     }
 
-    public void changeToRegular(CalculateFormScoreService calculateFormScoreService) {
+    public void changeToRegularFirstRound(CalculateFormScoreService calculateFormScoreService) {
         this.changedToRegular = true;
         this.type = FormType.REGULAR;
 
         Double subjectGradeScore = calculateFormScoreService.calculateSubjectGradeScore(this);
         this.score.updateSubjectScore(subjectGradeScore);
     }
 
+    public void changeToRegularSecondRound(CalculateFormScoreService calculateFormScoreService) {
+        this.changedToRegular = true;
+
+        if (type.isMeister()) {
+            this.type = FormType.REGULAR;
+            Double subjectGradeScore = calculateFormScoreService.calculateSubjectGradeScore(this);
+            this.score.updateSubjectScore(subjectGradeScore);
+
+            this.score.updateSecondRoundMeisterScoreToRegular();
+        } else if (type.isSocial()){
+            this.type = FormType.REGULAR;
+            Double subjectGradeScore = calculateFormScoreService.calculateSubjectGradeScore(this);
+            this.score.updateSubjectScore(subjectGradeScore);
+
+            Double depthInterviewScore = calculateFormScoreService.calculateDepthInterviewScoreToRegular(this);
+            this.score.updateSecondRoundSocialScoreToRegular(depthInterviewScore);
+        }
+    }
+
     public void update(Applicant applicant, Parent parent, Education education, Grade grade, Document document, FormType type) {
         this.applicant = applicant;
         this.parent = parent;

diff --git a/src/test/java/com/bamdoliro/maru/application/message/SendMessageUseCaseTest.java b/src/test/java/com/bamdoliro/maru/application/message/SendMessageUseCaseTest.java
@@ -244,7 +244,7 @@ public class SendMessageUseCaseTest {
         when(formRepository.findChangedToRegularFirstRoundForm()).thenReturn(List.of(form));
 
         form.firstPass();
-        form.changeToRegular(calculateFormScoreService);
+        form.changeToRegularFirstRound(calculateFormScoreService);
         SendMessageByTypeRequest request = new SendMessageByTypeRequest("부산소마고 공지사항", "헤헤", FormType.REGULAR, true);
 
         //when