Merge branch 'master' into ab2d-5870-update-postgres-image

.github/workflows/unit-integration-test.yml

@@ -0,0 +1,71 @@
+name: GitHub Actions Workflow
+
+on:
+  pull_request:
+  workflow_dispatch: # Allow manual trigger
+
+jobs:
+  build:
+    runs-on: self-hosted
+
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v3
+
+      - name: Setup Java
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: temurin
+          cache: maven
+
+      - name: Set env vars from AWS params
+        uses: cmsgov/ab2d-bcda-dpc-platform/actions/aws-params-env-action@main
+        env:
+          AWS_REGION: ${{ vars.AWS_REGION }}
+        with:
+          params: |
+            ARTIFACTORY_URL=/artifactory/url
+            ARTIFACTORY_USER=/artifactory/user
+            ARTIFACTORY_PASSWORD=/artifactory/password
+            SONAR_HOST_URL=/sonarqube/url
+            SONAR_TOKEN=/sonarqube/token
+
+      - name: Assume role in target account
+        uses: aws-actions/configure-aws-credentials@v3
+        with:
+          aws-region: us-east-1
+          role-to-assume: arn:aws:iam::${{ vars.DEV_ACCOUNT_NUMBER }}:role/delegatedadmin/developer/github-actions-runner-role
+
+      - name: Set env vars from AWS params
+        uses: cmsgov/ab2d-bcda-dpc-platform/actions/aws-params-env-action@main
+        env:
+          AWS_REGION: ${{ vars.AWS_REGION }}
+        with:
+          params: |
+            OKTA_CLIENT_ID=/okta/client-id
+            OKTA_CLIENT_PASSWORD=/okta/client-secret
+            SECONDARY_USER_OKTA_CLIENT_ID=/secondary-okta/client-id
+            SECONDARY_USER_OKTA_CLIENT_PASSWORD=/secondary-okta/client-secret
+
+      - name: Install Maven 3.6.3
+        run: |
+          export PATH="$PATH:/opt/maven/bin"
+          echo "PATH=$PATH" >> $GITHUB_ENV
+          if mvn -v; then echo "Maven already installed" && exit 0; else echo "Installing Maven"; fi
+          tmpdir="$(mktemp -d)"
+          curl -LsS https://archive.apache.org/dist/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz | tar xzf - -C "$tmpdir"
+          sudo rm -rf /opt/maven
+          sudo mv "$tmpdir/apache-maven-3.6.3" /opt/maven
+
+      - name: Clean maven
+        run: |
+          mvn -ntp -U clean
+
+      - name: SonarQube analysis
+        run: |
+          mvn -ntp -s settings.xml ${RUNNER_DEBUG:+"--debug"} compile sonar:sonar -Dsonar.projectKey=ab2d-project -Dsonar.qualitygate.wait=true -DskipTests -Dusername=${ARTIFACTORY_USER} -Dpassword=${ARTIFACTORY_PASSWORD} -Drepository_url=${ARTIFACTORY_URL}
+
+      - name: Run unit and integration tests
+        run: |
+          mvn -ntp -s settings.xml ${RUNNER_DEBUG:+"--debug"} -Dusername=${ARTIFACTORY_USER} -Dpassword=${ARTIFACTORY_PASSWORD} -Drepository_url=${ARTIFACTORY_URL} test -pl common,job,coverage,api,worker

api/src/test/resources/logback.xml

@@ -4,8 +4,8 @@
             <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
         </encoder>
     </appender>
-    <logger name="com.github.dockerjava.core.command" level="ERROR"/>
-    <root level="INFO">
+    <logger name="com.github.dockerjava.core.command" level="WARN"/>
+    <root level="WARN">
         <appender-ref ref="STDOUT" />
     </root>
-</configuration>
+</configuration>

common/src/main/resources/db/changelog/db.changelog-master.yaml

@@ -166,4 +166,4 @@ databaseChangeLog:
   - include:
       file: db/changelog/v2023/create_pg_cron_extension.sql
   - include:
-      file: db/changelog/v2024/create_current_mbi_procedure.sql
+      file: db/changelog/v2024/create_current_mbi_procedure.sql

common/src/main/resources/db/changelog/v2023/create_current_mbi_procedure.sql

@@ -3,33 +3,33 @@ LANGUAGE plpgsql
 AS $$
 begin
 INSERT INTO current_mbi
-SELECT DISTINCT current_mbi from coverage_anthem_united_2023
+SELECT DISTINCT current_mbi from coverage_anthem_united_2023 WHERE current_mbi IS NOT NULL
 UNION DISTINCT
-SELECT DISTINCT current_mbi from coverage_bcbs_2023
+SELECT DISTINCT current_mbi from coverage_bcbs_2023 WHERE current_mbi IS NOT NULL
 UNION DISTINCT
-SELECT DISTINCT current_mbi from coverage_centene_2023
+SELECT DISTINCT current_mbi from coverage_centene_2023 WHERE current_mbi IS NOT NULL
 UNION DISTINCT
-SELECT DISTINCT current_mbi from coverage_cigna1_2023
+SELECT DISTINCT current_mbi from coverage_cigna1_2023 WHERE current_mbi IS NOT NULL
 UNION DISTINCT
-SELECT DISTINCT current_mbi from coverage_cigna2_2023
+SELECT DISTINCT current_mbi from coverage_cigna2_2023 WHERE current_mbi IS NOT NULL
 UNION DISTINCT
-SELECT DISTINCT current_mbi from coverage_cvs_2023
+SELECT DISTINCT current_mbi from coverage_cvs_2023 WHERE current_mbi IS NOT NULL
 UNION DISTINCT
-SELECT DISTINCT current_mbi from coverage_centene_2023
+SELECT DISTINCT current_mbi from coverage_centene_2023 WHERE current_mbi IS NOT NULL
 UNION DISTINCT
-SELECT DISTINCT current_mbi from coverage_humana_2023
+SELECT DISTINCT current_mbi from coverage_humana_2023 WHERE current_mbi IS NOT NULL
 UNION DISTINCT
-SELECT DISTINCT current_mbi from coverage_misc_2023
+SELECT DISTINCT current_mbi from coverage_misc_2023 WHERE current_mbi IS NOT NULL
 UNION DISTINCT
-SELECT DISTINCT current_mbi from coverage_mutual_dean_clear_cambia_rite_2023
+SELECT DISTINCT current_mbi from coverage_mutual_dean_clear_cambia_rite_2023 WHERE current_mbi IS NOT NULL
 UNION DISTINCT
-SELECT DISTINCT current_mbi from coverage_united1_2023
+SELECT DISTINCT current_mbi from coverage_united1_2023 WHERE current_mbi IS NOT NULL
 UNION DISTINCT
-SELECT DISTINCT current_mbi from coverage_united_2023
+SELECT DISTINCT current_mbi from coverage_united_2023 WHERE current_mbi IS NOT NULL
 UNION DISTINCT
-SELECT DISTINCT current_mbi from coverage_default
+SELECT DISTINCT current_mbi from coverage_default WHERE current_mbi IS NOT NULL
 UNION DISTINCT
-SELECT DISTINCT current_mbi from sandbox_2023
+SELECT DISTINCT current_mbi from sandbox_2023 WHERE current_mbi IS NOT NULL
 ON CONFLICT DO NOTHING;
 end;
 $$;

common/src/main/resources/db/changelog/v2023/create_current_mbi_table.sql

@@ -1,32 +1,58 @@
 CREATE TABLE IF NOT EXISTS public.current_mbi (mbi VARCHAR(32) NOT NULL);
