fix(delete-trip): update trip status on request on delete

fix ibi-group/trimet-mod-otp#302
opentripplanner · Jul 30, 2021 · c208596 · c208596
1 parent 3a83162
commit c208596
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 30 deletions.
diff --git a/app/controllers/FieldTrip.java b/app/controllers/FieldTrip.java
@@ -291,6 +291,12 @@ public static void deleteTrip(Long id) {
         checkAccess(user);
 
         ScheduledFieldTrip trip = ScheduledFieldTrip.findById(id);
+        if (trip.requestOrder == 0) {
+            trip.request.outboundTripStatus = null;
+        } else {
+            trip.request.inboundTripStatus = null;
+        }
+        trip.request.save();
         trip.delete();
         renderJSON(id);
     }
@@ -436,29 +442,10 @@ public static void getRequestsSummary(Integer limit) {
 
         List<FieldTripRequest> requests;
         String sql = "order by timeStamp desc";
-        if(limit == null)
-            requests = FieldTripRequest.find(sql).fetch();
-        else {
-            requests = FieldTripRequest.find(sql).fetch(limit);
-        }
+        if (limit == null) requests = FieldTripRequest.find(sql).fetch();
+        else requests = FieldTripRequest.find(sql).fetch(limit);
 
-        Gson gson = new GsonBuilder()
-          .excludeFieldsWithoutExposeAnnotation()
-          .setExclusionStrategies(new ExclusionStrategy() {
-
-            public boolean shouldSkipField(FieldAttributes fa) {
-                String name = fa.getName();
-                return(name.equals("trips") || name.equals("notes") || name.equals("feedback"));
-            }
-
-            public boolean shouldSkipClass(Class<?> type) {
-                return false;
-            }
-
-          })
-          .serializeNulls()
-          .create();
-        renderJSON(gson.toJson(requests));
+        renderJSON(fieldTripSummaryWriter.toJson(requests));
     }
 
     public static void setRequestStatus(long requestId, String status) {
@@ -549,7 +536,10 @@ public static void setRequestDate(long requestId, @As("MM/dd/yyyy") Date date) {
     public static void setRequestGroupSize(long requestId, int numStudents, int numFreeStudents, int numChaperones) {
         TrinetUser user = checkLogin();
         checkAccess(user);
-
+        System.out.println(requestId);
+        System.out.println(numStudents);
+        System.out.println(numChaperones);
+        System.out.println(numFreeStudents);
         FieldTripRequest req = FieldTripRequest.findById(requestId);
         if(req != null) {
             req.numStudents = numStudents;
@@ -657,12 +647,7 @@ public static void searchRequests(String query, String teacherValue, String scho
         List<FieldTripRequest> requests;
         if(date2 == null) requests = FieldTripRequest.find(query, teacherValue, schoolValue, date1).fetch();
         else requests = FieldTripRequest.find(query, teacherValue, schoolValue, date1, date2).fetch();
-
-        Gson gson = new GsonBuilder()
-          .excludeFieldsWithoutExposeAnnotation()  
-          .serializeNulls()
-          .create();
-        renderJSON(gson.toJson(requests));
+        renderJSON(fieldTripSummaryWriter.toJson(requests));
     }
 
     /* Receipt Generation */

diff --git a/app/models/fieldtrip/ScheduledFieldTrip.java b/app/models/fieldtrip/ScheduledFieldTrip.java
@@ -21,7 +21,8 @@ public class ScheduledFieldTrip extends GenericModel {
 
     @ManyToOne(optional=false)
     public FieldTripRequest request;
-
+
+    /** 0 for outbound, 1 for inbound */
     @Expose
     public Integer requestOrder;