From 0acaeef632cd7d7f0f697914adb9809be66bfcdf Mon Sep 17 00:00:00 2001 From: mikekks Date: Thu, 9 Oct 2025 15:50:07 +0900 Subject: [PATCH 1/2] =?UTF-8?q?chore:=20=EA=B0=9C=EC=9D=B8=EC=97=90=20?= =?UTF-8?q?=EB=8C=80=ED=95=9C=20score,=20goalCompletionRate=20=EB=8D=B0?= =?UTF-8?q?=EC=9D=B4=ED=84=B0=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/response/AnalyzeIndividualGetResponse.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/layer-api/src/main/java/org/layer/domain/analyze/controller/dto/response/AnalyzeIndividualGetResponse.java b/layer-api/src/main/java/org/layer/domain/analyze/controller/dto/response/AnalyzeIndividualGetResponse.java index 0c9132fe..465139cc 100644 --- a/layer-api/src/main/java/org/layer/domain/analyze/controller/dto/response/AnalyzeIndividualGetResponse.java +++ b/layer-api/src/main/java/org/layer/domain/analyze/controller/dto/response/AnalyzeIndividualGetResponse.java @@ -8,6 +8,8 @@ import org.layer.domain.analyze.enums.AnalyzeDetailType; public record AnalyzeIndividualGetResponse( + int score, + int goalCompletionRate, List goodPoints, List badPoints, List improvementPoints @@ -19,7 +21,11 @@ public static AnalyzeIndividualGetResponse of(Analyze analyze) { analyzeDetail.getAnalyzeDetailType())) .collect(Collectors.groupingBy(AnalyzeDetailResponse::analyzeDetailType)); - return new AnalyzeIndividualGetResponse(map.get(AnalyzeDetailType.GOOD), map.get(AnalyzeDetailType.BAD), + int score = analyze.getScoreOne() * 1 + analyze.getScoreTwo() * 2 + analyze.getScoreThree() * 3 + + analyze.getScoreFour() * 4 + analyze.getScoreFive() * 5; + + return new AnalyzeIndividualGetResponse(score, analyze.getGoalCompletionRate(), map.get(AnalyzeDetailType.GOOD), + map.get(AnalyzeDetailType.BAD), map.get(AnalyzeDetailType.IMPROVEMENT)); } } From dc657208b888afc1fc9c2a5d3042e88ac3b2a5f6 Mon Sep 17 00:00:00 2001 From: mikekks Date: Thu, 9 Oct 2025 15:55:39 +0900 Subject: [PATCH 2/2] =?UTF-8?q?refactor:=20=EB=8F=84=EB=A9=94=EC=9D=B8?= =?UTF-8?q?=EB=A1=9C=EC=A7=81=EC=9C=BC=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/response/AnalyzeIndividualGetResponse.java | 6 ++---- .../main/java/org/layer/domain/analyze/entity/Analyze.java | 4 ++++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/layer-api/src/main/java/org/layer/domain/analyze/controller/dto/response/AnalyzeIndividualGetResponse.java b/layer-api/src/main/java/org/layer/domain/analyze/controller/dto/response/AnalyzeIndividualGetResponse.java index 465139cc..a4ee0dbd 100644 --- a/layer-api/src/main/java/org/layer/domain/analyze/controller/dto/response/AnalyzeIndividualGetResponse.java +++ b/layer-api/src/main/java/org/layer/domain/analyze/controller/dto/response/AnalyzeIndividualGetResponse.java @@ -21,10 +21,8 @@ public static AnalyzeIndividualGetResponse of(Analyze analyze) { analyzeDetail.getAnalyzeDetailType())) .collect(Collectors.groupingBy(AnalyzeDetailResponse::analyzeDetailType)); - int score = analyze.getScoreOne() * 1 + analyze.getScoreTwo() * 2 + analyze.getScoreThree() * 3 - + analyze.getScoreFour() * 4 + analyze.getScoreFive() * 5; - - return new AnalyzeIndividualGetResponse(score, analyze.getGoalCompletionRate(), map.get(AnalyzeDetailType.GOOD), + return new AnalyzeIndividualGetResponse(analyze.getTotalScore(), analyze.getGoalCompletionRate(), + map.get(AnalyzeDetailType.GOOD), map.get(AnalyzeDetailType.BAD), map.get(AnalyzeDetailType.IMPROVEMENT)); } diff --git a/layer-domain/src/main/java/org/layer/domain/analyze/entity/Analyze.java b/layer-domain/src/main/java/org/layer/domain/analyze/entity/Analyze.java index 03e8694d..caa139d9 100644 --- a/layer-domain/src/main/java/org/layer/domain/analyze/entity/Analyze.java +++ b/layer-domain/src/main/java/org/layer/domain/analyze/entity/Analyze.java @@ -83,4 +83,8 @@ public AnalyzeDetail getTopCountAnalyzeDetailBy(AnalyzeDetailType analyzeDetailT private AnalyzeDetail getEmptyAnalyzeDetail(){ return AnalyzeDetail.builder().build(); } + + public int getTotalScore(){ + return scoreOne * 1 + scoreTwo * 2 + scoreThree * 3 + scoreFour * 4 + scoreFive * 5; + } }