covid case datamart fixes

.github/workflows/run-unit-tests.yaml

@@ -18,6 +18,13 @@ jobs:
     permissions:
       id-token: write
       contents: read
+
+    services:
+      nbs-mssql:
+        image: ghcr.io/cdcgov/nedss-datareporting-mssql:6.0.18.1
+        ports:
+          - 1433:1433
+
     steps:
       - uses: actions/checkout@v6
         with:
@@ -36,8 +43,11 @@ jobs:
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
           restore-keys: ${{ runner.os }}-gradle
 
-      - name: Build and analyze
+      - name: Run stored procedure tests
         working-directory: ./
+        env:
+          DB_URL_RDB: "jdbc:sqlserver://localhost:1433;databaseName=RDB_MODERN;encrypt=true;trustServerCertificate=true;loginTimeout=3;"
+          DB_URL_ODSE: "jdbc:sqlserver://localhost:1433;databaseName=NBS_ODSE;encrypt=true;trustServerCertificate=true;loginTimeout=3;"
         run: |
           ./gradlew clean reporting-pipeline-service:test-unit --continue
 

build.gradle

@@ -14,6 +14,7 @@ buildscript {
 plugins {
     id 'org.sonarqube' version '4.2.1.3168'
     id 'com.diffplug.spotless' version '8.3.0'
+    id 'io.github.dsdolzhenko.dotenv' version '0.1.0'
 }
 
 version = '1.0.1-SNAPSHOT'
@@ -34,6 +35,7 @@ subprojects {
     apply plugin: 'java'
     apply plugin: 'jacoco'
     apply plugin: 'com.diffplug.spotless'
+    apply plugin: 'io.github.dsdolzhenko.dotenv'
 
     spotless {
         // Disable incremental check if specific files are provided via CLI

env.sample

@@ -1,5 +1,5 @@
 DATABASE_PASSWORD=PizzaIsGood33!
 RTR_ADMIN_NAME=rtr_admin
 RTR_ADMIN_PASSWORD=rtr_admin
-RTR_SERVICE_USER_NAME=rtr_server_user
+RTR_SERVICE_USER_NAME=rtr_service_user
 RTR_SERVICE_USER_PASSWORD=rtr_service_user

liquibase-service/src/main/resources/db/001-master/02_onboarding_script_data_load/004-nrt_lab_test_result_group_key-001.sql

@@ -1,5 +1,9 @@
 -- use rdb_modern;
-IF EXISTS(SELECT 1 FROM NBS_ODSE.DBO.NBS_configuration WHERE config_key ='ENV' AND config_value ='UAT')
+IF
+    EXISTS (
+        SELECT 1 FROM NBS_ODSE.DBO.NBS_CONFIGURATION
+        WHERE CONFIG_KEY = 'ENV' AND CONFIG_VALUE = 'UAT'
+    )
     BEGIN
         USE [rdb_modern];
         PRINT 'Switched to database [rdb_modern]'
@@ -10,30 +14,35 @@ ELSE
         PRINT 'Switched to database [rdb]';
     END
 
-IF EXISTS (SELECT 1 FROM sysobjects WHERE name = 'nrt_lab_test_result_group_key' and xtype = 'U')
-    AND EXISTS (SELECT 1 FROM sysobjects WHERE name = 'TEST_RESULT_GROUPING' and xtype = 'U')
+IF
+    EXISTS (
+        SELECT 1 FROM SYSOBJECTS
+        WHERE NAME = 'nrt_lab_test_result_group_key' AND XTYPE = 'U'
+    )
+    AND EXISTS (
+        SELECT 1 FROM SYSOBJECTS
+        WHERE NAME = 'TEST_RESULT_GROUPING' AND XTYPE = 'U'
+    )
     BEGIN
-        
+
         --copy already existing (TEST_RESULT_GRP_KEY, LAB_TEST_UID) from TEST_RESULT_GROUPING
 
-        SET IDENTITY_INSERT [dbo].nrt_lab_test_result_group_key ON
+        SET IDENTITY_INSERT [dbo].NRT_LAB_TEST_RESULT_GROUP_KEY ON
 
-        INSERT INTO [dbo].nrt_lab_test_result_group_key(
-            TEST_RESULT_GRP_KEY, 
+        INSERT INTO [dbo].NRT_LAB_TEST_RESULT_GROUP_KEY (
+            TEST_RESULT_GRP_KEY,
             LAB_TEST_UID
         )
-        SELECT 
-            rg.TEST_RESULT_GRP_KEY, 
-            rg.LAB_TEST_UID 
-        FROM [dbo].TEST_RESULT_GROUPING rg WITH(NOLOCK) 
-        LEFT JOIN [dbo].nrt_lab_test_result_group_key k WITH(NOLOCK)
-            ON k.TEST_RESULT_GRP_KEY = rg.TEST_RESULT_GRP_KEY 
-            AND k.LAB_TEST_UID= rg.LAB_TEST_UID
-        WHERE 
-            k.TEST_RESULT_GRP_KEY IS NULL 
-            AND k.LAB_TEST_UID IS NULL
-        ORDER BY rg.TEST_RESULT_GRP_KEY;
+        SELECT
+            RG.TEST_RESULT_GRP_KEY,
+            RG.LAB_TEST_UID
+        FROM [dbo].TEST_RESULT_GROUPING AS RG WITH (NOLOCK)
+        LEFT JOIN [dbo].NRT_LAB_TEST_RESULT_GROUP_KEY AS K WITH (NOLOCK)
+            ON RG.TEST_RESULT_GRP_KEY = K.TEST_RESULT_GRP_KEY
+        WHERE
+            K.TEST_RESULT_GRP_KEY IS NULL
+        ORDER BY RG.TEST_RESULT_GRP_KEY;
+
+        SET IDENTITY_INSERT [dbo].NRT_LAB_TEST_RESULT_GROUP_KEY OFF
 
-        SET IDENTITY_INSERT [dbo].nrt_lab_test_result_group_key OFF
-
-    END
+    END