Feature/1644 refinement of evaluation logic

backend/src/main/java/ch/puzzle/okr/mapper/EvaluationViewMapper.java

@@ -2,53 +2,35 @@
 
 import ch.puzzle.okr.dto.EvaluationDto;
 import ch.puzzle.okr.models.evaluation.EvaluationView;
-import ch.puzzle.okr.models.evaluation.EvaluationViewId;
+import ch.puzzle.okr.service.business.EvaluationViewBusinessService;
+import ch.puzzle.okr.util.TeamQuarterFilter;
 import java.util.List;
 import org.springframework.stereotype.Component;
 
 @Component
 public class EvaluationViewMapper {
-    public EvaluationDto toDto(List<EvaluationView> evaluationViews) {
-        int objectiveSum = 0;
-        int completedObjectivesSum = 0;
-        int successfullyCompletedObjectivesSum = 0;
-        int keyResultSum = 0;
-        int keyResultsOrdinalSum = 0;
-        int keyResultsMetricSum = 0;
-        int keyResultsInTargetOrStretchSum = 0;
-        int keyResultsInFailSum = 0;
-        int keyResultsInCommitSum = 0;
-        int keyResultsInTargetSum = 0;
-        int keyResultsInStretchSum = 0;
 
-        for (EvaluationView view : evaluationViews) {
-            objectiveSum += view.getObjectiveAmount();
-            completedObjectivesSum += view.getCompletedObjectivesAmount();
-            successfullyCompletedObjectivesSum += view.getSuccessfullyCompletedObjectivesAmount();
-            keyResultSum += view.getKeyResultAmount();
-            keyResultsOrdinalSum += view.getKeyResultsOrdinalAmount();
-            keyResultsMetricSum += view.getKeyResultsMetricAmount();
-            keyResultsInTargetOrStretchSum += view.getKeyResultsInTargetOrStretchAmount();
-            keyResultsInFailSum += view.getKeyResultsInFailAmount();
-            keyResultsInCommitSum += view.getKeyResultsInCommitAmount();
-            keyResultsInTargetSum += view.getKeyResultsInTargetAmount();
-            keyResultsInStretchSum += view.getKeyResultsInStretchAmount();
-        }
+    private final EvaluationViewBusinessService evaluationService;
 
-        return new EvaluationDto(objectiveSum,
-                                 completedObjectivesSum,
-                                 successfullyCompletedObjectivesSum,
-                                 keyResultSum,
-                                 keyResultsOrdinalSum,
-                                 keyResultsMetricSum,
-                                 keyResultsInTargetOrStretchSum,
-                                 keyResultsInFailSum,
-                                 keyResultsInCommitSum,
-                                 keyResultsInTargetSum,
-                                 keyResultsInStretchSum);
+    public EvaluationViewMapper(EvaluationViewBusinessService evaluationService) {
+        this.evaluationService = evaluationService;
     }
 
-    public List<EvaluationViewId> fromDto(List<Long> teamIds, Long quarterId) {
-        return teamIds.stream().map(teamId -> new EvaluationViewId(teamId, quarterId)).toList();
+    public EvaluationDto toDto(List<EvaluationView> views) {
+        return new EvaluationDto(evaluationService.calculateObjectiveSum(views),
+                                 evaluationService.calculateCompletedObjectivesSum(views),
+                                 evaluationService.calculateSuccessfullyCompletedObjectivesSum(views),
+                                 evaluationService.calculateKeyResultSum(views),
+                                 evaluationService.calculateKeyResultsOrdinalSum(views),
+                                 evaluationService.calculateKeyResultsMetricSum(views),
+                                 evaluationService.calculateKeyResultsInTargetOrStretchSum(views),
+                                 evaluationService.calculateKeyResultsInFailSum(views),
+                                 evaluationService.calculateKeyResultsInCommitSum(views),
+                                 evaluationService.calculateKeyResultsInTargetSum(views),
+                                 evaluationService.calculateKeyResultsInStretchSum(views));
     }
-}
+
+    public TeamQuarterFilter fromDto(List<Long> teamIds, Long quarterId) {
+        return new TeamQuarterFilter(teamIds, quarterId);
+    }
+}