Merge pull request #21 from TaskarCenterAtUW/develop

Tasking Manager MVP

Author: susrisha

.github/workflows/ci.yml

@@ -2,9 +2,9 @@ name: CI
 
 on:
   push:
-    branches: [ main ]
+    branches: [ main, develop ]
   pull_request:
-    branches: [ main ]
+    branches: [ main, develop ]
 
 jobs:
   lint:

.github/workflows/tag.yml

@@ -0,0 +1,42 @@
+# Whenever there is a pull request merged into the branches, create tag
+name: Update Environment Tag
+on:
+   pull_request:
+     types: [closed]
+     branches:
+       - develop
+       - staging
+       - production
+jobs:
+  update-tag:
+    if: github.event.pull_request.merged == true
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+        - name: Checkout code
+          uses: actions/checkout@v4
+          with:
+            fetch-depth: 1
+        - name: Get the current branch name
+          id: get_branch
+          run: |
+            TARGET_BRANCH="${{ github.event.pull_request.base.ref }}"
+            
+            if [ "$TARGET_BRANCH" = "develop" ]; then
+                echo "ENV_TAG=dev" >> $GITHUB_ENV
+            elif [ "$TARGET_BRANCH" = "staging" ]; then
+                echo "ENV_TAG=stage" >> $GITHUB_ENV
+            elif [ "$TARGET_BRANCH" = "production" ]; then
+                echo "ENV_TAG=prod" >> $GITHUB_ENV
+            else
+                echo "ENV_TAG=" >> $GITHUB_ENV
+            fi
+        - name: Force update tag
+          if: ${{ env.ENV_TAG != '' }}
+          run: |
+            git config user.name "github-actions[bot]"
+            git config user.email "github-actions[bot]@users.noreply.github.com"
+            echo "Targeting tag: ${{ env.ENV_TAG }}"
+            git tag -f $ENV_TAG
+            git push origin $ENV_TAG --force

.gitignore

@@ -163,4 +163,10 @@ alembic/versions/.DS_Store
 /workspaces-openstreetmap-website
 pg_user_cache.sqlite
 
-.env**
+.env**
+integration-report.html
+docs/tasking-mvp/tasking-mvp.postman_collection.json
+docs/tasking-mvp/tasking-mvp.postman_environment.json
+docs/tasking-mvp/_enrich_postman.py
+docs/tasking-mvp/feature-coverage.md
+.idea/

.vscode/extensions.json

@@ -0,0 +1,6 @@
+{
+    "recommendations": [
+        "ms-python.python",
+        "ms-python.vscode-pylance"
+    ]
+}

alembic_osm/versions/9221408912dd_add_user_role_table.py

@@ -11,6 +11,7 @@
 import sqlalchemy as sa
 from alembic import op
 from sqlalchemy import inspect, text
+from sqlalchemy.dialects import postgresql
 
 # revision identifiers, used by Alembic.
 revision: str = "9221408912dd"
@@ -24,6 +25,25 @@ def upgrade() -> None:
     assert bind is not None
     insp = inspect(bind)
 
+    # `users` is normally owned and migrated by the OSM Rails app. When
+    # running against a fresh database without Rails (CI/testcontainers,
+    # or a dev box without the osm-rails service), create a minimal stub
+    # so the FK from `tasking_project_roles`/`user_workspace_roles` can
+    # be added below. Guarded by has_table so the production-owned
+    # schema wins when it is already present.
+    if not insp.has_table("users"):
+        op.create_table(
+            "users",
+            # `id` matches the Rails `users.id` numeric PK so the FK
+            # from `team_user.user_id` in the next migration can attach.
+            sa.Column("id", sa.BigInteger(), autoincrement=True, nullable=False),
+            sa.Column("auth_uid", sa.String(), nullable=False),
+            sa.Column("email", sa.String(), nullable=True),
+            sa.Column("display_name", sa.String(), nullable=True),
+            sa.PrimaryKeyConstraint("id"),
+            sa.UniqueConstraint("auth_uid", name="auth_uid_unique"),
+        )
+
     # Add unique constraint on users.auth_uid (if not already present)
     constraint_exists = bind.execute(
         text("SELECT 1 FROM pg_constraint WHERE conname = 'auth_uid_unique'")
@@ -49,7 +69,7 @@ def upgrade() -> None:
             sa.Column("workspace_id", sa.BigInteger(), nullable=False),
             sa.Column(
                 "role",
-                sa.Enum(
+                postgresql.ENUM(
                     "lead",
                     "validator",
                     "contributor",