Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Flex merge feeds #573

Merged
merged 16 commits into from
Feb 8, 2024
Merged

Flex merge feeds #573

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
d5b3436
refactor(Initial work to merge flex feeds):
br648 Oct 24, 2023
66a9b42
refactor(Fixed merge conflict): Merged dev-flex into branch
br648 Oct 25, 2023
42fa3a1
refactor(Added geojson merging):
br648 Nov 3, 2023
93c3a3a
refactor(Corrected gtfs-lib reference):
br648 Nov 6, 2023
c809e83
refactor(Updated location merging and removed flex items from stop ti…
br648 Nov 7, 2023
d619b10
refactor(pom.xml): Removed commented out dependency
br648 Nov 7, 2023
518dcbe
refactor(Restored full flex feed files and bumped gtfs-lib version):
br648 Nov 8, 2023
c13559d
refactor(ExportSnapshotToGTFSJob.java): Temp fix for call to JdbcGtfs…
br648 Nov 8, 2023
80fd154
Merge branch 'dev-flex' into flex-merge-feeds
br648 Nov 14, 2023
2f93558
refactor(Fixed merge conflicts): Fixed conflicts with merging dev-fle…
br648 Nov 17, 2023
52b194f
refactor(Updates around foreign ref checks):
br648 Nov 20, 2023
75ad524
chore(Updated GTFS-lib reference to point at the new ibi group repo):
br648 Nov 22, 2023
3a5263f
refactor(Addressed PR feedback): Tidied up unit test
br648 Nov 29, 2023
9f4a338
refactor(Updated unit test and required test data):
br648 Nov 30, 2023
f27fa2e
Merge branch 'dev' into flex-merge-feeds
miles-grant-ibigroup Feb 7, 2024
ac17bc2
refactor(Fixed merge conflicts):
br648 Feb 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 24 additions & 20 deletions src/test/java/com/conveyal/datatools/manager/jobs/FlexMergeFeedsJobTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,24 +96,24 @@ void canMergeRegional() throws SQLException {
FeedLoadResult merged = mergedVersion.feedLoadResult;

// Ensure the feed has the row counts we expect.
assertRowCount(r1.agency, r2.agency, merged.agency, "Agency count for merged feed should equal sum of agency for versions merged.");
assertRowCount(r1.area, r2.area, merged.area, "Area count for merged feed should equal sum of area for versions merged.");
assertRowCount(r1.attributions, r2.attributions, merged.attributions, "Attributions count for merged feed should equal sum of attributions for versions merged.");
assertRowCount(r1.bookingRules, r2.bookingRules, merged.bookingRules, "Booking rules count for merged feed should equal sum of booking rules for versions merged.");
assertRowCount(r1.calendar, r2.calendar, merged.calendar, "Calendar count for merged feed should equal sum of calendar for versions merged.");
assertRowCount(r1.calendarDates, r2.calendarDates, merged.calendarDates, "Calendar dates count for merged feed should equal sum of calendar dates for versions merged.");
assertRowCount(r1.fareAttributes, r2.fareAttributes, merged.fareAttributes, "Fare attributes count for merged feed should equal sum of fare attributes for versions merged.");
assertRowCount(r1.fareRules, r2.fareRules, merged.fareRules, "Fare rules count for merged feed should equal sum of fare rules for versions merged.");
assertRowCount(r1.frequencies, r2.frequencies, merged.frequencies, "Frequencies count for merged feed should equal sum of frequencies for versions merged.");
assertRowCount(r1.locations, r2.locations, merged.locations, "Locations count for merged feed should equal sum of locations for versions merged.");
assertRowCount(r1.locationShapes, r2.locationShapes, merged.locationShapes, "Location shapes count for merged feed should equal sum of location shapes for versions merged.");
assertRowCount(r1.routes, r2.routes, merged.routes, "Routes count for merged feed should equal sum of routes for versions merged.");
assertRowCount(r1.shapes, r2.shapes, merged.shapes, "Shapes count for merged feed should equal sum of shapes for versions merged.");
assertRowCount(r1.stops, r2.stops, merged.stops, "Stops count for merged feed should equal sum of stops for versions merged.");
assertRowCount(r1.stopAreas, r2.stopAreas, merged.stopAreas, "Stop areas count for merged feed should equal sum of stop areas for versions merged.");
assertRowCount(r1.stopTimes, r2.stopTimes, merged.stopTimes, "Stop times count for merged feed should equal sum of stopTimes for versions merged.");
assertRowCount(r1.trips, r2.trips, merged.trips, "Trips count for merged feed should equal sum of trips for versions merged.");
assertRowCount(r1.translations, r2.translations, merged.translations, "Translations count for merged feed should equal sum of translations for versions merged.");
assertRowCount(r1.agency, r2.agency, merged.agency, "Agency");
br648 marked this conversation as resolved.
Show resolved Hide resolved
assertRowCount(r1.area, r2.area, merged.area, "Area");
assertRowCount(r1.attributions, r2.attributions, merged.attributions, "Attributions");
assertRowCount(r1.bookingRules, r2.bookingRules, merged.bookingRules, "Booking rules");
assertRowCount(r1.calendar, r2.calendar, merged.calendar, "Calendar");
assertRowCount(r1.calendarDates, r2.calendarDates, merged.calendarDates, "Calendar dates");
assertRowCount(r1.fareAttributes, r2.fareAttributes, merged.fareAttributes, "Fare attributes");
assertRowCount(r1.fareRules, r2.fareRules, merged.fareRules, "Fare rules");
assertRowCount(r1.frequencies, r2.frequencies, merged.frequencies, "Frequencies");
assertRowCount(r1.locations, r2.locations, merged.locations, "Locations");
assertRowCount(r1.locationShapes, r2.locationShapes, merged.locationShapes, "Location shapes");
assertRowCount(r1.routes, r2.routes, merged.routes, "Routes");
assertRowCount(r1.shapes, r2.shapes, merged.shapes, "Shapes");
assertRowCount(r1.stops, r2.stops, merged.stops, "Stops");
assertRowCount(r1.stopAreas, r2.stopAreas, merged.stopAreas, "Stop areas");
assertRowCount(r1.stopTimes, r2.stopTimes, merged.stopTimes, "Stop times");
assertRowCount(r1.trips, r2.trips, merged.trips, "Trips");
assertRowCount(r1.translations, r2.translations, merged.translations, "Translations");

// Ensure there are no referential integrity errors, duplicate ID, or wrong number of fields errors.
assertThatFeedHasNoErrorsOfType(
Expand All @@ -138,7 +138,11 @@ private FeedVersion regionallyMergeVersions(Set<FeedVersion> versions) {
/**
* Helper method to confirm that the sum of the two feed table rows match the merged feed table rows.
*/
private void assertRowCount(TableLoadResult feedOne, TableLoadResult feedTwo, TableLoadResult feedMerged, String message) {
assertEquals(feedOne.rowCount + feedTwo.rowCount, feedMerged.rowCount, message);
private void assertRowCount(TableLoadResult feedOne, TableLoadResult feedTwo, TableLoadResult feedMerged, String entity) {
assertEquals(
feedOne.rowCount + feedTwo.rowCount,
feedMerged.rowCount,
String.format("%s count for merged feed should equal the sum for the versions merged.", entity)
);
}
}
2 changes: 1 addition & 1 deletion ...st/resources/com/conveyal/datatools/gtfs/fake-agency-with-flex-version-1/translations.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
table_name,field_name,language,translation,record_id,record_sub_id,field_value
stops,stop_desc,FR,en direction du nord,4u6g,,
stops,stop_desc,FR,Direction nord,4u6g,,
2 changes: 1 addition & 1 deletion ...st/resources/com/conveyal/datatools/gtfs/fake-agency-with-flex-version-2/translations.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
table_name,field_name,language,translation,record_id,record_sub_id,field_value
stops,stop_desc,FR,en direction du nord,4u6g,,
stops,stop_desc,FR,Direction nord,4u6g,,
Loading