-CREATE UNIQUE INDEX unique_mbi ON public.current_mbi(mbi);
-
-INSERT INTO public.current_mbi
-SELECT DISTINCT current_mbi from coverage_anthem_united
-UNION DISTINCT
-SELECT DISTINCT current_mbi from coverage_bcbs
-UNION DISTINCT
-SELECT DISTINCT current_mbi from coverage_centene
-UNION DISTINCT
-SELECT DISTINCT current_mbi from coverage_cigna1
-UNION DISTINCT
-SELECT DISTINCT current_mbi from coverage_cigna2
-UNION DISTINCT
-SELECT DISTINCT current_mbi from coverage_cvs
-UNION DISTINCT
-SELECT DISTINCT current_mbi from coverage_centene
-UNION DISTINCT
-SELECT DISTINCT current_mbi from coverage_humana
-UNION DISTINCT
-SELECT DISTINCT current_mbi from coverage_misc
-UNION DISTINCT
-SELECT DISTINCT current_mbi from coverage_mutual_dean_clear_cambia_rite
-UNION DISTINCT
-SELECT DISTINCT current_mbi from coverage_united1
-UNION DISTINCT
-SELECT DISTINCT current_mbi from coverage_united2
-UNION DISTINCT
-SELECT DISTINCT current_mbi from coverage_default
-UNION DISTINCT
-SELECT DISTINCT current_mbi from sandbox
-ON CONFLICT DO NOTHING
+CREATE UNIQUE INDEX  IF NOT EXISTS unique_mbi ON public.current_mbi(mbi);
+
+INSERT INTO public.current_mbi
+SELECT DISTINCT current_mbi from coverage_anthem_united WHERE current_mbi IS NOT NULL
+ON CONFLICT DO NOTHING;
+
+INSERT INTO public.current_mbi
+SELECT DISTINCT current_mbi from coverage_bcbs WHERE current_mbi IS NOT NULL
+ON CONFLICT DO NOTHING;
+
+INSERT INTO public.current_mbi
+SELECT DISTINCT current_mbi from coverage_centene WHERE current_mbi IS NOT NULL
+ON CONFLICT DO NOTHING;
+
+INSERT INTO public.current_mbi
+SELECT DISTINCT current_mbi from coverage_cigna1 WHERE current_mbi IS NOT NULL
+ON CONFLICT DO NOTHING;
+
+INSERT INTO public.current_mbi
+SELECT DISTINCT current_mbi from coverage_cigna2 WHERE current_mbi IS NOT NULL
+ON CONFLICT DO NOTHING;
+
+INSERT INTO public.current_mbi
+SELECT DISTINCT current_mbi from coverage_cvs WHERE current_mbi IS NOT NULL
+ON CONFLICT DO NOTHING;
+
+INSERT INTO public.current_mbi
+SELECT DISTINCT current_mbi from coverage_centene WHERE current_mbi IS NOT NULL
+ON CONFLICT DO NOTHING;
+
+INSERT INTO public.current_mbi
+SELECT DISTINCT current_mbi from coverage_humana WHERE current_mbi IS NOT NULL
+ON CONFLICT DO NOTHING;
+
+INSERT INTO public.current_mbi
+SELECT DISTINCT current_mbi from coverage_misc WHERE current_mbi IS NOT NULL
+ON CONFLICT DO NOTHING;
+
+INSERT INTO public.current_mbi
+SELECT DISTINCT current_mbi from coverage_mutual_dean_clear_cambia_rite WHERE current_mbi IS NOT NULL
+ON CONFLICT DO NOTHING;
+
+INSERT INTO public.current_mbi
+SELECT DISTINCT current_mbi from coverage_united1 WHERE current_mbi IS NOT NULL
+ON CONFLICT DO NOTHING;
+
+INSERT INTO public.current_mbi
+SELECT DISTINCT current_mbi from coverage_united2 WHERE current_mbi IS NOT NULL
+ON CONFLICT DO NOTHING;
+
+INSERT INTO public.current_mbi
+SELECT DISTINCT current_mbi from coverage_default WHERE current_mbi IS NOT NULL
+ON CONFLICT DO NOTHING;
+
+INSERT INTO public.current_mbi
+SELECT DISTINCT current_mbi from sandbox WHERE current_mbi IS NOT NULL
+ON CONFLICT DO NOTHING;

common/src/main/resources/db/changelog/v2023/extend_coverage_partition.sql

@@ -1,59 +1,59 @@
-create table sandbox_2024 partition of sandbox
+create table IF NOT EXISTS sandbox_2024 partition of sandbox
     for values in (2024);
-create table sandbox_2025 partition of sandbox
+create table IF NOT EXISTS sandbox_2025 partition of sandbox
     for values in (2025);
 
-create table coverage_anthem_united_2024 partition of coverage_anthem_united
+create table IF NOT EXISTS coverage_anthem_united_2024 partition of coverage_anthem_united
     for values in (2024);
-create table coverage_anthem_united_2025 partition of coverage_anthem_united
+create table  IF NOT EXISTS coverage_anthem_united_2025 partition of coverage_anthem_united
     for values in (2025);
 
