Skip to content

revert: align main with prod (v1.5.1)#579

Merged
tompscanlan merged 2 commits into
mainfrom
revert/align-main-with-prod
Apr 23, 2026
Merged

revert: align main with prod (v1.5.1)#579
tompscanlan merged 2 commits into
mainfrom
revert/align-main-with-prod

Conversation

@tompscanlan
Copy link
Copy Markdown
Contributor

@tompscanlan tompscanlan commented Apr 23, 2026

Summary

Why

Strategic direction has shifted: we're adopting Contrail/atmo as the new stack rather than integrating Contrail into the OpenMeet API. Main should reflect what's deployed.

Preserved work

All reverted work is safe on feature branches:

  • feature/contrail-integration (22 commits)
  • feature/attendance-service (46 commits)
  • feature/db-query-performance (1 commit)
  • feature/contrail-rsvp (8 commits)

Test plan

  • Verify tree matches v1.5.1 exactly: git diff v1.5.1 HEAD should be empty (after merge commit)
  • CI passes (this is the same code running in prod)
  • Feature branches still exist on origin after merge

Reverts unreleased features to bring main back in sync with production:

- #577 perf(db): query fingerprint + home page optimization
- #576 feat: unified AttendanceService
- #574 feat(contrail): integrate Contrail appview

Hotfix changes (v1.5.1) are retained — they exist in the baseline.

All work is preserved on its respective feature branch:
- feature/contrail-integration
- feature/attendance-service
- feature/db-query-performance
- feature/contrail-rsvp

Direction shift: adopting Contrail/atmo as the new stack rather than
integrating Contrail into the OpenMeet API.
The hotfix (v1.5.1) added a past-event RSVP guard that rejects RSVPs
to events with past start dates. The edge-cases spec used 2024 dates,
hitting the guard before reaching the race condition logic under test.
@tompscanlan tompscanlan merged commit e5ae7e0 into main Apr 23, 2026
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant