Merge branch '19875' of https://github.com/Jxio/sbc-pay into 19875

bcgov · Mar 14, 2024 · bc412e9 · bc412e9
2 parents e6f03a8 + 7bb0a0a
commit bc412e9
Show file tree

Hide file tree

Showing 176 changed files with 1,900 additions and 4,932 deletions.
diff --git a/.github/workflows/bcol-api-ci.yml b/.github/workflows/bcol-api-ci.yml
@@ -4,7 +4,7 @@ on:
   pull_request:
     branches:
       - main
-      - queue_python_upgrade
+      - feature-queue-python-upgrade
     paths:
       - "bcol-api/**"
 

diff --git a/.github/workflows/events-listener-ci.yml b/.github/workflows/events-listener-ci.yml
diff --git a/.github/workflows/ftp-poller-ci.yml b/.github/workflows/ftp-poller-ci.yml
@@ -4,7 +4,7 @@ on:
   pull_request:
     branches:
       - main
-      - queue_python_upgrade
+      - feature-queue-python-upgrade
     paths:
       - "jobs/ftp-poller/**"
 
@@ -53,10 +53,6 @@ jobs:
     needs: setup-job
     env:
       DATABASE_TEST_URL: "postgresql://postgres:postgres@localhost:5432/pay-test"
-      NATS_QUEUE: "account-worker"
-      NATS_CLUSTER_ID: "test-cluster"
-      NATS_CLIENT_NAME: "account.events.worker"
-      NATS_SUBJECT: "account.events"
       USE_DOCKER_MOCK: "YES"
       JWT_OIDC_ISSUER: "http://localhost:8081/auth/realms/demo"
       SBC_AUTH_ADMIN_CLIENT_ID: "sbc-auth-admin"

diff --git a/.github/workflows/pay-admin-ci.yml b/.github/workflows/pay-admin-ci.yml
@@ -4,7 +4,7 @@ on:
   pull_request:
     branches:
       - main
-      - queue_python_upgrade
+      - feature-queue-python-upgrade
     paths:
       - "pay-admin/**"
       - "pay-api/src/pay_api/models/**"

diff --git a/.github/workflows/pay-api-ci.yml b/.github/workflows/pay-api-ci.yml
@@ -4,7 +4,7 @@ on:
   pull_request:
     branches:
       - main
-      - queue_python_upgrade
+      - feature-queue-python-upgrade
     paths:
       - "pay-api/**"
 
@@ -55,7 +55,6 @@ jobs:
       FLASK_ENV: "testing"
       # Needs different database than POSTGRES otherwise dropping database doesn't work
       DATABASE_TEST_URL: "postgresql://postgres:postgres@localhost:5432/pay-test"
-      TEST_NATS_DOCKER: "YES"
       USE_TEST_KEYCLOAK_DOCKER: "YES"
       USE_DOCKER_MOCK: "YES"
 
@@ -66,9 +65,6 @@ jobs:
       JWT_OIDC_TEST_CLIENT_SECRET: "1111111111"
       JWT_OIDC_TEST_JWKS_CACHE_TIMEOUT: "6000"
 
-      NATS_QUEUE: "test-worker"
-      NATS_SUBJECT: "entity.payment.test"
-
       SBC_AUTH_ADMIN_CLIENT_ID: "sbc-auth-admin"
       SBC_AUTH_ADMIN_CLIENT_SECRET: "2222222222"
 

diff --git a/.github/workflows/events-listener-cd.yml → .github/workflows/pay-queue-cd.yml b/.github/workflows/events-listener-cd.yml → .github/workflows/pay-queue-cd.yml
@@ -1,12 +1,13 @@
-name: Events Listener Queue CD
+name: Pay Queue CD
 
 on:
   push:
     branches:
       - main
     paths:
-      - "queue_services/events-listener/**"
+      - "pay-queue/**"
       - "pay-api/src/pay_api/models/**"
+      - "pay-api/src/pay_api/services/cfs_service.py"
   workflow_dispatch:
     inputs:
       environment:
@@ -17,14 +18,14 @@ on:
 defaults:
   run:
     shell: bash
-    working-directory: ./queue_services/events-listener
+    working-directory: ./pay-queue
 
 env:
-  APP_NAME: "events-listener"
+  APP_NAME: "pay-queue"
   TAG_NAME: "dev"
 
 jobs:
-  events-listener-cd-by-push:
+  pay-queue-cd-by-push:
     runs-on: ubuntu-20.04
 
     if: github.event_name == 'push' && github.repository == 'bcgov/sbc-pay'
@@ -61,13 +62,13 @@ jobs:
         if: failure()
         with:
           type: ${{ job.status }}
-          job_name: "*Events Listener Queue Built and Deployed to ${{env.TAG_NAME}}*"
+          job_name: "*Pay Queue Built and Deployed to ${{env.TAG_NAME}}*"
           channel: "#registries-bot"
           url: ${{ secrets.ROCKETCHAT_WEBHOOK }}
           commit: true
           token: ${{ secrets.GITHUB_TOKEN }}
 
-  events-listener-cd-by-dispatch:
+  pay-queue-cd-by-dispatch:
     runs-on: ubuntu-20.04
 
     if: github.event_name == 'workflow_dispatch' && github.repository == 'bcgov/sbc-pay'
@@ -107,7 +108,7 @@ jobs:
         if: failure()
         with:
           type: ${{ job.status }}
-          job_name: "*Events Listener Queue Built and Deployed to ${{env.TAG_NAME}}*"
+          job_name: "*Pay Queue Built and Deployed to ${{env.TAG_NAME}}*"
           channel: "#registries-bot"
           url: ${{ secrets.ROCKETCHAT_WEBHOOK }}
           commit: true

diff --git a/.../workflows/payment-reconciliations-ci.yml → .github/workflows/pay-queue-ci.yml b/.../workflows/payment-reconciliations-ci.yml → .github/workflows/pay-queue-ci.yml
@@ -1,18 +1,19 @@
-name: Payment Reconciliations Queue CI
+name: Payment Queue CI
 
 on:
   pull_request:
     branches:
       - main
+      - feature-queue-python-upgrade
     paths:
-      - "queue_services/payment-reconciliations/**"
+      - "pay-queue/**"
       - "pay-api/src/pay_api/models/**"
       - "pay-api/src/pay_api/services/cfs_service.py"
 
 defaults:
   run:
     shell: bash
-    working-directory: ./queue_services/payment-reconciliations
+    working-directory: ./pay-queue
 
 jobs:
   setup-job:
@@ -53,10 +54,8 @@ jobs:
   testing:
     needs: setup-job
     env:
-      DATABASE_TEST_URL: "postgresql://postgres:postgres@localhost:5432/postgres"
-      TEST_NATS_DOCKER: "YES"
+      DATABASE_TEST_URL: "postgresql://postgres:postgres@localhost:5432/pay-test"
       USE_DOCKER_MOCK: "YES"
-      STAN_CLUSTER_NAME: "test-cluster"
       MINIO_ENDPOINT: "localhost:9000"
       MINIO_ACCESS_KEY: "minio"
       MINIO_ACCESS_SECRET: "minio123"
@@ -80,7 +79,7 @@ jobs:
         env:
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: postgres
-          POSTGRES_DB: postgres
+          POSTGRES_DB: pay-test
         ports:
           - 5432:5432
         # needed because the postgres container does not provide a healthcheck
@@ -102,7 +101,7 @@ jobs:
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v3
         with:
-          file: ./queue_services/payment-reconciliations/coverage.xml
+          file: ./pay-queue/coverage.xml
           flags: paymentreconciliationsqueue
           name: codecov-payment-reconciliations
           fail_ci_if_error: true

diff --git a/.github/workflows/payment-jobs-ci.yml b/.github/workflows/payment-jobs-ci.yml
@@ -4,6 +4,7 @@ on:
   pull_request:
     branches:
       - main
+      - feature-queue-python-upgrade
     paths:
       - "jobs/payment-jobs/**"
       - "pay-api/src/pay_api/models/**"
@@ -53,7 +54,7 @@ jobs:
   testing:
     needs: setup-job
     env:
-      DATABASE_TEST_URL: "postgresql://postgres:postgres@localhost:5432/postgres"
+      DATABASE_TEST_URL: "postgresql://postgres:postgres@localhost:5432/pay-test"
       USE_DOCKER_MOCK: "YES"
       JWT_OIDC_ISSUER: "http://localhost:8081/auth/realms/demo"
       SBC_AUTH_ADMIN_CLIENT_ID: "sbc-auth-admin"
@@ -71,7 +72,7 @@ jobs:
         env:
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: postgres
-          POSTGRES_DB: postgres
+          POSTGRES_DB: pay-test
         ports:
           - 5432:5432
         # needed because the postgres container does not provide a healthcheck