Phase 4 by eplxy · Pull Request #213 · eplxy/Crossroads

eplxy · 2025-11-26T19:45:19Z

Phase 4

This iteration consists of the development for the following features/additions:

Flex pricing (balancing)
User view switching
Loyalty program
Account information page

Additionally, frontend tests (with CI) and unit test with over 50% coverage for backend code were added.

Issues

See the following issues

Pull requests

See the following pull requests

* made DB manager implement interface, made services depend on the interface, and minor cleanup * removed unused authentication classes/code

* Cleanup console logs * Change logic for DockDTO creation isOccupied (since OCCUPIED dock state competes with MAINTENANCE) * Show docking station state on marker

* Start UI * Rename exported component * Add new endpoint and finish flow * Display pricing on first step if the user has a monthly membership * Change next button text if the user has a monthly subscription * Fix misnamed body parameter

* Sort bills by latest to oldest * Fix reserve bike button being enabled when the user can't reserve * Fix marker shadow looking off when a station is out of service or under maintenance

* Update the markers if a station action was taken (e.g. undock, dock, change state, reserve) * Fix crash on map load, change the marker for the 100th time (only on non-operational)

* Added flex credit reward on end trip * Updated comments * Update backend/src/main/java/org/crossroads/Domain/BikeSharingServices/TripServices.java Co-authored-by: William Ross <william.ross.lpp.83@gmail.com> --------- Co-authored-by: William Ross <william.ross.lpp.83@gmail.com>

* made Operator a child of Rider * added loyalty tier and flex dollars to Rider class

* Start working on mark for maintenance * Continue mark for maintenance styling and list display * Add query

* Added a route to retrieve a user's flex dollars * Added flex dollars to userinfo route

#179)

* Fixed the null authenticationManager * Made the execution of tickets function as expected

* Loyalty Done * AboutUs and HowItWorks Pages Completed * Added button to Pricing * Updated the About Us Page * Can change plan to monthly in pricing page * Selected Background when Monthly is selected * Fixed an issue + added cancel subscription button * Fixed the reload page issue --------- Co-authored-by: Arturo <DaKingzz@users.noreply.github.com>

