Feature/rsu info migration

.github/workflows/ci.yml

@@ -39,7 +39,7 @@ jobs:
 
   build_api:
     needs: test_change_limit
-    if: ${{ always() && !failure() && !cancelled() }}
+    if: ${{ always() && !cancelled() }}
     runs-on: ubuntu-latest
     container:
       image: python:3.12.2
@@ -80,13 +80,14 @@ jobs:
 
   webapp:
     needs: test_change_limit
-    if: ${{ always() && !failure() && !cancelled() }}
+    if: ${{ always() && !cancelled() }}
     runs-on: ubuntu-latest
     container:
-      image: node:19.8.1
+      image: node:22
       options: --user root
       env:
         CI: true
+        TZ: America/Denver
     steps:
       - name: Checkout ${{ github.event.repository.name }}
         uses: actions/checkout@v4
@@ -96,9 +97,7 @@ jobs:
         run: |
           # Navigate to the webapp directory and perform necessary setup
           cd $GITHUB_WORKSPACE/webapp
-          npm install -g nodemon
-          npm init -y
-          npm install --force
+          npm ci
 
           # Run tests with coverage and suppress failures
           npm test -- --coverage
@@ -116,7 +115,7 @@ jobs:
 
   build_keycloak_provider:
     needs: test_change_limit
-    if: ${{ always() && !failure() && !cancelled() }}
+    if: ${{ always() && !cancelled() }}
     runs-on: ubuntu-latest
     container:
       image: maven:3.9.9-eclipse-temurin-21
@@ -142,17 +141,54 @@ jobs:
           name: keycloak-user-provider-test-results
           path: $GITHUB_WORKSPACE/resources/keycloak/custom-user-provider/target/surefire-reports
 