-create table coverage_bcbs_2024 partition of coverage_bcbs
+create table  IF NOT EXISTS coverage_bcbs_2024 partition of coverage_bcbs
     for values in (2024);
-create table coverage_bcbs_2025 partition of coverage_bcbs
+create table  IF NOT EXISTS coverage_bcbs_2025 partition of coverage_bcbs
     for values in (2025);
 
-create table coverage_centene_2024 partition of coverage_centene
+create table  IF NOT EXISTS coverage_centene_2024 partition of coverage_centene
     for values in (2024);
-create table coverage_centene_2025 partition of coverage_centene
+create table  IF NOT EXISTS coverage_centene_2025 partition of coverage_centene
     for values in (2025);
 
-create table coverage_cigna1_2024 partition of coverage_cigna1
+create table  IF NOT EXISTS coverage_cigna1_2024 partition of coverage_cigna1
     for values in (2024);
-create table coverage_cigna1_2025 partition of coverage_cigna1
+create table  IF NOT EXISTS coverage_cigna1_2025 partition of coverage_cigna1
     for values in (2025);
 
-create table coverage_cigna2_2024 partition of coverage_cigna2
+create table  IF NOT EXISTS coverage_cigna2_2024 partition of coverage_cigna2
     for values in (2024);
-create table coverage_cigna2_2025 partition of coverage_cigna2
+create table  IF NOT EXISTS coverage_cigna2_2025 partition of coverage_cigna2
     for values in (2025);
 
-create table coverage_cvs_2024 partition of coverage_cvs
+create table  IF NOT EXISTS coverage_cvs_2024 partition of coverage_cvs
     for values in (2024);
-create table coverage_cvs_2025 partition of coverage_cvs
+create table  IF NOT EXISTS coverage_cvs_2025 partition of coverage_cvs
     for values in (2025);
 
-create table coverage_humana_2024 partition of coverage_humana
+create table  IF NOT EXISTS coverage_humana_2024 partition of coverage_humana
     for values in (2024);
-create table coverage_humana_2025 partition of coverage_humana
+create table  IF NOT EXISTS coverage_humana_2025 partition of coverage_humana
     for values in (2025);
 
-create table coverage_united1_2024 partition of coverage_united1
+create table  IF NOT EXISTS coverage_united1_2024 partition of coverage_united1
     for values in (2024);
-create table coverage_united1_2025 partition of coverage_united1
+create table  IF NOT EXISTS coverage_united1_2025 partition of coverage_united1
     for values in (2025);
 
-create table coverage_united_2024 partition of coverage_united2
+create table  IF NOT EXISTS coverage_united_2024 partition of coverage_united2
     for values in (2024);
-create table coverage_united_2025 partition of coverage_united2
+create table  IF NOT EXISTS coverage_united_2025 partition of coverage_united2
     for values in (2025);
 
-create table coverage_mutual_dean_clear_cambia_rite_2024 partition of coverage_mutual_dean_clear_cambia_rite
+create table  IF NOT EXISTS coverage_mutual_dean_clear_cambia_rite_2024 partition of coverage_mutual_dean_clear_cambia_rite
     for values in (2024);
-create table coverage_mutual_dean_clear_cambia_rite_2025 partition of coverage_mutual_dean_clear_cambia_rite
+create table  IF NOT EXISTS coverage_mutual_dean_clear_cambia_rite_2025 partition of coverage_mutual_dean_clear_cambia_rite
     for values in (2025);
 
-create table coverage_misc_2024 partition of coverage_misc
+create table  IF NOT EXISTS coverage_misc_2024 partition of coverage_misc
     for values in (2024);
-create table coverage_misc_2025 partition of coverage_misc
-    for values in (2025);
+create table  IF NOT EXISTS coverage_misc_2025 partition of coverage_misc
+    for values in (2025);

common/src/main/resources/db/changelog/v2024/create_current_mbi_procedure.sql

@@ -3,33 +3,33 @@ CREATE OR REPLACE PROCEDURE update_current_mbi_2024()
 AS $$
 begin
     INSERT INTO current_mbi
-    SELECT DISTINCT current_mbi from coverage_anthem_united_2024
+    SELECT DISTINCT current_mbi from coverage_anthem_united_2024 WHERE current_mbi IS NOT NULL
     UNION DISTINCT
