Skip to content

[개선] SelectSecondPassUseCase 개선 #400

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
leegunwoooo merged 1 commit into from
May 18, 2026
Merged

[개선] SelectSecondPassUseCase 개선 #400

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions src/main/java/com/bamdoliro/maru/application/form/SelectSecondPassUseCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,13 @@ public class SelectSecondPassUseCase {

private final FormRepository formRepository;
private final CalculateFormScoreService calculateFormScoreService;
private final AtomicInteger otherRegionCount = new AtomicInteger((int) Math.ceil(FixedNumber.TOTAL * FixedNumber.OTHER_REGION_RATE));

@Transactional
public void execute() {
validate();

AtomicInteger otherRegionCount = new AtomicInteger((int) Math.ceil(FixedNumber.TOTAL * FixedNumber.OTHER_REGION_RATE));

int regularCount = FixedNumber.REGULAR;
int meisterTalentCount = FixedNumber.MEISTER_TALENT;
int socialIntegrationCount = FixedNumber.SOCIAL_INTEGRATION;
Expand Down Expand Up @@ -54,25 +55,25 @@ public void execute() {
int equalOpportunityCount = (int) Math.round(socialIntegrationCount * 0.5);
int societyDiversityCount = equalOpportunityCount;

processForms(equalOpportunityFormList, equalOpportunityCount, this::changeToRegularAndCalculateScoreAgain);
processForms(societyDiversityFormList, societyDiversityCount, this::changeToRegularAndCalculateScoreAgain);
processForms(meisterTalentFormList, meisterTalentCount, this::changeToRegularAndCalculateScoreAgain);
processForms(equalOpportunityFormList, equalOpportunityCount, this::changeToRegularAndCalculateScoreAgain, otherRegionCount);
processForms(societyDiversityFormList, societyDiversityCount, this::changeToRegularAndCalculateScoreAgain, otherRegionCount);
processForms(meisterTalentFormList, meisterTalentCount, this::changeToRegularAndCalculateScoreAgain,otherRegionCount);

formRepository.flush();
List<Form> regularFormList = formRepository.findFirstPassedRegularForm();

processForms(regularFormList, regularCount, Form::fail);
processForms(regularFormList, regularCount, Form::fail, otherRegionCount);

formRepository.flush();
List<Form> supernumeraryFormList = formRepository.findFirstPassedSupernumeraryForm();
List<Form> nationalVeteransEducationFormList = classifyFormsByType(supernumeraryFormList, FormType::isNationalVeteransEducation);
List<Form> specialAdmissionFormList = classifyFormsByType(supernumeraryFormList, FormType::isSpecialAdmission);

processForms(nationalVeteransEducationFormList, nationalVeteransEducationCount, Form::fail);
processForms(specialAdmissionFormList, specialAdmissionCount, Form::fail);
processForms(nationalVeteransEducationFormList, nationalVeteransEducationCount, Form::fail, otherRegionCount);
processForms(specialAdmissionFormList, specialAdmissionCount, Form::fail, otherRegionCount);
}

private void processForms(List<Form> formList, int count, Consumer<Form> action) {
private void processForms(List<Form> formList, int count, Consumer<Form> action, AtomicInteger otherRegionCount) {
for (Form form : formList) {
if (count > 0) {
if (form.getEducation().getSchool().isBusan()) {
Expand Down
Loading