Skip to content

Fares V2 #8

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

Jump to bottom
Open
wants to merge 46 commits into
base: dev
Choose a base branch
from
Open

Fares V2 #8

wants to merge 46 commits into from

Conversation

@br648
Copy link

@br648 br648 commented Aug 19, 2024 •
edited
Loading

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

br648 added 30 commits August 15, 2024 13:14
@br648
refactor(Initial fares v2 work):
07ecda4
@br648
refactor(GTFSTest): Addressed failing test
1d57cd6
@br648
refactor(Various new tests):
208ea3c
@br648
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
@br648
refactor(Updated to extract the file name from path):
5dd609b
@br648
refactor(Refactored GraphQL classes to accom fares v2):
1d82b21
@br648
refactor(Update to include network_id in the route GraphQL obj):
1d95cf5
@br648
Merge branch 'dev' into feature/DT-448-fares-v2
3faaa1e
@br648
refactor(Replaced camel case with snake case for GrpahQL objs):
fbf5282
@br648
improvement(Added JDBC table writer tests for fares v2 entities): New…
7d41e00 
… generic unit tests which uses
@br648
fix(JDBCTableWriterFaresV2Test.java): Replaced Windows new line separ…
62a7ed2 
…ator with OS derived reference

Test should now work on Linux
@br648
improvement(GTFSFaresV2Test): Removed superceded JDBC table writer tests
a2db1a7
@br648
improvement(Removed the id param from the create entities to closer m…
e96e834 
…atch what will be provided):
@br648
improvement(Altered GraphQL test data): Similified fare product query…
2390130 
… and included id
@br648
improvement(Removed child entities from GraphQL schema): Only parent …
2c256c9 
…entities will be returned
@br648
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
@br648
Merge branch 'dev' into feature/DT-448-fares-v2
1cac512
@br648
feat(Merging stop areas into stops): import stop areas into stops and…
731dcf0 
… export to separate files
@br648
improvement(A few minor changes with comments):
a3481b0
@br648
improvement(GraphQL updates): Removed stop areas. Added fares v2 stop…
2b1302c 
… test to include stop area ids
@br648
improvement(Entry in zip subdirecotry): Allow for stop areas being in…
00b9d65 
… a sub directory
@br648
improvement(Stop.java): Updated stop areas separator to a special uni…
dd97252 
…code character
@br648
improvement(Stop.java): Corrected separator char
6117108
@br648
improvement(Checking for files in zip subdirectories): Updated all lo…
f3ef2c4 
…cations to check subdirectories
@br648
improvement(Exporting): Added the functionality to export stop areas
8353334
@br648
improvement(Addressed PR feedback):
7299ed4
@br648
improvement(Stop export): Remove stop areas from stop export
9436984
@br648
improvement(Entity.java): Reinstated space
ff93df6
@br648
improvement(Addressed PR feedback): Streamlined writting to zip
77e3b61
@br648
Merge pull request #15 from ibi-group/merge-stop-areas
c3ba52d 
Merge stop areas into stops
br648 and others added 16 commits August 21, 2025 10:26
@br648
feat(route network merge): Started on merging rout networks into routes
b091a91
@br648
improvement(Various updates to accom route networks in routes):
9824180
@br648
improvement(Further dev work):
a93b5bc
@br648
improvement(Minor changes and address bug):
d045979
@br648
improvement(GTFSTest.java): Updated test to allow for now route netwo…
f787aa2 
…rks table
@br648
improvement(Consolidating methods): Moved methods from stops and rout…
5193713 
…e to entity
@br648
improvement(Route from editor export): Update to export only approved…
116a8dd 
… routes
@br648
improvement(Route.java): Added route export count and removed redunda…
f43fa02 
…nt method
@br648
improvement(Efficiency updates and row count outputs):
6739bc6
@br648
improvement(Addressed PR feedback):
82684ac
@br648
improvement(Reverted concat changes):
d63eaca
@br648
improvement(Entity.java): Corrected param name change
a65a86a
@binh-dam-ibigroup
refactor(Entity): Extract logic for printing col after existing ones.
f0bd480
@br648
Merge pull request #17 from ibi-group/merge-route-networks-qbd
43777fb 
refactor(Entity): Extract logic for printing col after existing ones.
@br648
Merge pull request #16 from ibi-group/merge-route-networks
bf7aaa9 
Merge route networks
@br648
improvement(Fixed merged conflicts and bumped node version to 22.x):
8d087c0
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@br648 @binh-dam-ibigroup