Fares V2 by br648 · Pull Request #8 · ibi-group/gtfs-lib

br648 · 2024-08-19T12:09:06Z

Checklist

Appropriate branch selected (all PRs must first be merged to dev before they can be merged to master)
Any modified or new methods or classes have helpful JavaDoc and code is thoroughly commented
The description lists all applicable issues this PR seeks to resolve
The description lists any configuration setting(s) that differ from the default settings
All tests and CI builds passing

Description

Update to include fares v2 based on design:

https://docs.google.com/document/d/1EBMoxfXscPhFWyrn4fyGR6foQ7JGBWvMWeodrvo7DPw/edit

Replaced endsWith with equals to avoid unwanted matches e.g. stop_areas.txt being used instead of areas.txt

… generic unit tests which uses

…ator with OS derived reference Test should now work on Linux

…atch what will be provided):

… and included id

…entities will be returned

… the route network table The route id is unique to the route table has well. This prevents duplicate key failures

… export to separate files

… test to include stop area ids

… a sub directory

…code character

…cations to check subdirectories

Merge stop areas into stops

…fare leg join rule and rider ca

Updated all classes to include new param as well as unit tests

…d argument This was removed by mistake

miles-grant-ibigroup

So much boilerplate wow... this looks really good! Just 2 small things

… child entities

…r ASCII char

miles-grant-ibigroup

This looks great! Because of the scope of these changes I couldn't review as carefully as I could for a smaller PR, but everything seems to work well and the changes look clean

binh-dam-ibigroup

First round of comments just from reading some of the files. More to come.

binh-dam-ibigroup

Just a few refactor requests for now, and I still need to run the code with the other stuff,
mainly split CsvReaderUtil.getCsvReaderFromMergedFiles, inling a few return, and cleaning up dead code. The other suggestions and comment additions would be nice to have.

binh-dam-ibigroup · 2026-04-20T17:16:21Z

+            /*
+              Check referential integrity without storing references.
+             */
+            getRefField(AREA_ID_NAME, true, feed.areas);


What happens here if the referential integrity fails?

A ReferentialIntegrityError is flagged. Processing is not halted.

…f array

binh-dam-ibigroup · 2026-04-22T21:59:29Z