…s. (#180)

* added concrete discount decorators for flex dollars, operators and layalty programs * added decoration configuration * fixed minor issues and added extra decorator * changed how the discount is caluclated

* added concrete discount decorators for flex dollars, operators and layalty programs * added decoration configuration * fixed minor issues and added extra decorator * changed how the discount is caluclated * minor fix * fixed formating

* changed end trip return object, fixed unit tests to work with that change * minor fix to reflect f$ utilization

* Start working on mark for maintenance * Continue mark for maintenance styling and list display * Add query * Start adding move bikes operation * Add ticket creation queries * Finish move bike dialog * silly goofy statement in loop! * Add ticket UI * yeah i don't need ts * Run filter before findFirst * Add tooltip to refresh, and add transfer state * Adjust default expanded state * Link execute and cancel operations, add detailed info. * Remove unused state

* Fix crash on endTrip * Display new flex credit balance on trip end * Self-review

* Added leaderboard routes * Made leaderboard routes unprotected

* Added a function that changes bike and dock States in bulk * fixed mapping * fixed comments * fixed comments

* Add role to store and local storage * Change toggle button, and flag based on role * Self-review

* started the phase 4 demo data loading implementation * minor clean up and complete user creation in seed file, starting working on trips and reservations * minor cost details str fix * added the necessary trips and reservations to have a rider/operator of each tier * made op 2 bronze, but meet the silver requirements * ensured riders surpassed needed number of trips and gave a rider a timed out reservation * made big bird BRONZE --------- Co-authored-by: Mach2-1 <103284465+Mach2-1@users.noreply.github.com>

* Leaderboard Page Implementation + Gotta Fix the no rides yet issue to fully test the UI * Merge Test * Leaderboard Page Merge Test * Merge Query --------- Co-authored-by: Arturo <DaKingzz@users.noreply.github.com>

* added tier verification * Tested all tier eligibility and fixed the gold tier check * fixed method names

* Added account info page * Added real values instead of placeholders, loyalty tier badge remains to be added * Added correct loyalty tier badge on account info page Had to mess with the backend slightly so I could grab the loyalty tier value but it should be good. * Add toggle switch button * Only render button if the user is an operator --------- Co-authored-by: Steven <93779447+eplxy@users.noreply.github.com>

* fixed reservation bugs * uncommented annotation

* Add popup for loyalty tier changes * Fix typo

* Add a couple of frontend tests * CI-1 * Add phase-4 to the path * fuck it * change name

* Wrote bill entity tests * Wrote all entity tests and modified ID generation strategy to AUTO to function properly with H2 engine. * Wrote ticket services tests * Modified trip services to not load the entire application context. Implement jacoco plugin for easy reading of test coverage. Implement different ticket tests for execute and delete ticket service methods * Wrote tests for all controllers and covered extra service execution paths * Formatting changes * fixed imports --------- Co-authored-by: Will <william.ross.lpp.83@gmail.com>

This reverts commit 0207ee2.

DaKingzz and others added 30 commits November 10, 2025 17:34

Fixed typo in 'Members' section header (#134)

e817d38

Refactor DB Manager to Implement an Interface (#136)

f7da73c

* made DB manager implement interface, made services depend on the interface, and minor cleanup * removed unused authentication classes/code

added endpoint and service to change rider plan type (#138)

bcf4947

Fix docking stations under maintenance not showing occupied docks (#151)

de81e16

* Cleanup console logs * Change logic for DockDTO creation isOccupied (since OCCUPIED dock state competes with MAINTENANCE) * Show docking station state on marker

Make Operators Riders Through Inheritance (#148)

0f54999

Reservation payment plan flow (#153)

9a278f5

* Start UI * Rename exported component * Add new endpoint and finish flow * Display pricing on first step if the user has a monthly membership * Change next button text if the user has a monthly subscription * Fix misnamed body parameter

Fix various frontend bugs (#155)

ecee812

* Sort bills by latest to oldest * Fix reserve bike button being enabled when the user can't reserve * Fix marker shadow looking off when a station is out of service or under maintenance

Refetch map on station action (#156)

f65e401

* Update the markers if a station action was taken (e.g. undock, dock, change state, reserve) * Fix crash on map load, change the marker for the 100th time (only on non-operational)

Added loyalty tier to rider (#149)

bc99435

Invalidate the getRiderPlan query when a plan is changed (#163)

a023f9a

Modified Domain Model (#169)

eac69d0

* made Operator a child of Rider * added loyalty tier and flex dollars to Rider class

Operator flow - Change bike/dock state (#165)

da3d6d1

* Start working on mark for maintenance * Continue mark for maintenance styling and list display * Add query

Added a route to retrieve a user's flex dollars (#171)

c9ddfc1

* Added a route to retrieve a user's flex dollars * Added flex dollars to userinfo route

Fixed the null authenticationManager (#177)

560a0f2

Fixed the deletion of tickets to revert the changes to bikes and docks (

5f1cc24

#179)

172 bug executing tickets seems to do nothing (#178)

31ff6b5

* Fixed the null authenticationManager * Made the execution of tickets function as expected

Cool update to show "issued_at" and bikeIds in return value of ticket…

739090f

…s. (#180)

Set Up Decorator Design Pattern for Discounted Cost Calculation (#147)

3b7f770

* added concrete discount decorators for flex dollars, operators and layalty programs * added decoration configuration * fixed minor issues and added extra decorator * changed how the discount is caluclated

Minor PR (#185)

47bf5fa

* added concrete discount decorators for flex dollars, operators and layalty programs * added decoration configuration * fixed minor issues and added extra decorator * changed how the discount is caluclated * minor fix * fixed formating

Modified End Trip Return Object (#182)

6b4656c

* changed end trip return object, fixed unit tests to work with that change * minor fix to reflect f$ utilization

Fix frontend crash on end trip (#189)

8a8f876

* Fix crash on endTrip * Display new flex credit balance on trip end * Self-review

Added leaderboard routes (#190)

b002acf

* Added leaderboard routes * Made leaderboard routes unprotected

Added a function that changes bike and dock States in bulk (#183)

c5aa83d

* Added a function that changes bike and dock States in bulk * fixed mapping * fixed comments * fixed comments

Dual roles (#193)

44389fb

* Add role to store and local storage * Change toggle button, and flag based on role * Self-review

Left panel placeholders (#197)

c93853c

Added trip id parameter to trip search (#196)

217d7e0

DaKingzz and others added 14 commits November 23, 2025 21:56

188 leaderboard (#201)

31bef5c

* Leaderboard Page Implementation + Gotta Fix the no rides yet issue to fully test the UI * Merge Test * Leaderboard Page Merge Test * Merge Query --------- Co-authored-by: Arturo <DaKingzz@users.noreply.github.com>

added tier verification (#187)

fd78ad5

* added tier verification * Tested all tier eligibility and fixed the gold tier check * fixed method names

made decorators use discount rate from enum (#205)

ef44322

Modified Leaderboard Logic (#204)

297d27f

Added bill creation for monthly plan (#206)

703162b

Fix undefined cost on search by trip Id (#202)

fe10c7e

Implemented overflow credits (#200)

bd8b137

Fixed reservation bugs (#208)

1cda5be

* fixed reservation bugs * uncommented annotation

Fix searchTrips not properly checking if the user is an operator (#209)

a9fc15b

Display monthly bills in billing page (#210)

2df207f

Add popup for loyalty tier changes (#211)

c6db41a

* Add popup for loyalty tier changes * Fix typo

Frontend tests (#212)

83af833

* Add a couple of frontend tests * CI-1 * Add phase-4 to the path * fuck it * change name

eplxy added this to the Phase 4 milestone Nov 26, 2025

eplxy added the phase 4 Issues related to phase 4 label Nov 26, 2025

Mach2-1 approved these changes Nov 26, 2025

View reviewed changes

eplxy merged commit 0207ee2 into main Nov 26, 2025
1 check passed

eplxy added a commit that referenced this pull request Nov 26, 2025

Revert "Phase 4 (#213)"

0c98cab

This reverts commit 0207ee2.

This was referenced Nov 26, 2025

Revert "Phase 4" #214

Closed

Phase 4 #215

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Phase 4#213

Phase 4#213
eplxy merged 44 commits into
mainfrom
phase-4

eplxy commented Nov 26, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Conversation

eplxy commented Nov 26, 2025

Phase 4

Issues

Pull requests

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants