fix(MergeLineContext): Process GTFS+ timepoints table using logic og trips table.

Author: binh-dam-ibigroup

src/main/java/com/conveyal/datatools/manager/jobs/feedmerge/MergeLineContext.java

@@ -95,6 +95,8 @@ public static MergeLineContext create(MergeFeedsJob job, Table table, ZipOutputS
             case "stops":
                 return new StopsMergeLineContext(job, table, out);
             case "trips":
+            case "timepoints":
+                // Use same merge logic to filter out trips in both tables.
                 return new TripsMergeLineContext(job, table, out);
             default:
                 return new MergeLineContext(job, table, out);

src/test/java/com/conveyal/datatools/manager/jobs/MergeFeedsJobTest.java

@@ -3,6 +3,7 @@
 import com.conveyal.datatools.DatatoolsTest;
 import com.conveyal.datatools.UnitTest;
 import com.conveyal.datatools.manager.auth.Auth0UserProfile;
+import com.conveyal.datatools.manager.gtfsplus.GtfsPlusValidation;
 import com.conveyal.datatools.manager.jobs.feedmerge.MergeFeedsType;
 import com.conveyal.datatools.manager.jobs.feedmerge.MergeStrategy;
 import com.conveyal.datatools.manager.models.FeedSource;
@@ -421,7 +422,7 @@ void mergeMTCShouldHandleMatchingTripIdsWithSameSignature() throws SQLException
      * {@link MergeStrategy#CHECK_STOP_TIMES} strategy correctly and drop unused future service ids.
      */
     @Test
-    void mergeMTCShouldHandleMatchingTripIdsAndDropUnusedFutureCalendar() throws SQLException {
+    void mergeMTCShouldHandleMatchingTripIdsAndDropUnusedFutureCalendar() throws Exception {
         Set<FeedVersion> versions = new HashSet<>();
         versions.add(fakeTransitBase);
         versions.add(fakeTransitSameSignatureTrips2);
@@ -458,13 +459,25 @@ void mergeMTCShouldHandleMatchingTripIdsAndDropUnusedFutureCalendar() throws SQL
         // The calendar_dates entry should be preserved, but remapped to a different id.
         assertRowCountInTable(mergedNamespace, "calendar_dates", 1);
 
-        // The GTFS+ calendar_attributes table should contain the same number of entries as the calendar table.
+        // The GTFS+ calendar_attributes table should contain the same number of entries as the calendar table
+        // (reported by MTC).
         assertEquals(
             3,
             mergeFeedsJob.mergeFeedsResult.linesPerTable.get("calendar_attributes").intValue(),
             "Merged calendar_dates table count should equal expected value."
         );
 
+        // The GTFS+ timepoints table should not contain any trip ids not in the trips table
+        // (reported by MTC).
+        GtfsPlusValidation validation = GtfsPlusValidation.validate(mergeFeedsJob.mergedVersion.id);
+        assertEquals(
+            0L,
+            validation.issues.stream().filter(
+                issue -> issue.tableId.equals("timepoints") && issue.fieldName.equals("trip_id")
+            ).count(),
+            "There should not be trip_id issues in the GTFS+ timepoints table."
+        );
+
         assertNoUnusedServiceIds(mergedNamespace);
         assertNoRefIntegrityErrors(mergedNamespace);
     }

src/test/resources/com/conveyal/datatools/gtfs/merge-data-added-trips-2/stop_times.txt

@@ -1,7 +1,5 @@
 trip_id,arrival_time,departure_time,stop_id,stop_sequence,stop_headsign,pickup_type,drop_off_type,shape_dist_traveled,timepoint
 trip3,07:00:00,07:00:00,4u6g,1,,0,0,0.0000000,
 trip3,07:01:00,07:01:00,johv,2,,0,0,341.4491961,
-only-calendar-trip1,07:00:00,07:00:00,4u6g,1,,0,0,0.0000000,
-only-calendar-trip1,07:01:00,07:01:00,johv,2,,0,0,341.4491961,
 only-calendar-trip2,07:00:00,07:00:00,johv,1,,0,0,0.0000000,
 only-calendar-trip2,07:01:00,07:01:00,4u6g,2,,0,0,341.4491961,

src/test/resources/com/conveyal/datatools/gtfs/merge-data-added-trips-2/timepoints.txt

@@ -0,0 +1,5 @@
+trip_id,stop_id
+trip3,4u6g
+trip3,johv
+only-calendar-trip2,johv
+only-calendar-trip2,4u6g

src/test/resources/com/conveyal/datatools/gtfs/merge-data-base/timepoints.txt

@@ -0,0 +1,5 @@
+trip_id,stop_id
+only-calendar-trip1,4u6g
+only-calendar-trip1,johv
+only-calendar-trip2,johv
+only-calendar-trip2,4u6g