feat: update dashboard mermaid for scoring engine count tech-by-desig…

…n#244
megin1989 · Aug 13, 2024 · 270cacf · 270cacf
1 parent 2d9a0e9
commit 270cacf
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 2 deletions.
diff --git a/hub-prime/lib/techbd-udi-jooq-ingress.auto.jar b/hub-prime/lib/techbd-udi-jooq-ingress.auto.jar
diff --git a/hub-prime/pom.xml b/hub-prime/pom.xml
@@ -11,7 +11,7 @@
 	</parent>
 	<groupId>org.techbd</groupId>
 	<artifactId>hub-prime</artifactId>
-	<version>0.161.0</version>
+	<version>0.162.0</version>
 	<packaging>war</packaging>
 	<name>TechBD Hub (Prime)</name>
 	<description>TechBD Hub (Primary)</description>

diff --git a/hub-prime/src/main/java/org/techbd/service/http/hub/prime/ux/PrimeController.java b/hub-prime/src/main/java/org/techbd/service/http/hub/prime/ux/PrimeController.java
@@ -288,6 +288,17 @@ public ResponseEntity<List<InteractionData>> fetchFHIRSMermaidDiagram(Model mode
                     getSafeIntegerValue(data.get("grrhio_total_submissions"))));
             interactions.add(new InteractionData("hixny_total_submissions",
                     getSafeIntegerValue(data.get("hixny_total_submissions"))));
+
+            interactions.add(new InteractionData("healthelink_scoring_engine_submission_passed",
+                    getSafeIntegerValue(data.get("healthelink_scoring_engine_submission_passed"))));
+            interactions.add(new InteractionData("healtheconnections_scoring_engine_submission_passed",
+                    getSafeIntegerValue(data.get("healtheconnections_scoring_engine_submission_passed"))));                    
+            interactions.add(new InteractionData("healthix_scoring_engine_submission_passed",
+                    getSafeIntegerValue(data.get("healthix_scoring_engine_submission_passed"))));
+            interactions.add(new InteractionData("grrhio_scoring_engine_submission_passed",
+                    getSafeIntegerValue(data.get("grrhio_scoring_engine_submission_passed"))));
+            interactions.add(new InteractionData("hixny_scoring_engine_submission_passed",
+                    getSafeIntegerValue(data.get("hixny_scoring_engine_submission_passed"))));        
         } else {
             // Default values if no data found
             interactions.add(new InteractionData("total_cross_roads_scn", 0));
@@ -300,6 +311,12 @@ public ResponseEntity<List<InteractionData>> fetchFHIRSMermaidDiagram(Model mode
             interactions.add(new InteractionData("grrhio_total_submissions", 0));
             interactions.add(new InteractionData("hixny_total_submissions", 0));
 
+            interactions.add(new InteractionData("healthelink_scoring_engine_submission_passed", 0));
+            interactions.add(new InteractionData("healtheconnections_scoring_engine_submission_passed", 0));
+            interactions.add(new InteractionData("healthix_scoring_engine_submission_passed", 0));
+            interactions.add(new InteractionData("grrhio_scoring_engine_submission_passed", 0));
+            interactions.add(new InteractionData("hixny_scoring_engine_submission_passed", 0));
+
         }
 
         // Return the data with HTTP status OK

diff --git a/hub-prime/src/main/resources/templates/page/home.html b/hub-prime/src/main/resources/templates/page/home.html
@@ -223,6 +223,11 @@ <h3 class="text-xl font-bold mb-4">Production (flat files)</h3>
                     const healthix = getCountByLabel('healthix_total_submissions');
                     const grrhio = getCountByLabel('grrhio_total_submissions');
                     const hixny = getCountByLabel('hixny_total_submissions');
+                    const healthelink_scoring_engine_submission_passed = getCountByLabel('healthelink_scoring_engine_submission_passed');
+                    const healtheconnections_scoring_engine_submission_passed = getCountByLabel('healtheconnections_scoring_engine_submission_passed');
+                    const healthix_scoring_engine_submission_passed = getCountByLabel('healthix_scoring_engine_submission_passed');
+                    const grrhio_scoring_engine_submission_passed = getCountByLabel('grrhio_scoring_engine_submission_passed');
+                    const hixny_scoring_engine_submission_passed = getCountByLabel('hixny_scoring_engine_submission_passed');
 
                     // Construct Mermaid diagram code with fetched data
                     const mermaidCode = `
@@ -241,7 +246,11 @@ <h3 class="text-xl font-bold mb-4">Production (flat files)</h3>
                 QE ->> TechBD: Rochester Proxy FHIR JSON (${grrhio})
                 QE ->> TechBD: HixNY Proxy FHIR JSON (${hixny})
                 TechBD ->> TechBD: Validate and Store FHIR JSON (${qeTotalSubmissions})
-                TechBD ->> ScoringEngine: Proxy Validated FHIR JSON (${scoringEngineSubmissionPassed})
+                TechBD ->> ScoringEngine: HEALTHeLINK Proxy Validated FHIR JSON (${healthelink_scoring_engine_submission_passed})
+                TechBD ->> ScoringEngine: Healtheconnections Proxy Validated FHIR JSON (${healtheconnections_scoring_engine_submission_passed})
+                TechBD ->> ScoringEngine: Healthix Proxy Validated FHIR JSON (${healthix_scoring_engine_submission_passed})
+                TechBD ->> ScoringEngine: Rochester Proxy Validated FHIR JSON (${grrhio_scoring_engine_submission_passed})
+                TechBD ->> ScoringEngine: HixNY Proxy Validated FHIR JSON (${hixny_scoring_engine_submission_passed})
                 ScoringEngine ->> SHINNY: Submit to Data lake
                 SHINNY ->> MDW: Submit to MDW
         `;

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
@@ -1147,6 +1147,11 @@ SELECT
     SUM(CASE WHEN qe_name = 'hixny' THEN qe_total_submissions ELSE 0 END) AS hixny_total_submissions,
     SUM(techbd_total_submissions) AS total_techbd_total_submissions,
     SUM(total_scoring_engine_submissions) AS total_total_scoring_engine_submissions,
+    SUM(CASE WHEN qe_name = 'healthelink' THEN scoring_engine_submission_passed ELSE 0 END) AS healthelink_scoring_engine_submission_passed,
+    SUM(CASE WHEN qe_name = 'healtheconn' THEN scoring_engine_submission_passed ELSE 0 END) AS healtheconnections_scoring_engine_submission_passed,
+    SUM(CASE WHEN qe_name = 'healthix' THEN scoring_engine_submission_passed ELSE 0 END) AS healthix_scoring_engine_submission_passed,
+    SUM(CASE WHEN qe_name = 'grrhio' THEN scoring_engine_submission_passed ELSE 0 END) AS grrhio_scoring_engine_submission_passed,
+    SUM(CASE WHEN qe_name = 'hixny' THEN scoring_engine_submission_passed ELSE 0 END) AS hixny_scoring_engine_submission_passed,
     SUM(scoring_engine_submission_passed) AS total_scoring_engine_submission_passed
 FROM
     combined_counts