Skip to content

Develop to Stage merge#65

Merged
susrisha merged 45 commits into
stagingfrom
develop
Jul 16, 2026
Merged

Develop to Stage merge#65
susrisha merged 45 commits into
stagingfrom
develop

Conversation

@susrisha

Copy link
Copy Markdown
Collaborator

Merge from develop to stage
This pull request introduces several important improvements and updates across the backend, deployment, and documentation. The most significant changes include new database migrations to support custom imagery and fix legacy user records, enhancements to deployment and development workflows, and comprehensive documentation of the OSM proxy contract and system architecture.

Database migrations and data integrity:

  • Added a migration (a92361f527ef_custom_imagery_and_description.py) to the OSM alembic tree to support custom_imagery (as JSONB) and a longer description field (up to 10,000 chars) on the tasking_projects table.
  • Added a migration (f3a7b9c1d2e4_heal_short_tdei_pass_crypt.py) to automatically repair legacy TDEI-provisioned users rows with too-short pass_crypt values, ensuring compatibility with OSM Rails validations.

Deployment and development workflow:

  • Added a new GitHub Actions workflow (trigger-deploy-on-merge.yml) that triggers deployment when pull requests are merged into key branches (develop, staging, production).
  • Documented and provided step-by-step instructions for running the entire stack locally using docker-compose.local.yml, including database setup and migrations.

Documentation and architecture:

  • Expanded the README.md to clearly document the contract the backend proxy must uphold for OSM services, the deployment architecture, and the roles of each service and database.
  • Updated CLAUDE.md to clarify the enforcement of workspace roles, the OSM proxy layer's routing and authentication, and technical details of the TDEI token bridge and user provisioning.

Configuration improvements:

  • Changed CORS_ORIGINS in api/core/config.py to accept both JSON arrays and comma-separated lists, matching deployment practices and improving flexibility; added a note to use the cors_origins_list property for parsing. [1] [2]

Developer tooling:

  • Expanded .claude/settings.json with new Bash commands for searching key code sections, aiding codebase navigation.

jeffmaki and others added 27 commits July 9, 2026 11:16
Defensive check on changeset resolve plus tests
Deploying the required code
Updated unit tests for CORS
Enable osm-web API endpoints with auth token
Tweak to enable OSM token bridge by default
Change stub user to validate OSM rails models
- Added notes to local development.
- Need to add more details on initial development.
Migration logic yet to be written
Added routes for validating the project name and unit tests for the same
removed unnecessary pass statement
Added detailed deployment architecture and services information to README.
Expand README with deployment architecture and services
Readme updated with steps to run local development
@susrisha
susrisha requested review from MashB and sujata-m July 16, 2026 05:52
@coderabbitai

coderabbitai Bot commented Jul 16, 2026

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: 62c6c92c-646a-43f0-942c-305c28497bef

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@susrisha
susrisha merged commit 21e6aec into staging Jul 16, 2026
2 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.

4 participants