Merge pull request #112 from Bamdoliro/feat/#98

[새기능] 최종 합격 자동화 및 점수 순 정렬
Bamdoliro · Sep 3, 2024 · 5205e1e · 5205e1e
2 parents 267de55 + 95dcad5
commit 5205e1e
Show file tree

Hide file tree

Showing 21 changed files with 570 additions and 85 deletions.
diff --git a/src/docs/asciidoc/form.adoc b/src/docs/asciidoc/form.adoc
@@ -587,4 +587,24 @@ include::{snippets}/form-controller-test/선택한_원서의_원서url을_조회
 ==== 응답
 
 ===== 정상 응답
-include::{snippets}/form-controller-test/선택한_원서의_원서url을_조회한다/http-response.adoc[]
+include::{snippets}/form-controller-test/선택한_원서의_원서url을_조회한다/http-response.adoc[]
+
+
+
+=== 2차 합격 자동 처리
+
+==== 요청 형식
+
+===== Request Header
+include::{snippets}/form-controller-test/자동으로_2차_합격_여부를_결정한다/request-headers.adoc[]
+
+==== 요청
+include::{snippets}/form-controller-test/자동으로_2차_합격_여부를_결정한다/http-request.adoc[]
+
+==== 응답
+
+===== 정상 응답
+include::{snippets}/form-controller-test/자동으로_2차_합격_여부를_결정한다/http-response.adoc[]
+
+===== 최종 점수가 없는 원서가 있을 경우
+include::{snippets}/form-controller-test/자동으로_2차_합격_여부를_결정할_때_최종_점수가_없는_원서가_존재하면_에러가_발생한다/http-response.adoc[]
diff --git a/src/main/java/com/bamdoliro/maru/application/form/GenerateAdmissionTicketUseCase.java b/src/main/java/com/bamdoliro/maru/application/form/GenerateAdmissionTicketUseCase.java
@@ -1,7 +1,7 @@
 package com.bamdoliro.maru.application.form;
 
 import com.bamdoliro.maru.domain.form.domain.Form;
-import com.bamdoliro.maru.domain.form.exception.InvalidFromStatusException;
+import com.bamdoliro.maru.domain.form.exception.InvalidFormStatusException;
 import com.bamdoliro.maru.domain.form.service.FormFacade;
 import com.bamdoliro.maru.domain.user.domain.User;
 import com.bamdoliro.maru.infrastructure.pdf.GeneratePdfService;
@@ -48,7 +48,7 @@ public ByteArrayResource execute(User user) {
 
     private void validateFormStatus(Form form) {
         if (!form.isFirstPassedNow()) {
-            throw new InvalidFromStatusException();
+            throw new InvalidFormStatusException();
         }
     }
 }
diff --git a/src/main/java/com/bamdoliro/maru/application/form/QueryAllFormUseCase.java b/src/main/java/com/bamdoliro/maru/application/form/QueryAllFormUseCase.java
@@ -1,12 +1,15 @@
 package com.bamdoliro.maru.application.form;
 
+import com.bamdoliro.maru.domain.form.domain.Form;
 import com.bamdoliro.maru.domain.form.domain.type.FormStatus;
 import com.bamdoliro.maru.domain.form.domain.type.FormType;
+import com.bamdoliro.maru.domain.form.exception.MissingTotalScoreException;
 import com.bamdoliro.maru.infrastructure.persistence.form.FormRepository;
 import com.bamdoliro.maru.presentation.form.dto.response.FormSimpleResponse;
 import com.bamdoliro.maru.shared.annotation.UseCase;
 import lombok.RequiredArgsConstructor;
 
