adjust deliveries query elims section for topic name

CDCgov · Jan 21, 2025 · fccf7f6 · fccf7f6
1 parent 123fe85
commit fccf7f6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/prime-router/src/main/kotlin/history/azure/DatabaseDeliveryAccess.kt b/prime-router/src/main/kotlin/history/azure/DatabaseDeliveryAccess.kt
@@ -49,7 +49,7 @@ class DatabaseDeliveryAccess(
                 REPORT_FILE.NEXT_ACTION.isNull
                     .and(REPORT_FILE.TRANSPORT_PARAMS.isNotNull)
                     .and(REPORT_FILE.TRANSPORT_RESULT.notLike("%downloadedBy%"))
-                    .and(REPORT_FILE.SCHEMA_TOPIC.eq(Topic.ELR_ELIMS))
+                    .and(REPORT_FILE.SCHEMA_TOPIC.equalIgnoreCase(Topic.ELR_ELIMS.jsonVal))
                     .and(REPORT_FILE.RECEIVING_ORG.eq(organization))
         } else {
             REPORT_FILE.NEXT_ACTION.eq(TaskAction.send)

diff --git a/prime-router/src/test/kotlin/history/azure/HistoryDatabaseAccessTests.kt b/prime-router/src/test/kotlin/history/azure/HistoryDatabaseAccessTests.kt
@@ -31,7 +31,7 @@ class HistoryDatabaseAccessTests {
     fun `test organizationFilter`() {
         var conditionExpected = """
             (
-              "public"."action"."action_name" = 'batch'
+              "public"."report_file"."next_action" = 'send'
               and "public"."report_file"."receiving_org" = 'test'
               and "public"."report_file"."receiving_org_svc" = 'test'
             )
@@ -47,13 +47,10 @@ class HistoryDatabaseAccessTests {
     fun `test organizationFilter with feature flag`() {
         var conditionExpected = """
             (
-              (
-                "public"."action"."action_name" = 'batch'
-                or (
-                  "public"."action"."action_name" = 'send'
-                  and "public"."report_file"."schema_topic" = 'ELR_ELIMS'
-                )
-              )
+              "public"."report_file"."next_action" is null
+              and "public"."report_file"."transport_params" is not null
+              and "public"."report_file"."transport_result" not like '%downloadedBy%'
+              and lower(cast("public"."report_file"."schema_topic" as varchar)) = lower('elr-elims')
               and "public"."report_file"."receiving_org" = 'test'
               and "public"."report_file"."receiving_org_svc" = 'test'
             )