#110 Fix reading all employeeorder objects for an employee and at a s…

…pecific date
HBTGmbH · May 16, 2022 · 60d1f9f · 60d1f9f
1 parent 6239a19
commit 60d1f9f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/src/main/java/org/tb/chicoree/RefreshTimereportFormFieldsAction.java b/src/main/java/org/tb/chicoree/RefreshTimereportFormFieldsAction.java
@@ -31,10 +31,10 @@ protected ActionForward executeAuthenticated(ActionMapping mapping, TimereportFo
         }
         var employeecontractId = chicoreeSessionStore.getLoginEmployeecontractId().orElseThrow();
         var date = form.getDateTyped();
-        var employeeorders = employeeorderDAO.getEmployeeordersByEmployeeContractIdAndCustomerorderIdValidAt(
+        var employeeorders = employeeorderDAO.getEmployeeordersByEmployeeContractIdAndValidAt(
             employeecontractId,
-            date,
-            form.getOrderId() != null ? Optional.of(form.getOrderIdTyped()) : Optional.empty());
+            date
+        );
         chicoreeSessionStore.setEmployeeorders(employeeorders);
         if(form.getOrderId() != null && !form.getOrderId().isBlank()) {
           chicoreeSessionStore.setCustomerorder(form.getOrderIdTyped(), employeeorders);

diff --git a/src/main/java/org/tb/order/persistence/EmployeeorderDAO.java b/src/main/java/org/tb/order/persistence/EmployeeorderDAO.java
@@ -11,7 +11,6 @@
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
@@ -24,7 +23,6 @@
 import org.tb.common.util.DateUtils;
 import org.tb.dailyreport.domain.TimereportDTO;
 import org.tb.dailyreport.persistence.TimereportDAO;
-import org.tb.employee.domain.Employee;
 import org.tb.employee.domain.Employee_;
 import org.tb.employee.domain.Employeecontract_;
 import org.tb.order.domain.Customerorder_;
@@ -260,15 +258,12 @@ public List<Employeeorder> getEmployeeordersByFilters(Boolean showInvalid, Strin
         return getEmployeeordersByFilters(showInvalid, filter, employeeContractId, customerOrderId, null);
     }
 
-    public List<Employeeorder> getEmployeeordersByEmployeeContractIdAndCustomerorderIdValidAt(long employeeContractId,
-        LocalDate date, Optional<Long> customerOrderId) {
+    public List<Employeeorder> getEmployeeordersByEmployeeContractIdAndValidAt(long employeeContractId,
+        LocalDate date) {
         return employeeorderRepository.findAll((Specification<Employeeorder>) (root, query, builder) -> {
                 Set<Predicate> predicates = new HashSet<>();
                 predicates.add(showOnlyValid(date).toPredicate(root, query, builder));
                 predicates.add(matchingEmployeecontractId(employeeContractId).toPredicate(root, query, builder));
-                customerOrderId.ifPresent(id -> {
-                  predicates.add(matchingCustomerorderId(id).toPredicate(root, query, builder));
-                });
                 return builder.and(predicates.toArray(new Predicate[0]));
             }).stream()
             .sorted(comparing((Employeeorder e) -> e.getEmployeecontract().getEmployee().getSign())