Merge remote-tracking branch 'origin/issue-6475-quick-fix' into dev-2.x

Author: optionsome

application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/StoptimeImpl.java

@@ -85,7 +85,10 @@ public DataFetcher<Integer> stopPositionInPattern() {
 
   @Override
   public DataFetcher<Long> serviceDay() {
-    return environment -> getSource(environment).getServiceDayMidnight();
+    return environment -> {
+      Long midnight = getSource(environment).getServiceDayMidnight();
+      return midnight != TripTimeOnDate.UNDEFINED ? midnight : null;
+    };
   }
 
   @Override

application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/TripImpl.java

@@ -252,6 +252,12 @@ public DataFetcher<Iterable<TripTimeOnDate>> stoptimes() {
       getTransitService(environment).getScheduledTripTimes(getSource(environment)).orElse(null);
   }
 
+  /**
+   * If stoptimesForDate does not have a parameter, and the trip does not run today, we will
+   * still return a list of TripTimeOnDates, the same list as bare stoptimes() would return.
+   * This is illogical, but existing UIs depend on this longstanding behavior.
+   * @return
+   */
   @Override
   public DataFetcher<Iterable<TripTimeOnDate>> stoptimesForDate() {
     return environment -> {
@@ -260,11 +266,12 @@ public DataFetcher<Iterable<TripTimeOnDate>> stoptimesForDate() {
       var args = new GraphQLTypes.GraphQLTripStoptimesForDateArgs(environment.getArguments());
 
       ZoneId timeZone = transitService.getTimeZone();
-      LocalDate serviceDate = args.getGraphQLServiceDate() != null
-        ? ServiceDateUtils.parseString(args.getGraphQLServiceDate())
-        : LocalDate.now(timeZone);
-
-      return transitService.getTripTimeOnDates(trip, serviceDate).orElse(null);
+      if (args.getGraphQLServiceDate() != null) {
+        LocalDate serviceDate = ServiceDateUtils.parseString(args.getGraphQLServiceDate());
+        return transitService.getTripTimeOnDates(trip, serviceDate).orElse(null);
+      } else {
+        return transitService.getTripTimeOnDates(trip, LocalDate.now(timeZone), true).orElse(null);
+      }
     };
   }
 

application/src/main/java/org/opentripplanner/transit/service/DefaultTransitService.java

@@ -117,18 +117,28 @@ public Optional<List<TripTimeOnDate>> getScheduledTripTimes(Trip trip) {
   }
 
   @Override
-  public Optional<List<TripTimeOnDate>> getTripTimeOnDates(Trip trip, LocalDate serviceDate) {
+  public Optional<List<TripTimeOnDate>> getTripTimeOnDates(
+    Trip trip,
+    LocalDate serviceDate,
+    boolean useScheduledWhenNonRunning
+  ) {
     TripPattern pattern = findPattern(trip, serviceDate);
 
     Timetable timetable = findTimetable(pattern, serviceDate);
 
     // This check is made here to avoid changing TripTimeOnDate.fromTripTimes
     TripTimes times = timetable.getTripTimes(trip);
-    if (
-      times == null ||
-      !this.getServiceCodesRunningForDate(serviceDate).contains(times.getServiceCode())
-    ) {
+    if (times == null) {
       return Optional.empty();
+    } else if (!this.getServiceCodesRunningForDate(serviceDate).contains(times.getServiceCode())) {
+      if (useScheduledWhenNonRunning) {
+        // Technically not returning empty here is incorrect, you should use getScheduledTripTimes
+        // above instead if you want this, but it has been the behavior for a very long time, and
+        // at least one longstanding front end will fail without this.
+        return Optional.ofNullable(TripTimeOnDate.fromTripTimes(timetable, trip));
+      } else {
+        return Optional.empty();
+      }
     } else {
       Instant midnight = ServiceDateUtils.asStartOfService(
         serviceDate,
@@ -138,6 +148,11 @@ public Optional<List<TripTimeOnDate>> getTripTimeOnDates(Trip trip, LocalDate se
     }
   }
 
+  @Override
+  public Optional<List<TripTimeOnDate>> getTripTimeOnDates(Trip trip, LocalDate serviceDate) {
+    return getTripTimeOnDates(trip, serviceDate, false);
+  }
+
   @Override
   public Collection<String> listFeedIds() {
     return this.timetableRepository.getFeedIds();

application/src/main/java/org/opentripplanner/transit/service/TransitService.java

@@ -73,6 +73,17 @@ public interface TransitService {
    */
   Optional<List<TripTimeOnDate>> getScheduledTripTimes(Trip trip);
 
+  /**
+   * @return if the trip doesn't run on the date specified, return schedule if
+   * useScheduledWhenNonRunning is true, empty otherwise. Logically this is confusing,
+   * but existing UIs depend on this.
+   */
+  Optional<List<TripTimeOnDate>> getTripTimeOnDates(
+    Trip trip,
+    LocalDate serviceDate,
+    boolean useScheduledWhenNonRunning
+  );
+
   /**
    * @return empty if the trip doesn't run on the date specified
    */

application/src/test/java/org/opentripplanner/transit/service/DefaultTransitServiceTest.java

@@ -241,6 +241,24 @@ void getRealtimeTripTimes() {
     );
   }
 
+  @Test
+  void getTripTimesOnNoServiceDayWithUseScheduleOption() {
+    Instant midnight = ServiceDateUtils.asStartOfService(
+      SERVICE_DATE,
+      service.getTimeZone()
+    ).toInstant();
+
+    assertEquals(
+      Optional.of(
+        List.of(
+          new TripTimeOnDate(REALTIME_TRIP_TIMES, 0, REAL_TIME_PATTERN, SERVICE_DATE, midnight),
+          new TripTimeOnDate(REALTIME_TRIP_TIMES, 1, REAL_TIME_PATTERN, SERVICE_DATE, midnight)
+        )
+      ),
+      service.getTripTimeOnDates(TRIP, SERVICE_DATE, true)
+    );
+  }
+
   @Test
   void getTripTimesOnNoServiceDay() {
     assertEquals(Optional.empty(), service.getTripTimeOnDates(TRIP, NO_SERVICE_DATE));