+import java.util.Comparator;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -17,10 +20,22 @@ public class QueryAllFormUseCase {
 
     private final FormRepository formRepository;
 
-    public List<FormSimpleResponse> execute(FormStatus status, FormType.Category category) {
-        return formRepository.findByStatus(status).stream()
+    public List<FormSimpleResponse> execute(FormStatus status, FormType.Category category, String sort) {
+        List<Form> formList = new java.util.ArrayList<>(formRepository.findByStatus(status).stream()
                 .filter(form -> Objects.isNull(category) || form.getType().categoryEquals(category))
+                .toList());
+
+        if (sort != null && formList.stream().anyMatch(form -> form.getScore().getTotalScore() == null)) {
+            throw new MissingTotalScoreException();
+        }
+        if ("total-score-asc".equals(sort)) {
+            formList.sort(Comparator.comparing(form -> form.getScore().getTotalScore(), Comparator.naturalOrder()));
+        } else if ("total-score-desc".equals(sort)) {
+            formList.sort(Comparator.comparing(form -> form.getScore().getTotalScore(), Comparator.reverseOrder()));
+        }
+
+        return formList.stream()
                 .map(FormSimpleResponse::new)
                 .collect(Collectors.toList());
     }
-}
+}
diff --git a/src/main/java/com/bamdoliro/maru/application/form/SelectFirstPassUseCase.java b/src/main/java/com/bamdoliro/maru/application/form/SelectFirstPassUseCase.java
@@ -6,6 +6,7 @@
 import com.bamdoliro.maru.infrastructure.persistence.form.FormRepository;
 import com.bamdoliro.maru.shared.annotation.UseCase;
 import com.bamdoliro.maru.shared.constants.FixedNumber;
+import com.bamdoliro.maru.shared.variable.AdmissionCapacity;
 import lombok.RequiredArgsConstructor;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -34,12 +35,16 @@ public void execute() {
             int gap = FixedNumber.MEISTER_TALENT - meisterTalentFormList.size();
             regularCount += gap;
             meisterTalentCount -= gap;
+            AdmissionCapacity.regular += gap;
+            AdmissionCapacity.meisterTalent -= gap;
         }
 
         if (socialIntegrationFormList.size() < FixedNumber.SOCIAL_INTEGRATION) {
             int gap = FixedNumber.SOCIAL_INTEGRATION - socialIntegrationFormList.size();
             regularCount += gap;
             socialIntegrationCount -= gap;
+            AdmissionCapacity.regular += gap;
+            AdmissionCapacity.socialIntegration -= gap;
         }
 
         regularCount = calculateMultiple(regularCount);
@@ -73,22 +78,29 @@ public void execute() {
         }
 
         formRepository.flush();
-        List<Form> regularOrSupernumeraryFormList = formRepository.findReceivedRegularOrSupernumeraryForm();
+        List<Form> regularOrSupernumeraryFormList = formRepository.findReceivedRegularForm();
 
         for (Form form : regularOrSupernumeraryFormList) {
-            if (form.getType().isRegular() && regularCount > 0) {
+            if (regularCount > 0) {
                 form.firstPass();
                 regularCount--;
-            } else if (
+            } else {
+                form.firstFail();
+            }
+        }
+
+        formRepository.flush();
+        List<Form> supernumeraryFormList = formRepository.findReceivedSupernumeraryForm();
+
+        for (Form form : supernumeraryFormList) {
+            if (
                     form.getType().isNationalVeteransEducation() &&
-                            regularCount > 0 &&
                             nationalVeteransEducationCount > 0
             ) {
                 form.firstPass();
                 nationalVeteransEducationCount--;
             } else if (
                     form.getType().isSpecialAdmission() &&
-                            regularCount > 0 &&
                             specialAdmissionCount > 0
             ) {
                 form.firstPass();

diff --git a/src/main/java/com/bamdoliro/maru/application/form/SelectSecondPassUseCase.java b/src/main/java/com/bamdoliro/maru/application/form/SelectSecondPassUseCase.java
@@ -0,0 +1,99 @@
+package com.bamdoliro.maru.application.form;
+
+import com.bamdoliro.maru.domain.form.domain.Form;
+import com.bamdoliro.maru.domain.form.domain.type.FormStatus;
+import com.bamdoliro.maru.domain.form.domain.type.FormType;
+import com.bamdoliro.maru.domain.form.exception.MissingTotalScoreException;
+import com.bamdoliro.maru.infrastructure.persistence.form.FormRepository;
+import com.bamdoliro.maru.shared.annotation.UseCase;
+import com.bamdoliro.maru.shared.constants.FixedNumber;
+import com.bamdoliro.maru.shared.variable.AdmissionCapacity;
+import jakarta.transaction.Transactional;
+import lombok.RequiredArgsConstructor;
+
+import java.util.List;
+
+@RequiredArgsConstructor
+@UseCase
+public class SelectSecondPassUseCase {
+
+    private final FormRepository formRepository;
+
+    @Transactional
+    public void execute() {
+        validate();
+
+        int regularCount = AdmissionCapacity.regular;
+        int meisterTalentCount = AdmissionCapacity.meisterTalent;
+        int socialIntegrationCount = AdmissionCapacity.socialIntegration;
+        int nationalVeteransEducationCount = FixedNumber.NATIONAL_VETERANS_EDUCATION;
+        int specialAdmissionCount = FixedNumber.SPECIAL_ADMISSION;
+        int equalOpportunityCount = (int) Math.round(socialIntegrationCount * 0.5);
+        int societyDiversityCount = equalOpportunityCount;
+
+        List<Form> specialFormList = formRepository.findFirstPassedSpecialForm();
+        List<Form> meisterTalentFormList = classifyFormsByType(specialFormList, FormType::isMeister);
+        List<Form> socialIntegrationFormList = classifyFormsByType(specialFormList, FormType::isSocial);
+
+        for (Form form : socialIntegrationFormList) {
+            if (form.getType().isEqualOpportunity() && equalOpportunityCount > 0) {
+                form.pass();
+                equalOpportunityCount--;
+            } else if (form.getType().isSocietyDiversity() && societyDiversityCount > 0) {
+                form.pass();
+                societyDiversityCount--;
+            } else {
+                form.fail();
+            }
+        }
+
+        for (Form form : meisterTalentFormList) {
+            if (meisterTalentCount > 0) {
+                form.pass();
+                meisterTalentCount--;
+            } else {
+                form.fail();
+            }
+        }
+
+        formRepository.flush();
+        List<Form> regularFormList = formRepository.findFirstPassedRegularForm();
+
+        for (Form form : regularFormList) {
+            if (regularCount > 0) {
+                form.pass();
+                regularCount--;
+            } else {
+                form.fail();
+            }
+        }
+
+        formRepository.flush();
+        List<Form> supernumeraryFormList = formRepository.findFirstPassedSupernumeraryForm();
+
+        for (Form form : supernumeraryFormList) {
+            if (form.getType().isNationalVeteransEducation() && nationalVeteransEducationCount > 0) {
+                form.pass();
+                nationalVeteransEducationCount--;
+            } else if (form.getType().isSpecialAdmission() && specialAdmissionCount > 0) {
+                form.pass();
+                specialAdmissionCount--;
+            } else {
+                form.fail();
+            }
+        }
+    }
+
+    private void validate() {
+        List<Form> firstPassedFormList = formRepository.findByStatus(FormStatus.FIRST_PASSED);
+        firstPassedFormList.stream()
+                .filter(form -> form.getScore().getTotalScore() == null)
+                .forEach(form -> {throw new MissingTotalScoreException();});
+    }
+
+    private List<Form> classifyFormsByType(List<Form> formList, FormTypeFilter filter) {
+        return formList.stream()
+                .filter(form -> filter.execute(form.getType()))
+                .toList();
+    }
+}
diff --git a/src/main/java/com/bamdoliro/maru/domain/form/domain/type/FormType.java b/src/main/java/com/bamdoliro/maru/domain/form/domain/type/FormType.java
@@ -19,7 +19,7 @@ public enum FormType implements EnumProperty {
     NATIONAL_VETERANS("국가보훈자녀", Category.SPECIAL, Category.SOCIAL_INTEGRATION, Category.EQUAL_OPPORTUNITY),
     ONE_PARENT("한부모가정", Category.SPECIAL, Category.SOCIAL_INTEGRATION, Category.EQUAL_OPPORTUNITY),
 
-    FROM_NORTH_KOREA("북한이탈주민", Category.SPECIAL, Category.SOCIAL_INTEGRATION, Category.SOCIETY_DIVERSITY),
+    FROM_NORTH_KOREA("북한이탈청소년", Category.SPECIAL, Category.SOCIAL_INTEGRATION, Category.SOCIETY_DIVERSITY),
     MULTICULTURAL("다문화가정", Category.SPECIAL, Category.SOCIAL_INTEGRATION, Category.SOCIETY_DIVERSITY),
     TEEN_HOUSEHOLDER("소년소녀가장", Category.SPECIAL, Category.SOCIAL_INTEGRATION, Category.SOCIETY_DIVERSITY),
     MULTI_CHILDREN("다자녀가정자녀", Category.SPECIAL, Category.SOCIAL_INTEGRATION, Category.SOCIETY_DIVERSITY),

diff --git a/...exception/InvalidFromStatusException.java → ...exception/InvalidFormStatusException.java b/...exception/InvalidFromStatusException.java → ...exception/InvalidFormStatusException.java
@@ -3,9 +3,9 @@
 import com.bamdoliro.maru.domain.form.exception.error.FormErrorProperty;
 import com.bamdoliro.maru.shared.error.MaruException;
 
-public class InvalidFromStatusException extends MaruException {
+public class InvalidFormStatusException extends MaruException {
 
-    public InvalidFromStatusException() {
+    public InvalidFormStatusException() {
         super(FormErrorProperty.INVALID_FORM_STATUS);
     }
 }
diff --git a/src/main/java/com/bamdoliro/maru/domain/form/exception/MissingTotalScoreException.java b/src/main/java/com/bamdoliro/maru/domain/form/exception/MissingTotalScoreException.java
@@ -0,0 +1,10 @@
+package com.bamdoliro.maru.domain.form.exception;
+
+import com.bamdoliro.maru.domain.form.exception.error.FormErrorProperty;
+import com.bamdoliro.maru.shared.error.MaruException;
+
+public class MissingTotalScoreException extends MaruException {
+    public MissingTotalScoreException() {
+        super(FormErrorProperty.MISSING_TOTAL_SCORE);
+    }
+}
diff --git a/src/main/java/com/bamdoliro/maru/domain/form/exception/TotalScoreMissingException.java b/src/main/java/com/bamdoliro/maru/domain/form/exception/TotalScoreMissingException.java
@@ -0,0 +1,10 @@
+package com.bamdoliro.maru.domain.form.exception;
+
+import com.bamdoliro.maru.domain.form.exception.error.FormErrorProperty;
+import com.bamdoliro.maru.shared.error.MaruException;
+
+public class TotalScoreMissingException extends MaruException {
+    public TotalScoreMissingException() {
+        super(FormErrorProperty.MISSING_TOTAL_SCORE);
+    }
+}
diff --git a/src/main/java/com/bamdoliro/maru/domain/form/exception/error/FormErrorProperty.java b/src/main/java/com/bamdoliro/maru/domain/form/exception/error/FormErrorProperty.java
@@ -15,6 +15,7 @@ public enum FormErrorProperty implements ErrorProperty {
     CANNOT_UPDATE_NOT_REJECTED_FORM(HttpStatus.CONFLICT, "반려된 원서만 수정할 수 있습니다."),
     INVALID_FORM_STATUS(HttpStatus.CONFLICT, "원서 상태가 유효하지 않습니다."),
     INVALID_FILE(HttpStatus.BAD_REQUEST, "잘못된 파일입니다."),
+    MISSING_TOTAL_SCORE(HttpStatus.PRECONDITION_FAILED, "최종 점수가 입력되지 않은 원서가 존재합니다."),
     WRONG_SCORE(HttpStatus.BAD_REQUEST, "점수 범위를 초과했습니다."),
     ;
 

diff --git a/src/main/java/com/bamdoliro/maru/infrastructure/persistence/form/FormRepositoryCustom.java b/src/main/java/com/bamdoliro/maru/infrastructure/persistence/form/FormRepositoryCustom.java
@@ -16,7 +16,11 @@ public interface FormRepositoryCustom {
     List<Form> findByType(FormType type);
     List<Form> findByCategory(FormType.Category category);
     List<Form> findReceivedSpecialForm();
-    List<Form> findReceivedRegularOrSupernumeraryForm();
+    List<Form> findReceivedRegularForm();
+    List<Form> findReceivedSupernumeraryForm();
+    List<Form> findFirstPassedSpecialForm();
+    List<Form> findFirstPassedRegularForm();
+    List<Form> findFirstPassedSupernumeraryForm();
     List<Form> findFirstRoundForm();
     List<Form> findMeisterTalentFirstRoundForm();
     List<Form> findNotExistsMeisterTalentAndChangedToRegularFirstRoundForm();