Feature/1644 refinement of evaluation logic (#1660)

* fix(db): Add migration for correctly calculating evaluation values  #1644

* feat(backend): Refactor logic of evaluation view and move logic to services  #1644

* refactor(backend): Add back fromDto method and controller method  #1644

* feat(backend): Add ability to calculate completed objectives to db and service  #1644

* feat(backend): Add extra row for making identification unique  #1644

* fix(backend): Fix counting of completed objectives  #1644

* style(backend): Format backend  #1644

* refactor(backend): Change name to be the same as before  #1644

* test(backend): Refactor existings tests and add new ones  #1644

* refactor(backend): Correctly use persistenceservice as sub step  #1644

* fix(backend): Fix validation of evaluationpage and add tests as well  #1644

* test(backend): Fix existing persistence integration test  #1644

* test(backend): Add tests for newly written business logic  #1644

* refactor(backend): Correctly use enums instead of strings on model  #1644

* test(backend): Utilize enums in test as well  #1644

* refactor(backend): Remove any occurence of the old evaluationViewId that is obsolete  #1644

* style(backend): Format all files  #1644

* refactor(backend): Change params type of dto to long and make error message more precise  #1644

* refactor(backend): Rename method to be more descriptive and simplify a bit of logic  #1644

* fix(backend): Change logic to exclude key results that are empty  #1644

* style(backend): Format files  #1644

* test(backend): Fix test by correcting the numbers of the count  #1644

Author: ManuelMoeri

backend/src/main/java/ch/puzzle/okr/dto/EvaluationDto.java

@@ -1,7 +1,7 @@
 package ch.puzzle.okr.dto;
 
-public record EvaluationDto(int objectiveAmount, int completedObjectivesAmount,
-        int successfullyCompletedObjectivesAmount, int keyResultAmount, int keyResultsOrdinalAmount,
-        int keyResultsMetricAmount, int keyResultsInTargetOrStretchAmount, int keyResultsInFailAmount,
-        int keyResultsInCommitAmount, int keyResultsInTargetAmount, int keyResultsInStretchAmount) {
+public record EvaluationDto(long objectiveAmount, long completedObjectivesAmount,
+        long successfullyCompletedObjectivesAmount, long keyResultAmount, long keyResultsOrdinalAmount,
+        long keyResultsMetricAmount, long keyResultsInTargetOrStretchAmount, long keyResultsInFailAmount,
+        long keyResultsInCommitAmount, long keyResultsInTargetAmount, long keyResultsInStretchAmount) {
 }

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);
+    }
+}