BE-#94: Calculation and Tests work. Dto missing

SE-TINF22B2 · May 20, 2024 · 7292149 · 7292149
1 parent de6b503
commit 7292149
Show file tree

Hide file tree

Showing 2 changed files with 265 additions and 220 deletions.
diff --git a/...c/main/java/com/dhbw/get2gether/backend/widget/model/expensesplit/ExpenseSplitWidget.java b/...c/main/java/com/dhbw/get2gether/backend/widget/model/expensesplit/ExpenseSplitWidget.java
@@ -55,7 +55,7 @@ public List<Dept> calculateDeptsForUserId(String userId){
                 }
             } else {
                 Optional<UserWithPercentage> userWithPercentage = expenseEntry.getInvolvedUsers().stream()
-                        .findFirst().filter(user -> user.getUserId().equals(userId));
+                        .filter(user -> user.getUserId().equals(userId)).findFirst();
                 if(userWithPercentage.isPresent()){
                     // Add the Dept of the user to the Dept List
                     // In this case the user for whom we calculate all depts is a involved user and not the payer
@@ -68,9 +68,8 @@ public List<Dept> calculateDeptsForUserId(String userId){
 
     // This method extracts the logic if the deptor is already in the list or not
     private List<Dept> addDept(List<Dept> depts, String debtorId, double deptAmount){
-        Optional<Dept> optionalDept = depts.stream().findFirst()
-                .filter(dept -> dept.getUserId().equals(debtorId));
-        // todo somehow in second entry with second user this optional is empty but should not be
+        Optional<Dept> optionalDept = depts.stream()
+                .filter(dept -> dept.getUserId().equals(debtorId)).findFirst();
 
         if(optionalDept.isPresent()){
             // Calculate new deptAmount if already exists