Merge Dev-flex into Dev by br648 · Pull Request #666 · ibi-group/datatools-server

br648 · 2026-08-19T14:44:51Z

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
The description lists all relevant PRs included in this release (remove this if not merging to master)
e2e tests are all passing (remove this if not merging to master)

Description

Merge flex into dev! Need to consider DB migration.

…booking rules and location grou

…the flex value depending on the

…param so it is not picked up by

…rce to move @BsonIgnore from th

Removed flex getter and setter

…a data and location shapes

Bumped gtfs-lib version

Bumped gtfs-lib version which include pattern stop updates

…tatools-server into flex-editor-updates

…er dependency source

…ex updates

…s in relation to this): Updated

…k with the latest version of sn

…ed redundant snapshots

…tatools-server into flex-editor-updates

miles-grant-ibigroup

datatools-server/.github/workflows/build-docker.yml

Line 6 in 00a6bf9

branches: ['dev', 'master', 'dev-flex', 'mtc-deploy']

We should probably update this!

br648 · 2026-09-11T07:43:37Z

datatools-server/.github/workflows/build-docker.yml

Line 6 in 00a6bf9

branches: ['dev', 'master', 'dev-flex', 'mtc-deploy']

We should probably update this!

@miles-grant-ibigroup In what way? Remove dev-flex?

miles-grant-ibigroup · 2026-09-11T14:27:51Z

datatools-server/.github/workflows/build-docker.yml

Line 6 in 00a6bf9

branches: ['dev', 'master', 'dev-flex', 'mtc-deploy']

We should probably update this!

@miles-grant-ibigroup In what way? Remove dev-flex?

yes!

br648 · 2026-09-14T11:38:07Z

datatools-server/.github/workflows/build-docker.yml

Line 6 in 00a6bf9

branches: ['dev', 'master', 'dev-flex', 'mtc-deploy']

We should probably update this!

@miles-grant-ibigroup In what way? Remove dev-flex?

yes!

Removed.

miles-grant-ibigroup

Here we go!

binh-dam-ibigroup

We did a number of nice refactorings with dev-flex! Resolve merge conflicts (from merging #668), and update the gtfs-lib comment and version before proceeding.

binh-dam-ibigroup · 2026-09-18T14:49:34Z

@br648 Remember to update the gtfs-lib commit number.

…from merge into dev

br648 · 2026-09-21T09:02:16Z

@br648 Remember to update the gtfs-lib commit number.

See: f9d0297

binh-dam-ibigroup · 2026-09-21T13:27:43Z

-            <!-- Latest dev-flex build on jitpack.io -->
-            <version>f683b708724329dafe10c6bfbcfa158a012b56d3</version>
+            <!-- Latest dev build on jitpack.io -->
+            <version>89dba089dcc10d41a34b4d5868b055dad4309904</version>


Should be 065dxxx.

@binh-dam-ibigroup I'm confused bc my last commit is 065dxxx: f9d0297. What am I missing here?

I guess the diff made it confusing!

Robin Beer and others added 30 commits November 15, 2021 14:34

refactor(Added explict GTFS-lib reference and editor controllers for …

81fdfc9

…booking rules and location grou

refactor(Update to define if the loaded feed is flex): Update to set …

6a9707e

…the flex value depending on the

refactor(Added Bson ignore to flex param): Added Bson ignore to flex …

96d34c2

…param so it is not picked up by

refactor(Moved the @BsonIngore from param to setter): Updated FeedSou…

0328a0b

…rce to move @BsonIgnore from th

refactor(FeedSource): Added getter and setter methods for flex param

857b4a6

refactor(FeedSource.java): Removed flex getter and setter

5567737

Removed flex getter and setter

refactor(DataManager.java): Added editor controllers for location met…

f919940

…a data and location shapes

refactor(pom.xml): Bumped gtfs-lib version

e005c62

Bumped gtfs-lib version

Merge branch 'dev' into flex-editor-updates

15e7419

refactor(pom.xml): Bumped GTFS-lib version

8728701

Bumped gtfs-lib version which include pattern stop updates

Merge branch 'dev' into flex-editor-updates

da5e2f4

Merge branch 'dev' into flex-editor-updates

56f3bac

refactor(manager/DataManager): update tables to reflect gtfs-lib changes

837174d

Merge branch 'flex-editor-updates' of https://github.com/ibi-group/da…

6d278d1

…tatools-server into flex-editor-updates

Merge branch 'dev' into flex-editor-updates

702c09a

chore(deps): upgrade to latest gtfs-lib

7b8da96

Merge branch 'flex-editor-updates' of https://github.com/ibi-group/da…

5d851e1

…tatools-server into flex-editor-updates

refactor(pom.xml): Bumped GTFS-lib version and updated snapshot match…

f455b71

…er dependency source

chore(deps): update gtfs-lib version

6bbe2f8

chore(deps): update gtfs-lib

d997b12

chore(deps): update gtfs-lib

a9deba3

Merge branch 'dev' into flex-editor-updates

7ff41c7

refactor(DataManager.java): Re-ordered editor controllers to group fl…

62bd416

…ex updates

refactor(Fixed merge conflicts): Fixed merge conflicts

6f081c6

refactor(FeedSource.java): Added flex UI features param

6520f40

refactor(Included the latest commit of gtfs-lib and made a few change…

235d9a2

…s in relation to this): Updated

refactor(FeedVersion): Update feedSource flex setting on creation

3ec018f

refactor(Updated snapshots to include null references): Update to wor…

1b28d74

…k with the latest version of sn

refactor(Removed snapshots that should not have been commited): Remov…

330e914

…ed redundant snapshots

Merge branch 'flex-editor-updates' of https://github.com/ibi-group/da…

532eccf

…tatools-server into flex-editor-updates

br648 assigned miles-grant-ibigroup Aug 19, 2026

miles-grant-ibigroup requested changes Sep 1, 2026

View reviewed changes

miles-grant-ibigroup assigned br648 and unassigned miles-grant-ibigroup Sep 1, 2026

miles-grant-ibigroup mentioned this pull request Sep 2, 2026

Production-ready Flex ibi-group/datatools-ui#1067

Open

improvement(build-docker.yml): Removed dev-flex branch trigger

1c545ee

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

miles-grant-ibigroup approved these changes Sep 14, 2026

View reviewed changes

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

br648 assigned binh-dam-ibigroup and unassigned br648 Sep 14, 2026

binh-dam-ibigroup requested changes Sep 16, 2026

View reviewed changes

Comment thread pom.xml Outdated

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

refactor(Addressed merge conflicts):

14e4bcc

br648 assigned binh-dam-ibigroup and unassigned br648 Sep 17, 2026

br648 requested a review from binh-dam-ibigroup September 17, 2026 09:22

chore(Updated gtfs-lib version): Version now matches the commit hash …

f9d0297

…from merge into dev

binh-dam-ibigroup reviewed Sep 21, 2026

View reviewed changes

binh-dam-ibigroup approved these changes Sep 22, 2026

View reviewed changes

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

Navigation Menu

Merge Dev-flex into Dev - #666

Merge Dev-flex into Dev#666
br648 wants to merge 228 commits into
devfrom
dev-flex

br648 commented Aug 19, 2026 •

edited by binh-dam-ibigroup

Loading

Uh oh!

miles-grant-ibigroup left a comment

Uh oh!

br648 commented Sep 11, 2026 •

edited

Loading

Uh oh!

miles-grant-ibigroup commented Sep 11, 2026

Uh oh!

br648 commented Sep 14, 2026

Uh oh!

miles-grant-ibigroup left a comment

Uh oh!

binh-dam-ibigroup left a comment

Uh oh!

Uh oh!

binh-dam-ibigroup commented Sep 18, 2026

Uh oh!

br648 commented Sep 21, 2026

Uh oh!

binh-dam-ibigroup Sep 21, 2026

Uh oh!

br648 Sep 21, 2026

Uh oh!

binh-dam-ibigroup Sep 22, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

br648 commented Aug 19, 2026 • edited by binh-dam-ibigroup 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!

br648 commented Sep 11, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

miles-grant-ibigroup commented Sep 11, 2026

Uh oh!

br648 commented Sep 14, 2026

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!

binh-dam-ibigroup commented Sep 18, 2026

Uh oh!

br648 commented Sep 21, 2026

Uh oh!

binh-dam-ibigroup Sep 21, 2026

Choose a reason for hiding this comment

Uh oh!

br648 Sep 21, 2026

Choose a reason for hiding this comment

Uh oh!

binh-dam-ibigroup Sep 22, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

br648 commented Aug 19, 2026 •

edited by binh-dam-ibigroup

Loading

br648 commented Sep 11, 2026 •

edited

Loading