diff --git a/layer-api/src/main/java/org/layer/domain/actionItem/controller/ActionItemApi.java b/layer-api/src/main/java/org/layer/domain/actionItem/controller/ActionItemApi.java index 82260488..e8604731 100644 --- a/layer-api/src/main/java/org/layer/domain/actionItem/controller/ActionItemApi.java +++ b/layer-api/src/main/java/org/layer/domain/actionItem/controller/ActionItemApi.java @@ -38,7 +38,7 @@ ResponseEntity createActionItem(@MemberId Long memberI content = { @Content( mediaType = "application/json", - schema = @Schema(implementation = MemberActionItemResponse.class) + schema = @Schema(implementation = MemberActionItemGetResponse.class) ) } ) 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..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 @@ -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,9 @@ public static AnalyzeIndividualGetResponse of(Analyze analyze) { analyzeDetail.getAnalyzeDetailType())) .collect(Collectors.groupingBy(AnalyzeDetailResponse::analyzeDetailType)); - return new AnalyzeIndividualGetResponse(map.get(AnalyzeDetailType.GOOD), map.get(AnalyzeDetailType.BAD), + 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; + } }