fix: Changed 7 and 30 day notices so the feedEndDate and suggestedEndDate are different (#2125)

Author: jcpitre

core/src/main/java/org/mobilitydata/gtfsvalidator/type/GtfsDate.java

@@ -35,6 +35,10 @@ public static GtfsDate fromEpochDay(long epochDay) {
     return new GtfsDate(LocalDate.ofEpochDay(epochDay));
   }
 
+  public GtfsDate plusDays(long days) {
+    return new GtfsDate(localDate.plusDays(days));
+  }
+
   /**
    * Parses date from string in {@code YYYYMMDD} format.
    *

core/src/test/java/org/mobilitydata/gtfsvalidator/type/GtfsDateTest.java

@@ -84,4 +84,24 @@ public void toYYYYMMDD() {
     assertThat(GtfsDate.fromString("20210301").toYYYYMMDD()).isEqualTo("20210301");
     assertThat(GtfsDate.fromString("20210301").toString()).isEqualTo("20210301");
   }
+
+  @Test
+  public void plusDays_addsPositiveOffset() {
+    GtfsDate base = GtfsDate.fromString("20260304");
+    // 30 days after 2026-03-04 is 2026-04-03
+    assertThat(base.plusDays(30).toYYYYMMDD()).isEqualTo("20260403");
+  }
+
+  @Test
+  public void plusDays_withZeroDaysReturnsSameDate() {
+    GtfsDate base = GtfsDate.fromString("20260304");
+    assertThat(base.plusDays(0).toYYYYMMDD()).isEqualTo("20260304");
+  }
+
+  @Test
+  public void plusDays_supportsNegativeOffset() {
+    GtfsDate base = GtfsDate.fromString("20260304");
+    // 1 day before 2026-03-04 is 2026-03-03
+    assertThat(base.plusDays(-1).toYYYYMMDD()).isEqualTo("20260303");
+  }
 }

main/src/main/java/org/mobilitydata/gtfsvalidator/validator/FeedExpirationDateValidator.java

@@ -56,11 +56,10 @@ public class FeedExpirationDateValidator extends SingleEntityValidator<GtfsFeedI
   public void validate(GtfsFeedInfo entity, NoticeContainer noticeContainer) {
     if (entity.hasFeedEndDate()) {
       GtfsDate currentDate = GtfsDate.fromLocalDate(dateForValidation.getDate());
-      GtfsDate currentDatePlusSevenDays =
-          GtfsDate.fromLocalDate(dateForValidation.getDate().plusDays(7));
-      GtfsDate currentDatePlusThirtyDays =
-          GtfsDate.fromLocalDate(dateForValidation.getDate().plusDays(30));
-      if (entity.feedEndDate().compareTo(currentDatePlusSevenDays) <= 0) {
+      GtfsDate currentDatePlusSevenDays = currentDate.plusDays(7);
+      GtfsDate currentDatePlusThirtyDays = currentDate.plusDays(30);
+      // Last day of the period is not included for issuing the notice.
+      if (entity.feedEndDate().compareTo(currentDatePlusSevenDays) < 0) {
         noticeContainer.addValidationNotice(
             new FeedExpirationDate7DaysNotice(
                 entity.csvRowNumber(),
@@ -69,7 +68,8 @@ public void validate(GtfsFeedInfo entity, NoticeContainer noticeContainer) {
                 currentDatePlusSevenDays));
         return;
       }
-      if (entity.feedEndDate().compareTo(currentDatePlusThirtyDays) <= 0) {
+      // Last day of the period is not included for issuing the notice.
+      if (entity.feedEndDate().compareTo(currentDatePlusThirtyDays) < 0) {
         noticeContainer.addValidationNotice(
             new FeedExpirationDate30DaysNotice(
                 entity.csvRowNumber(),

main/src/test/java/org/mobilitydata/gtfsvalidator/validator/FeedExpirationDateValidatorTest.java

@@ -31,11 +31,13 @@
 import org.mobilitydata.gtfsvalidator.validator.FeedExpirationDateValidator.FeedExpirationDate7DaysNotice;
 
 public class FeedExpirationDateValidatorTest {
-  private static final LocalDate TEST_NOW = LocalDate.of(2021, 1, 1);
+  // Use a date in later in the month to test the rollover from month to month also.
+  private static final GtfsDate TEST_NOW = GtfsDate.fromLocalDate(LocalDate.of(2021, 1, 25));
 
   private List<ValidationNotice> validateFeedInfo(GtfsFeedInfo feedInfo) {
     NoticeContainer container = new NoticeContainer();
-    new FeedExpirationDateValidator(new DateForValidation(TEST_NOW)).validate(feedInfo, container);
+    new FeedExpirationDateValidator(new DateForValidation(TEST_NOW.getLocalDate()))
+        .validate(feedInfo, container);
     return container.getValidationNotices();
   }
 
@@ -50,52 +52,42 @@ private GtfsFeedInfo createFeedInfo(GtfsDate feedEndDate) {
   }
 
   @Test
-  public void feedExpiringInFiveDaysFromNowShouldGenerateNotice() {
-    assertThat(validateFeedInfo(createFeedInfo(GtfsDate.fromLocalDate(TEST_NOW.plusDays(3)))))
+  public void feedExpiringInSixDaysFromNowShouldGenerate7DaysNotice() {
+    List<ValidationNotice> notices = validateFeedInfo(createFeedInfo(TEST_NOW.plusDays(6)));
+    assertThat(notices)
         .containsExactly(
             new FeedExpirationDate7DaysNotice(
-                1,
-                GtfsDate.fromLocalDate(TEST_NOW),
-                GtfsDate.fromLocalDate(TEST_NOW.plusDays(3)),
-                GtfsDate.fromLocalDate(TEST_NOW.plusDays(7))));
+                1, TEST_NOW, TEST_NOW.plusDays(6), TEST_NOW.plusDays(7)));
   }
 
   @Test
-  public void feedExpiringInSevenDaysFromNowShouldGenerateNotice() {
-    assertThat(validateFeedInfo(createFeedInfo(GtfsDate.fromLocalDate(TEST_NOW.plusDays(7)))))
+  public void feedExpiringInSevenDaysFromNowShouldGenerate30DaysNotice() {
+    List<ValidationNotice> notices = validateFeedInfo(createFeedInfo(TEST_NOW.plusDays(7)));
+    assertThat(notices)
         .containsExactly(
-            new FeedExpirationDate7DaysNotice(
-                1,
-                GtfsDate.fromLocalDate(TEST_NOW),
-                GtfsDate.fromLocalDate(TEST_NOW.plusDays(7)),
-                GtfsDate.fromLocalDate(TEST_NOW.plusDays(7))));
+            new FeedExpirationDate30DaysNotice(
+                1, TEST_NOW, TEST_NOW.plusDays(7), TEST_NOW.plusDays(30)));
   }
 
   @Test
-  public void feedExpiring7to30DaysFromNowShouldGenerateNotice() {
-    assertThat(validateFeedInfo(createFeedInfo(GtfsDate.fromLocalDate(TEST_NOW.plusDays(23)))))
+  public void feedExpiring7to30DaysFromNowShouldGenerate30DaysNotice() {
+    assertThat(validateFeedInfo(createFeedInfo(TEST_NOW.plusDays(29))))
         .containsExactly(
             new FeedExpirationDate30DaysNotice(
-                1,
-                GtfsDate.fromLocalDate(TEST_NOW),
-                GtfsDate.fromLocalDate(TEST_NOW.plusDays(23)),
-                GtfsDate.fromLocalDate(TEST_NOW.plusDays(30))));
+                1, TEST_NOW, TEST_NOW.plusDays(29), TEST_NOW.plusDays(30)));
   }
 
   @Test
-  public void feedExpiring30DaysFromNowShouldGenerateNotice() {
-    assertThat(validateFeedInfo(createFeedInfo(GtfsDate.fromLocalDate(TEST_NOW.plusDays(30)))))
-        .containsExactly(
-            new FeedExpirationDate30DaysNotice(
-                1,
-                GtfsDate.fromLocalDate(TEST_NOW),
-                GtfsDate.fromLocalDate(TEST_NOW.plusDays(30)),
-                GtfsDate.fromLocalDate(TEST_NOW.plusDays(30))));
+  public void feedExpiring30DaysFromNowShouldNotGenerateNotice() {
+    assertThat(validateFeedInfo(createFeedInfo(TEST_NOW.plusDays(30)))).isEmpty();
   }
 
   @Test
-  public void feedExpiringInMoreThan30DaysFromNowShouldNotGenerateNotice() {
-    assertThat(validateFeedInfo(createFeedInfo(GtfsDate.fromLocalDate(TEST_NOW.plusDays(45)))))
-        .isEmpty();
+  public void feedExpiringInThePastShouldGenerate7DaysNotice() {
+    List<ValidationNotice> notices = validateFeedInfo(createFeedInfo(TEST_NOW.plusDays(-1)));
+    assertThat(notices)
+        .containsExactly(
+            new FeedExpirationDate7DaysNotice(
+                1, TEST_NOW, TEST_NOW.plusDays(-1), TEST_NOW.plusDays(7)));
   }
 }