-    SELECT DISTINCT current_mbi from coverage_bcbs_2024
+    SELECT DISTINCT current_mbi from coverage_bcbs_2024 WHERE current_mbi IS NOT NULL
     UNION DISTINCT
-    SELECT DISTINCT current_mbi from coverage_centene_2024
+    SELECT DISTINCT current_mbi from coverage_centene_2024 WHERE current_mbi IS NOT NULL
     UNION DISTINCT
-    SELECT DISTINCT current_mbi from coverage_cigna1_2024
+    SELECT DISTINCT current_mbi from coverage_cigna1_2024 WHERE current_mbi IS NOT NULL
     UNION DISTINCT
-    SELECT DISTINCT current_mbi from coverage_cigna2_2024
+    SELECT DISTINCT current_mbi from coverage_cigna2_2024 WHERE current_mbi IS NOT NULL
     UNION DISTINCT
-    SELECT DISTINCT current_mbi from coverage_cvs_2024
+    SELECT DISTINCT current_mbi from coverage_cvs_2024 WHERE current_mbi IS NOT NULL
     UNION DISTINCT
-    SELECT DISTINCT current_mbi from coverage_centene_2024
+    SELECT DISTINCT current_mbi from coverage_centene_2024 WHERE current_mbi IS NOT NULL
     UNION DISTINCT
-    SELECT DISTINCT current_mbi from coverage_humana_2024
+    SELECT DISTINCT current_mbi from coverage_humana_2024 WHERE current_mbi IS NOT NULL
     UNION DISTINCT
-    SELECT DISTINCT current_mbi from coverage_misc_2024
+    SELECT DISTINCT current_mbi from coverage_misc_2024 WHERE current_mbi IS NOT NULL
     UNION DISTINCT
-    SELECT DISTINCT current_mbi from coverage_mutual_dean_clear_cambia_rite_2024
+    SELECT DISTINCT current_mbi from coverage_mutual_dean_clear_cambia_rite_2024 WHERE current_mbi IS NOT NULL
     UNION DISTINCT
-    SELECT DISTINCT current_mbi from coverage_united1_2024
+    SELECT DISTINCT current_mbi from coverage_united1_2024 WHERE current_mbi IS NOT NULL
     UNION DISTINCT
-    SELECT DISTINCT current_mbi from coverage_united_2024
+    SELECT DISTINCT current_mbi from coverage_united_2024 WHERE current_mbi IS NOT NULL
     UNION DISTINCT
-    SELECT DISTINCT current_mbi from coverage_default
+    SELECT DISTINCT current_mbi from coverage_default WHERE current_mbi IS NOT NULL
     UNION DISTINCT
-    SELECT DISTINCT current_mbi from sandbox_2024
+    SELECT DISTINCT current_mbi from sandbox_2024 WHERE current_mbi IS NOT NULL
     ON CONFLICT DO NOTHING;
 end;
 $$;

common/src/test/resources/application.common.properties

@@ -14,7 +14,7 @@ spring.jpa.hibernate.ddl-auto=none
 spring.liquibase.enabled=true
 spring.liquibase.contexts=test
 
-logging.level.liquibase=ERROR
+logging.level.liquibase=WARN
 
 #SQS Connection
 cloud.aws.end-point.uri:${AWS_SQS_URL:#{'http://localhost:4566'}}

common/src/test/resources/logback.xml

@@ -4,9 +4,9 @@
             <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
         </encoder>
     </appender>
-    <logger name="com.github.dockerjava.core.command" level="ERROR"/>
-    <logger name="liquibase" level="ERROR"/>
-    <root level="INFO">
+    <logger name="com.github.dockerjava.core.command" level="WARN"/>
+    <logger name="liquibase" level="WARN"/>
+    <root level="WARN">
         <appender-ref ref="STDOUT" />
     </root>
-</configuration>
+</configuration>

coverage/src/test/resources/application.coverage.properties

@@ -12,7 +12,7 @@ spring.jpa.hibernate.ddl-auto=none
 spring.liquibase.enabled=true
 spring.liquibase.contexts=test
 
-logging.level.liquibase=ERROR
+logging.level.liquibase=WARN
 
 #SQS Connection
 cloud.aws.end-point.uri:${AWS_SQS_URL:#{'http://localhost:4566'}}