+  build_rsu_info_bridge:
+    needs: test_change_limit
+    if: ${{ always() && !cancelled() }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+
+      - name: Set up JDK 25
+        uses: actions/setup-java@v4
+        with:
+          distribution: "temurin"
+          java-version: "25"
+
+      - name: Cache Maven packages
+        uses: actions/cache@v4
+        with:
+          path: ~/.m2
+          key: ${{ runner.os }}-maven-rsu-info-bridge-${{ hashFiles('**/services/rsu-info-bridge/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-rsu-info-bridge-
+            ${{ runner.os }}-maven-
+
+      - name: Build and Test with Maven
+        run: |
+          cd $GITHUB_WORKSPACE/services/rsu-info-bridge
+          ./mvnw clean verify
+
+      - name: Archive Test Results
+        uses: actions/upload-artifact@v4
+        with:
+          name: rsu-info-bridge-test-results
+          path: $GITHUB_WORKSPACE/services/rsu-info-bridge/target/surefire-reports
+
   build_intersection_api:
     needs: test_change_limit
-    if: ${{ always() && !failure() && !cancelled() }}
+    if: ${{ always() && !cancelled() }}
     runs-on: ubuntu-latest
-    container:
-      image: maven:3.9.9-eclipse-temurin-22
-      options: --user root
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v4
 
+      - name: Set up JDK 22
+        uses: actions/setup-java@v4
+        with:
+          distribution: "temurin"
+          java-version: "22"
+
       - name: Cache Maven packages
         uses: actions/cache@v4
         with:
@@ -190,6 +226,92 @@ jobs:
         run: |
           rm -rf $GITHUB_WORKSPACE/services/intersection-api/api/target
 
+  build_flyway_image:
+    needs: [test_change_limit, validate_migrations]
+    if: ${{ !cancelled() && needs.validate_migrations.result == 'success' }}
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to GitHub Container Registry
+        if: github.event_name == 'push'
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract image metadata
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ghcr.io/${{ github.repository_owner }}/cvmanager-flyway
+          tags: |
+            type=sha
+            type=ref,event=branch
+
+      - name: Build and push Flyway image
+        uses: docker/build-push-action@v6
+        with:
+          context: resources/db/
+          file: resources/db/Dockerfile
+          push: ${{ github.event_name == 'push' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+
+  validate_migrations:
+    needs: test_change_limit
+    if: ${{ always() && !cancelled() }}
+    runs-on: ubuntu-latest
+    services:
+      postgres:
+        image: postgis/postgis:15-3.4
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_DB: postgres
+        ports:
+          - 5432:5432
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 5s
+          --health-timeout 5s
+          --health-retries 10
+    steps:
+      - name: Checkout ${{ github.event.repository.name }}
+        uses: actions/checkout@v4
+
+      - name: Run Flyway migrations
+        run: |
+          docker run --rm \
+            --network host \
+            -v "$GITHUB_WORKSPACE/resources/db/migration:/flyway/sql" \
+            -v "$GITHUB_WORKSPACE/resources/db/flyway.toml:/flyway/conf/flyway.toml" \
+            flyway/flyway:10-alpine \
+            -url=jdbc:postgresql://localhost:5432/postgres \
+            -user=postgres \
+            -password=postgres \
+            migrate
+
+      - name: Verify migration state
+        run: |
+          docker run --rm \
+            --network host \
+            -v "$GITHUB_WORKSPACE/resources/db/migration:/flyway/sql" \
+            -v "$GITHUB_WORKSPACE/resources/db/flyway.toml:/flyway/conf/flyway.toml" \
+            flyway/flyway:10-alpine \
+            -url=jdbc:postgresql://localhost:5432/postgres \
+            -user=postgres \
+            -password=postgres \
+            info
+
   sonar:
     if: github.event.pull_request.base.repo.owner.login == 'usdot-jpo-ode'
     needs: [build_api, webapp]

.gitignore

@@ -9,3 +9,5 @@ htmlcov
 .pytest_cache
 local_blob_storage
 services/coverage.xml
+.idea/**
+**/*.iml

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "jpo-utils"]
 	path = jpo-utils
-	url = https://github.com/usdot-jpo-ode/jpo-utils
+	url = https://github.com/CDOT-CV/jpo-utils
 	branch = master

.vscode/launch.json

@@ -35,7 +35,23 @@
       "stopOnEntry": false,
       "program": "${workspaceRoot}/services/api/src/main.py",
       "env": {
-        "FLASK_APP": "${workspaceRoot}/services/api/src/main.py"
+        "PYTHONPATH": "${workspaceRoot}/services",
+        "FLASK_APP": "${workspaceRoot}/services/api/src/main.py",
+        "FLASK_RUN_PORT": "8081",
+        "PG_DB_HOST": "localhost:5432",
+        "PG_DB_USER": "postgres",
+        "PG_DB_PASS": "postgres",
+        "PG_DB_NAME": "postgres",
+        "MONGO_DB_URI": "mongodb://ode:replace-me@localhost:27017/?directConnection=true&authSource=admin",
+        "MONGO_DB_NAME": "CV",
+        "MONGO_PROCESSED_BSM_COLLECTION_NAME": "processed_bsm",
+        "MONGO_PROCESSED_PSM_COLLECTION_NAME": "processed_psm",
+        "ENABLE_WZDX_FEATURES": "false",
+        "CORS_DOMAIN": "*",
+        "KEYCLOAK_ENDPOINT": "http://localhost:8084",
+        "KEYCLOAK_REALM": "cvmanager",
+        "KEYCLOAK_API_CLIENT_ID": "cvmanager-api",
+        "KEYCLOAK_API_CLIENT_SECRET_KEY": "keycloak-secret-key"
       },
       "args": ["run"],
       "envFile": "${workspaceRoot}/services/api/.env",
@@ -48,13 +64,26 @@
       "mainClass": "us.dot.its.jpo.ode.api.ConflictApiApplication",
       "projectName": "intersection-api",
       "envFile": "${workspaceFolder}/.env",
-      "preLaunchTask": "run-docker-compose-intersection-no-api"
+      "preLaunchTask": "run-intersection-no-api",
+      "env": {
+        "AUTH_SERVER_URL": "http://localhost:8084",
+        "KAFKA_BROKER_IP": "localhost",
+        "DB_HOST_IP": "localhost",
+        "PG_DB_PASS": "postgres",
+        "POSTGRES_SERVER_URL": "jdbc:postgresql://localhost:5432",
+        "CM_SERVER_URL": "http://localhost:8082",
+        "UNSUBSCRIBE_SECRET_KEY": "b5f9070ca58d4576ea6a2d8d4c1b97caf8abc2554198f8f9acf86d0d31a52a52",
+        "INTERSECTION_SMTP_USERNAME": "admin",
+        "INTERSECTION_SMTP_PASSWORD": "password",
+        "INTERSECTION_SMTP_AUTH": "true",
+        "INTERSECTION_SMTP_STARTTLS": "false"
+      }
     }
   ],
   "compounds": [
     {
       "name": "Debug Solution",
-      "configurations": ["Python: Flask", "Launch web app with Intersection Data"]
+      "configurations": ["Python: Flask", "Launch web app with Intersection API"]
     }
   ]
 }

.vscode/settings.json

@@ -23,6 +23,9 @@
     "editor.defaultFormatter": "ms-python.black-formatter",
     "editor.formatOnSave": true
   },
+  "[html]": {
+    "editor.formatOnSave": false
+  },
   "cSpell.words": [
     "assertj",
     "authpriv",
@@ -52,6 +55,7 @@
     "dont",
     "drivername",
     "Dsrc",
+    "dtos",
     "formik",
     "fromaddr",
     "Fwding",
@@ -78,8 +82,6 @@
     "MESSAGETYPE",
     "millis",
     "mongosh",
-    "moove",
-    "mooveai",
     "msgfwd",
     "multidict",
     "Multivalued",
@@ -88,6 +90,7 @@
     "OIDC",
     "OIDCID",
     "pgdb",
+    "pgquery",
     "PGSQL",
     "postgis",
     "pythjon",
@@ -106,8 +109,8 @@
     "rwdata",
     "rxtxfwd",
     "SASL",
-    "secretmanager",
     "Scms",
+    "secretmanager",
     "SNMP",
     "snmpcredential",
     "snmperrorcheck",
@@ -120,13 +123,13 @@
     "subquery",
     "svcs",
     "TABLENAME",
+    "Thymeleaf",
     "timefield",
     "toaddrs",
     "txrxmsg",
     "upgrader",
     "usdot",
     "usdotjpoode",
-    "userauth",
     "utctimestamp",
     "writedb",
     "WSMP",
@@ -153,5 +156,6 @@
     "json",
     "jsonc",
     "markdown"
-  ]
+  ],
+  "java.debug.settings.onBuildFailureProceed": true
 }