@@ -84,107 +78,146 @@ void canDoRoundTripLoadAndWriteToZipFile() throws IOException {
        feed.toFile(outZip.getAbsolutePath());
        feed.close();
        assertTrue(outZip.exists());
-
-        // assert that rows of data were written to files within the zipfile
        ZipFile zip = new ZipFile(outZip);


Move this code to the actual test.

binh-dam-ibigroup · 2026-04-22T22:03:42Z

+     */
+    @ParameterizedTest(name = "{1}")
+    @MethodSource("createFileTestCases")
+    void canDoRoundTripLoadAndWriteToZipFile(ZipFile zip, TestUtils.FileTestCase fileTestCase) throws IOException {


Remove the zip parameter, and move the creation of the zip file in this function.

binh-dam-ibigroup · 2026-04-22T22:04:28Z

+
+        @Override
+        public String toString() {
+            return "FileTestCase{" +


Use String.format.

binh-dam-ibigroup

One more small change in the tests, then I will approve. The other changes seem fine and appear to work with datatools-server.

br648 added 30 commits August 15, 2024 13:14

refactor(Initial fares v2 work):

07ecda4

refactor(GTFSTest): Addressed failing test

1d57cd6

refactor(Various new tests):

208ea3c

refactor(Entity.java): Updated zip sub directory file name check

5f0c806

Replaced endsWith with equals to avoid unwanted matches e.g. stop_areas.txt being used instead of areas.txt

refactor(Updated to extract the file name from path):

5dd609b

refactor(Refactored GraphQL classes to accom fares v2):

1d82b21

refactor(Update to include network_id in the route GraphQL obj):

1d95cf5

Merge branch 'dev' into feature/DT-448-fares-v2

3faaa1e

refactor(Replaced camel case with snake case for GrpahQL objs):

fbf5282

improvement(Added JDBC table writer tests for fares v2 entities): New…

7d41e00

… generic unit tests which uses

fix(JDBCTableWriterFaresV2Test.java): Replaced Windows new line separ…

62a7ed2

…ator with OS derived reference Test should now work on Linux

improvement(GTFSFaresV2Test): Removed superceded JDBC table writer tests

a2db1a7

improvement(Removed the id param from the create entities to closer m…

e96e834

…atch what will be provided):

improvement(Altered GraphQL test data): Similified fare product query…

2390130

… and included id

improvement(Removed child entities from GraphQL schema): Only parent …

2c256c9

…entities will be returned

improvement(Table.java): Reinstated key field is not unique check for…

518fcc2

… the route network table The route id is unique to the route table has well. This prevents duplicate key failures

Merge branch 'dev' into feature/DT-448-fares-v2

1cac512

feat(Merging stop areas into stops): import stop areas into stops and…

731dcf0

… export to separate files

improvement(A few minor changes with comments):

a3481b0

improvement(GraphQL updates): Removed stop areas. Added fares v2 stop…

2b1302c

… test to include stop area ids

improvement(Entry in zip subdirecotry): Allow for stop areas being in…

00b9d65

… a sub directory

improvement(Stop.java): Updated stop areas separator to a special uni…

dd97252

…code character

improvement(Stop.java): Corrected separator char

6117108

improvement(Checking for files in zip subdirectories): Updated all lo…

f3ef2c4

…cations to check subdirectories

improvement(Exporting): Added the functionality to export stop areas

8353334

improvement(Addressed PR feedback):

7299ed4

improvement(Stop export): Remove stop areas from stop export

9436984

improvement(Entity.java): Reinstated space

ff93df6

improvement(Addressed PR feedback): Streamlined writting to zip

77e3b61

Merge pull request #15 from ibi-group/merge-stop-areas

c3ba52d

Merge stop areas into stops

br648 added 3 commits January 19, 2026 10:53

improvement(Added new fares v2 entities): Various updates to include …

edd6f13

…fare leg join rule and rider ca

improvement(Fare product update): Added rider caegory id to fare product

b4c71b4

Updated all classes to include new param as well as unit tests

improvement(GraphQLGtfsSchema.java): Added back the missing pattern_i…

83acd50

…d argument This was removed by mistake

br648 assigned miles-grant-ibigroup Mar 30, 2026

br648 requested a review from miles-grant-ibigroup March 30, 2026 15:55

miles-grant-ibigroup requested changes Apr 14, 2026

View reviewed changes

Comment thread src/main/java/com/conveyal/gtfs/loader/Table.java

Comment thread src/main/java/com/conveyal/gtfs/model/Entity.java Outdated

Comment thread src/main/java/com/conveyal/gtfs/model/Entity.java

Comment thread src/main/java/com/conveyal/gtfs/util/CsvReaderUtil.java

miles-grant-ibigroup assigned br648 and unassigned miles-grant-ibigroup Apr 14, 2026

br648 added 2 commits April 15, 2026 08:41

improvement(CsvReaderUtil.java): Combined stop and route merging with…

a4a0ac3

… child entities

improvement(Entity.java): Replaced the separator with record separato…

a408dc2

…r ASCII char

br648 requested a review from miles-grant-ibigroup April 15, 2026 09:23

br648 assigned miles-grant-ibigroup and unassigned br648 Apr 15, 2026

miles-grant-ibigroup approved these changes Apr 15, 2026

View reviewed changes

miles-grant-ibigroup assigned br648 and unassigned miles-grant-ibigroup Apr 15, 2026

br648 assigned binh-dam-ibigroup and unassigned br648 Apr 16, 2026

binh-dam-ibigroup reviewed Apr 16, 2026

View reviewed changes

binh-dam-ibigroup requested changes Apr 20, 2026

View reviewed changes

br648 added 2 commits April 21, 2026 14:59

improvement(Addressed PR feedback across many classes):

5444da3

improvement(Parameterized test): Updated test to use params instead o…

a54a737

…f array

br648 requested a review from binh-dam-ibigroup April 21, 2026 15:25

binh-dam-ibigroup reviewed Apr 22, 2026

View reviewed changes

binh-dam-ibigroup requested changes Apr 22, 2026

View reviewed changes

binh-dam-ibigroup assigned br648 and unassigned binh-dam-ibigroup Apr 22, 2026

binh-dam-ibigroup mentioned this pull request Apr 22, 2026

Fares v2 ibi-group/datatools-server#600

Open

7 tasks

Conversation

br648 commented Aug 19, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Checklist

Description

Uh oh!

miles-grant-ibigroup left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

miles-grant-ibigroup left a comment

Choose a reason for hiding this comment

Uh oh!

binh-dam-ibigroup left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

binh-dam-ibigroup left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

binh-dam-ibigroup Apr 20, 2026

Choose a reason for hiding this comment

Uh oh!

br648 Apr 21, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

binh-dam-ibigroup Apr 22, 2026

Choose a reason for hiding this comment

Uh oh!

binh-dam-ibigroup Apr 22, 2026

Choose a reason for hiding this comment

Uh oh!

binh-dam-ibigroup Apr 22, 2026

Choose a reason for hiding this comment

Uh oh!

binh-dam-ibigroup left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

br648 commented Aug 19, 2024 •

edited

Loading