From 9a0e40dbf467cc5bbc49d30fa4f04ebc06cfbac7 Mon Sep 17 00:00:00 2001 From: 5uhwann <5uhwann27@gmail.com> Date: Fri, 5 Apr 2024 15:06:06 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20=EB=B6=88=ED=95=84=EC=9A=94=20?= =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...enerateOrModifyCompletedCreditService.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/completedcredit/application/service/GenerateOrModifyCompletedCreditService.java b/src/main/java/com/plzgraduate/myongjigraduatebe/completedcredit/application/service/GenerateOrModifyCompletedCreditService.java index a93341a2..3d9ee714 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/completedcredit/application/service/GenerateOrModifyCompletedCreditService.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/completedcredit/application/service/GenerateOrModifyCompletedCreditService.java @@ -45,15 +45,15 @@ public void generateOrModifyCompletedCredit(User user, GraduationResult graduati )); List completedCreditModels = resultMap.keySet().stream() - .map(completedCredit -> createCompletedCreditModel(user, completedCredit, resultMap.get(completedCredit))) + .map(completedCredit -> createCompletedCreditModel(completedCredit, resultMap.get(completedCredit))) .collect(Collectors.toList()); - CompletedCredit chapelCompletedCreditModel = createChapelCompletedCreditModel(user, completedCredits, + CompletedCredit chapelCompletedCreditModel = createChapelCompletedCreditModel(completedCredits, + graduationResult); + CompletedCredit normalCultureCompletedCreditModel = createNormalCultureCompletedCreditModel(completedCredits, + graduationResult); + CompletedCredit freeElectiveCompletedCreditModel = createFreeElectiveCompletedCreditModel(completedCredits, graduationResult); - CompletedCredit normalCultureCompletedCreditModel = createNormalCultureCompletedCreditModel(user, - completedCredits, graduationResult); - CompletedCredit freeElectiveCompletedCreditModel = createFreeElectiveCompletedCreditModel(user, - completedCredits, graduationResult); ArrayList allCompletedCreditModels = new ArrayList<>(completedCreditModels); allCompletedCreditModels.addAll( @@ -61,7 +61,7 @@ public void generateOrModifyCompletedCredit(User user, GraduationResult graduati generateOrModifyCompletedCreditPort.generateOrModifyCompletedCredits(user, allCompletedCreditModels); } - private CompletedCredit createCompletedCreditModel(User user, DetailGraduationResult detailGraduationResult, + private CompletedCredit createCompletedCreditModel(DetailGraduationResult detailGraduationResult, Optional completedCredit) { return CompletedCredit.builder() .id(completedCredit.map(CompletedCredit::getId).orElse(null)) @@ -71,7 +71,7 @@ private CompletedCredit createCompletedCreditModel(User user, DetailGraduationRe .build(); } - private CompletedCredit createChapelCompletedCreditModel(User user, List completedCredits, + private CompletedCredit createChapelCompletedCreditModel(List completedCredits, GraduationResult graduationResult) { return completedCredits.stream() .filter(completedCredit -> completedCredit.getGraduationCategory() == CHAPEL) @@ -87,7 +87,7 @@ private CompletedCredit createChapelCompletedCreditModel(User user, List completedCredits, + private CompletedCredit createNormalCultureCompletedCreditModel(List completedCredits, GraduationResult graduationResult) { return completedCredits.stream() .filter(completedCredit -> completedCredit.getGraduationCategory() == NORMAL_CULTURE) @@ -103,7 +103,7 @@ private CompletedCredit createNormalCultureCompletedCreditModel(User user, List< .graduationCategory(NORMAL_CULTURE).build()); } - private CompletedCredit createFreeElectiveCompletedCreditModel(User user, List completedCredits, + private CompletedCredit createFreeElectiveCompletedCreditModel(List completedCredits, GraduationResult graduationResult) { return completedCredits.stream() .filter(completedCredit -> completedCredit.getGraduationCategory() == FREE_ELECTIVE)