diff --git a/hub-prime/lib/techbd-udi-jooq-ingress.auto.jar b/hub-prime/lib/techbd-udi-jooq-ingress.auto.jar index 7e7a9350721..942067fe7cf 100644 Binary files a/hub-prime/lib/techbd-udi-jooq-ingress.auto.jar and b/hub-prime/lib/techbd-udi-jooq-ingress.auto.jar differ diff --git a/hub-prime/pom.xml b/hub-prime/pom.xml index 56e5e4a6827..db9fe296abc 100644 --- a/hub-prime/pom.xml +++ b/hub-prime/pom.xml @@ -11,7 +11,7 @@ org.techbd hub-prime - 0.432.0 + 0.433.0 war Tech by Design Hub (Prime) Tech by Design Hub (Primary) diff --git a/udi-prime/src/main/postgres/ingestion-center/001_idempotent_interaction.psql b/udi-prime/src/main/postgres/ingestion-center/001_idempotent_interaction.psql index 785c5fec2ff..704fffb5bc8 100644 --- a/udi-prime/src/main/postgres/ingestion-center/001_idempotent_interaction.psql +++ b/udi-prime/src/main/postgres/ingestion-center/001_idempotent_interaction.psql @@ -1134,7 +1134,7 @@ WITH combined_counts AS ( END) AS shinny_datalake_submissions, max(sihr.created_at) AS recently_created_at FROM techbd_udi_ingress.sat_interaction_fhir_request sihr - WHERE sihr.created_at >= (CURRENT_DATE - '7 days'::interval) AND (sihr.uri = ANY (ARRAY['/Bundle/'::text, '/Bundle'::text])) AND (sihr.tenant_id_lower = ANY (ARRAY['healthelink'::text, 'healtheconn'::text, 'healthix'::text, 'grrhio'::text, 'hixny'::text])) + WHERE sihr.created_at >= (CURRENT_DATE - '7 days'::interval) AND (sihr.uri = ANY (ARRAY['/Bundle/', '/Bundle','/flatfile/csv/Bundle', '/flatfile/csv/Bundle/', '/ccda/Bundle', '/ccda/Bundle/'])) AND (sihr.tenant_id_lower = ANY (ARRAY['healthelink'::text, 'healtheconn'::text, 'healthix'::text, 'grrhio'::text, 'hixny'::text])) GROUP BY sihr.tenant_id_lower ) SELECT @@ -3547,7 +3547,7 @@ BEGIN max(sihr.created_at) AS recently_created_at FROM techbd_udi_ingress.sat_interaction_fhir_request sihr WHERE - sihr.uri = ANY (ARRAY['/Bundle', '/Bundle/','/flatfile/csv/Bundle', '/flatfile/csv/Bundle/']) + sihr.uri = ANY (ARRAY['/Bundle', '/Bundle/','/flatfile/csv/Bundle', '/flatfile/csv/Bundle/', '/ccda/Bundle', '/ccda/Bundle/']) AND sihr.created_at >= TO_TIMESTAMP(start_date::text, 'YYYY-MM-DD') AND sihr.created_at < TO_TIMESTAMP(end_date::text, 'YYYY-MM-DD') + INTERVAL '1 day' AND sihr.tenant_id <> 'N/A' @@ -3704,7 +3704,7 @@ BEGIN techbd_udi_ingress.sat_interaction_fhir_request sihr WHERE sihr.nature = ''Forwarded HTTP Response Error'' - AND sihr.uri = ANY (ARRAY[''/Bundle/'', ''/Bundle'', ''/flatfile/csv/Bundle'', ''/flatfile/csv/Bundle/'']) + AND sihr.uri = ANY (ARRAY[''/Bundle/'', ''/Bundle'', ''/flatfile/csv/Bundle'', ''/flatfile/csv/Bundle/'', ''/ccda/Bundle'', ''/ccda/Bundle/'']) AND sihr.created_at >= TO_TIMESTAMP($1::text, ''YYYY-MM-DD'') AND sihr.created_at < TO_TIMESTAMP($2::text, ''YYYY-MM-DD'') + INTERVAL ''1 day'' AND sihr.tenant_id_lower = $3 @@ -3737,7 +3737,7 @@ BEGIN WHERE sihr.tenant_id_lower = tenant_id_param AND sihr.nature = 'org.techbd.service.http.Interactions$RequestResponseEncountered' - AND sihr.uri = ANY (ARRAY['/Bundle/', '/Bundle']) + AND sihr.uri = ANY (ARRAY['/Bundle/', '/Bundle','/flatfile/csv/Bundle', '/flatfile/csv/Bundle/', '/ccda/Bundle', '/ccda/Bundle/']) AND sihr.created_at >= TO_TIMESTAMP(start_date_param::text, 'YYYY-MM-DD') AND sihr.created_at < TO_TIMESTAMP(end_date_param::text, 'YYYY-MM-DD') + INTERVAL '1 day' AND NOT EXISTS (