save and refresh changes from the DB.

5Tsrl · Nov 3, 2014 · 26be34d · 26be34d
1 parent 4947f06
commit 26be34d
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/app/models/transit/Trip.java b/app/models/transit/Trip.java
@@ -59,6 +59,7 @@ public class Trip extends Model {
     public Integer endTime;
 
     public Integer headway;
+    public Boolean invalid;
 
 
     public static BigInteger nativeInsert(EntityManager em, org.onebusaway.gtfs.model.Trip gtfsTrip, BigInteger routeId, BigInteger shapeId, BigInteger serviceCalendarId, BigInteger serviceCalendarDateId)

diff --git a/app/models/transit/TripPattern.java b/app/models/transit/TripPattern.java
@@ -395,11 +395,19 @@ else if (newStopIds[firstDifferentIndex] == originalStopIds[lastDifferentIndex])
 
                 TripPatternStop current;
 
+                // record if there were stop times
+                // if there were, invalidate the trip. 
+                boolean hadStopTimes = false;
+
                 for (StopTime st : stopTimes) {
+                    if (st.arrivalTime != null || st.departureTime != null)
+                        hadStopTimes = true;
+
                     if (st.stop.id.equals(movedStopId) && st.stopSequence.equals(movedStopSeq)) {
                         // we are dealing with the moved stop
                         st.stopSequence = newStopSeq;
-                        StopTime.em().merge(st).save();
+                        StopTime updated = StopTime.em().merge(st);
+                        updated.save();
                     }
 
                     else {
@@ -412,9 +420,17 @@ else if (newStopIds[firstDifferentIndex] == originalStopIds[lastDifferentIndex])
                             current = psi.next();
 
                         st.stopSequence = current.stopSequence;
-                        StopTime.em().merge(st).save();
+                        StopTime updated = StopTime.em().merge(st);
+                        updated.save();
                     }
                 }
+
+                if (hadStopTimes) {
+                    trip.invalid = true;
+                    trip.save();
+                }
+
+                trip.refresh();
             }                
         }