Replace feed_expiration_date with rules for 7 and 30 days #1245
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -34,7 +34,8 @@ | |
| * <p>Generated notice: | ||
| * | ||
| * <ul> | ||
| * <li>{@link FeedExpirationDate7DaysNotice} | ||
| * <li>{@link FeedExpirationDate30DaysNotice} | ||
| * </ul> | ||
| */ | ||
| @GtfsValidator | ||
|
|
@@ -53,9 +54,9 @@ public void validate(GtfsFeedInfo entity, NoticeContainer noticeContainer) { | |
| GtfsDate currentDate = GtfsDate.fromLocalDate(now); | ||
| GtfsDate currentDatePlusSevenDays = GtfsDate.fromLocalDate(now.plusDays(7)); | ||
| GtfsDate currentDatePlusThirtyDays = GtfsDate.fromLocalDate(now.plusDays(30)); | ||
| if (entity.feedEndDate().compareTo(currentDatePlusSevenDays) <= 0) { | ||
| noticeContainer.addValidationNotice( | ||
| new FeedExpirationDate7DaysNotice( | ||
| entity.csvRowNumber(), | ||
| currentDate, | ||
| entity.feedEndDate(), | ||
|
|
@@ -64,7 +65,7 @@ public void validate(GtfsFeedInfo entity, NoticeContainer noticeContainer) { | |
| } | ||
| if (entity.feedEndDate().compareTo(currentDatePlusThirtyDays) <= 0) { | ||
| noticeContainer.addValidationNotice( | ||
| new FeedExpirationDate30DaysNotice( | ||
| entity.csvRowNumber(), | ||
| currentDate, | ||
| entity.feedEndDate(), | ||
|
|
@@ -73,13 +74,32 @@ public void validate(GtfsFeedInfo entity, NoticeContainer noticeContainer) { | |
| } | ||
| } | ||
|
|
||
| static class FeedExpirationDate7DaysNotice extends ValidationNotice { | ||
| private final long csvRowNumber; | ||
| private final GtfsDate currentDate; | ||
| private final GtfsDate feedEndDate; | ||
| private final GtfsDate suggestedExpirationDate; | ||
|
|
||
| FeedExpirationDate7DaysNotice( | ||
| long csvRowNumber, | ||
| GtfsDate currentDate, | ||
| GtfsDate feedEndDate, | ||
| GtfsDate suggestedExpirationDate) { | ||
| super(SeverityLevel.WARNING); | ||
| this.csvRowNumber = csvRowNumber; | ||
| this.currentDate = currentDate; | ||
| this.feedEndDate = feedEndDate; | ||
| this.suggestedExpirationDate = suggestedExpirationDate; | ||
|
There was a problem hiding this comment. Do we need to specify a suggested expiration date here? The real suggestion is for as long as the operator is confident that the schedule will continue to be operated, as per the Best Practices. There was a problem hiding this comment. Maybe we don't need it, but if you look at the original |
||
| } | ||
| } | ||
|
|
||
| static class FeedExpirationDate30DaysNotice extends ValidationNotice { | ||
| private final long csvRowNumber; | ||
| private final GtfsDate currentDate; | ||
| private final GtfsDate feedEndDate; | ||
| private final GtfsDate suggestedExpirationDate; | ||
|
|
||
| FeedExpirationDate30DaysNotice( | ||
| long csvRowNumber, | ||
| GtfsDate currentDate, | ||
| GtfsDate feedEndDate, | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this table doesn't render, I think we need a line break after "Notice fields description".