CSCEXAM-459 Fix backend not returning some data

Author: lupari

app/controllers/admin/ReportController.java

@@ -12,6 +12,7 @@
 import controllers.base.BaseController;
 import io.ebean.DB;
 import io.ebean.ExpressionList;
+import io.ebean.Query;
 import io.ebean.text.PathProperties;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -245,23 +246,21 @@ public Result getReservations(Optional<String> dept, Optional<String> start, Opt
 
     @Restrict({ @Group("ADMIN") })
     public Result getIopReservations(Optional<String> dept, Optional<String> start, Optional<String> end) {
-        ExpressionList<Reservation> query = DB.find(Reservation.class)
-            .fetch("externalReservation")
-            .fetch("enrolment")
-            .where()
-            .or()
-            .isNotNull("externalRef")
-            .isNotNull("externalReservation.orgName")
-            .endOr();
-        query = applyFilters(
-            query,
+        PathProperties pp = PathProperties.parse(
+            "*, enrolment(noShow, externalExam(finished)), externalReservation(*)"
+        );
+        Query<Reservation> query = DB.find(Reservation.class);
+        pp.apply(query);
+        ExpressionList<Reservation> el = query.where().isNotNull("externalRef");
+        el = applyFilters(
+            el,
             "enrolment.exam.course",
             "startAt",
             dept.orElse(null),
             start.orElse(null),
             end.orElse(null)
         );
-        Set<Reservation> reservations = query
+        Set<Reservation> reservations = el
             .findSet()
             .stream()
             .filter(r -> r.getExternalOrgName() != null || (r.getExternalReservation() != null))