Trip identifier made unique by adding operating day to the end

HSLdevcom · Feb 16, 2024 · e2463ae · e2463ae
1 parent e215fe8
commit e2463ae
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 5 deletions.
diff --git a/src/main/java/fi/hsl/transitdata/cancellation/util/TripUtils.java b/src/main/java/fi/hsl/transitdata/cancellation/util/TripUtils.java
@@ -118,7 +118,7 @@ public static List<InternalMessages.TripInfo> getTripInfos(
         return removeDuplicates(filteredTripInfos);
     }
 
-    static String getTripId(String originalTripId) {
+    static String getTripId(String originalTripId, String operatingDay) {
         String modifiedTripId;
 
         if (originalTripId.contains("Ma")) {
@@ -139,7 +139,7 @@ static String getTripId(String originalTripId) {
             modifiedTripId = originalTripId;
         }
 
-        return modifiedTripId;
+        return modifiedTripId + "_" + operatingDay;
     }
 
     private static List<InternalMessages.TripInfo> removeDuplicates(List<InternalMessages.TripInfo> trips) {
@@ -159,7 +159,7 @@ private static List<InternalMessages.TripInfo> removeDuplicates(List<InternalMes
         for (InternalMessages.TripInfo trip : tripsNoDuplicates) {
             InternalMessages.TripInfo.Builder builder = InternalMessages.TripInfo.newBuilder();
             builder.setRouteId(trip.getRouteId());
-            builder.setTripId(getTripId(trip.getTripId()));
+            builder.setTripId(getTripId(trip.getTripId(), trip.getOperatingDay()));
             builder.setOperatingDay(trip.getOperatingDay());
             builder.setStartTime(trip.getStartTime());
             builder.setDirectionId(trip.getDirectionId());

diff --git a/src/test/java/fi/hsl/transitdata/cancellation/util/TripUtilsTest.java b/src/test/java/fi/hsl/transitdata/cancellation/util/TripUtilsTest.java
@@ -102,10 +102,50 @@ public void testFilterTripInfosAfterMidnight() {
         assertFalse(outputTripIds.contains("HSL:1079_20240104_Su_1_2422"));
     }
 
+    @Test
+    public void testFilterTripInfosAfterManyDays() {
+        LocalDateTime validFrom = TimeUtilsTest.getTestDate("2024-01-02 08:57:00");
+        LocalDateTime validTo = TimeUtilsTest.getTestDate("2024-01-04 17:30:45");
+
+        List<InternalMessages.TripInfo> inputTrips = new ArrayList<>();
+        // before
+        inputTrips.add(TripUtilsTest.createTripInfo("HSL:1079", "HSL:1079_20240226_MaTiKeToPe_1_2420_20240101", "20240101", "2420", 1));
+        inputTrips.add(TripUtilsTest.createTripInfo("HSL:4611", "HSL:4611_20240226_MaTiKeToPe_2_0855_20240102", "20240102", "0855", 1));
+        inputTrips.add(TripUtilsTest.createTripInfo("HSL:1079", "HSL:1079_20240226_MaTiKeToPe_1_0734_20240102", "20240102", "0734", 2));
+        // inside
+        inputTrips.add(TripUtilsTest.createTripInfo("HSL:4611", "HSL:4611_20240226_MaTiKeToPe_2_0900_20240102", "20240102", "0900", 1));
+        inputTrips.add(TripUtilsTest.createTripInfo("HSL:1079", "HSL:1079_20240226_MaTiKeToPe_2_1100_20240102", "20240102", "1100", 1));
+        inputTrips.add(TripUtilsTest.createTripInfo("HSL:4611", "HSL:4611_20240226_MaTiKeToPe_2_0900_20240103", "20240103", "0900", 1));
+        inputTrips.add(TripUtilsTest.createTripInfo("HSL:1079", "HSL:1079_20240226_MaTiKeToPe_2_1100_20240103", "20240103", "1100", 1));
+
+        // after
+        inputTrips.add(TripUtilsTest.createTripInfo("HSL:4611", "HSL:4611_20240226_MaTiKeToPe_2_1731_20240104", "20240104", "1731", 1));
+        inputTrips.add(TripUtilsTest.createTripInfo("HSL:1079", "HSL:1079_20240226_MaTiKeToPe_1_1950_20240104", "20240104", "1950", 2));
+        inputTrips.add(TripUtilsTest.createTripInfo("HSL:1079", "HSL:1079_20240226_MaTiKeToPe_1_2422_20240104", "20240104", "2422", 2));
+
+        List<InternalMessages.TripInfo> outputTrips = TripUtils.filterTripInfos(inputTrips, validFrom, validTo);
+        Set<String> outputTripIds = outputTrips.stream().map(trip -> trip.getTripId()).collect(Collectors.toSet());
+
+        assertEquals(4, outputTrips.size());
+        assertEquals(4, outputTripIds.size());
+        assertFalse(outputTripIds.contains("HSL:1079_20240226_MaTiKeToPe_1_2420_20240101"));
+        assertFalse(outputTripIds.contains("HSL:4611_20240226_MaTiKeToPe_2_0855_20240102"));
+        assertFalse(outputTripIds.contains("HSL:1079_20240226_MaTiKeToPe_1_0734_20240102"));
+
+        assertTrue(outputTripIds.contains("HSL:4611_20240226_MaTiKeToPe_2_0900_20240102"));
+        assertTrue(outputTripIds.contains("HSL:1079_20240226_MaTiKeToPe_2_1100_20240102"));
+        assertTrue(outputTripIds.contains("HSL:4611_20240226_MaTiKeToPe_2_0900_20240103"));
+        assertTrue(outputTripIds.contains("HSL:1079_20240226_MaTiKeToPe_2_1100_20240103"));
+
+        assertFalse(outputTripIds.contains("HSL:4611_20240226_MaTiKeToPe_2_1731_20240104"));
+        assertFalse(outputTripIds.contains("HSL:1079_20240226_MaTiKeToPe_1_1950_20240104"));
+        assertFalse(outputTripIds.contains("HSL:1079_20240226_MaTiKeToPe_1_2422_20240104"));
+    }
+
     @Test
     public void testGetTripId() {
-        assertEquals("HSL:1071_20240126_MaTiKeToPe_2_1305", TripUtils.getTripId("HSL:1071_20240126_Ke_2_1305"));
-        assertEquals("HSL:1071_20240126_LaSu_2_2307", TripUtils.getTripId("HSL:1071_20240126_La_2_2307"));
+        assertEquals("HSL:1071_20240126_MaTiKeToPe_2_1305_20240215", TripUtils.getTripId("HSL:1071_20240126_Ke_2_1305", "20240215"));
+        assertEquals("HSL:1071_20240126_LaSu_2_2307_20240215", TripUtils.getTripId("HSL:1071_20240126_La_2_2307", "20240215"));
     }
 
     public static InternalMessages.TripInfo createTripInfo(