Skip to content

Commit

Permalink
Merge pull request #709 from megin1989/main
Browse files Browse the repository at this point in the history 
fix: update mermaid in dashboard #668
  • Loading branch information
@ratheesh-kr
ratheesh-kr authored Nov 8, 2024
2 parents b5fcec9 + bfd6946 commit 8fb2fd6
Show file tree
Hide file tree
Showing 5 changed files with 107 additions and 334 deletions.
Binary file modified hub-prime/lib/techbd-udi-jooq-ingress.auto.jar
View file
Binary file not shown.
37 changes: 17 additions & 20 deletions hub-prime/src/main/java/org/techbd/service/http/hub/prime/ux/PrimeController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -269,9 +269,7 @@ public ResponseEntity<List<InteractionData>> fetchFHIRSMermaidDiagram(Model mode
if (fhirSubmission != null && !fhirSubmission.isEmpty()) {
Map<String, Object> data = fhirSubmission.get(0);

// Populate the list with data
interactions.add(new InteractionData("total_cross_roads_scn",
getSafeIntegerValue(data.get("total_cross_roads_scn"))));
// Populate the list with data
interactions.add(new InteractionData("healthelink_total_submissions",
getSafeIntegerValue(data.get("healthelink_total_submissions"))));
interactions.add(new InteractionData("healtheconnections_total_submissions",
Expand All @@ -283,30 +281,29 @@ public ResponseEntity<List<InteractionData>> fetchFHIRSMermaidDiagram(Model mode
interactions.add(new InteractionData("hixny_total_submissions",
getSafeIntegerValue(data.get("hixny_total_submissions"))));

interactions.add(new InteractionData("healthelink_scoring_engine_submissions",
getSafeIntegerValue(data.get("healthelink_scoring_engine_submissions"))));
interactions.add(new InteractionData("healtheconnections_scoring_engine_submissions",
getSafeIntegerValue(data.get("healtheconnections_scoring_engine_submissions"))));
interactions.add(new InteractionData("healthix_scoring_engine_submissions",
getSafeIntegerValue(data.get("healthix_scoring_engine_submissions"))));
interactions.add(new InteractionData("grrhio_scoring_engine_submissions",
getSafeIntegerValue(data.get("grrhio_scoring_engine_submissions"))));
interactions.add(new InteractionData("hixny_scoring_engine_submissions",
getSafeIntegerValue(data.get("hixny_scoring_engine_submissions"))));
interactions.add(new InteractionData("healthelink_shinny_datalake_submissions",
getSafeIntegerValue(data.get("healthelink_shinny_datalake_submissions"))));
interactions.add(new InteractionData("healtheconnections_shinny_datalake_submissions",
getSafeIntegerValue(data.get("healtheconnections_shinny_datalake_submissions"))));
interactions.add(new InteractionData("healthix_shinny_datalake_submissions",
getSafeIntegerValue(data.get("healthix_shinny_datalake_submissions"))));
interactions.add(new InteractionData("grrhio_shinny_datalake_submissions",
getSafeIntegerValue(data.get("grrhio_shinny_datalake_submissions"))));
interactions.add(new InteractionData("hixny_shinny_datalake_submissions",
getSafeIntegerValue(data.get("hixny_shinny_datalake_submissions"))));
} else {
// Default values if no data found
interactions.add(new InteractionData("total_cross_roads_scn", 0));
// Default values if no data found
interactions.add(new InteractionData("healthelink_total_submissions", 0));
interactions.add(new InteractionData("healtheconnections_total_submissions", 0));
interactions.add(new InteractionData("healthix_total_submissions", 0));
interactions.add(new InteractionData("grrhio_total_submissions", 0));
interactions.add(new InteractionData("hixny_total_submissions", 0));

interactions.add(new InteractionData("healthelink_scoring_engine_submissions", 0));
interactions.add(new InteractionData("healtheconnections_scoring_engine_submissions", 0));
interactions.add(new InteractionData("healthix_scoring_engine_submissions", 0));
interactions.add(new InteractionData("grrhio_scoring_engine_submissions", 0));
interactions.add(new InteractionData("hixny_scoring_engine_submissions", 0));
interactions.add(new InteractionData("healthelink_shinny_datalake_submissions", 0));
interactions.add(new InteractionData("healtheconnections_shinny_datalake_submissions", 0));
interactions.add(new InteractionData("healthix_shinny_datalake_submissions", 0));
interactions.add(new InteractionData("grrhio_shinny_datalake_submissions", 0));
interactions.add(new InteractionData("hixny_shinny_datalake_submissions", 0));

}

Expand Down
2 changes: 1 addition & 1 deletion hub-prime/src/main/resources/templates/page/diagnostics/needs-attention.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@
</div>
<h1 class="assemtion">Assumptions</h1>
<ul class="list-disc pl-4">
<li>The file count from QE FHIR to Tech by Design should match.</li>
<li>The file count from QE to Tech by Design should match.</li>
<li>The file count from Tech by Design to SHIN-NY Data Lake should match.</li>
<li>If any of the numbers in one column do not match the corresponding numbers in another column, it
indicates an error, and the mismatched numbers are highlighted in red.</li>
Expand Down
45 changes: 18 additions & 27 deletions hub-prime/src/main/resources/templates/page/home.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -233,50 +233,41 @@ <h3 class="text-xl font-bold mb-4">Production (flat files)</h3>
}
};

// Extract counts using the helper function
const crossRoadsScn = getCountByLabel('total_cross_roads_scn');
// Extract counts using the helper function
const healthelink = getCountByLabel('healthelink_total_submissions');
const healtheconnections = getCountByLabel('healtheconnections_total_submissions');
const healthix = getCountByLabel('healthix_total_submissions');
const grrhio = getCountByLabel('grrhio_total_submissions');
const hixny = getCountByLabel('hixny_total_submissions');
const healthelink_scoring_engine_submissions = getCountByLabel('healthelink_scoring_engine_submissions');
const healtheconnections_scoring_engine_submissions = getCountByLabel('healtheconnections_scoring_engine_submissions');
const healthix_scoring_engine_submissions = getCountByLabel('healthix_scoring_engine_submissions');
const grrhio_scoring_engine_submissions = getCountByLabel('grrhio_scoring_engine_submissions');
const hixny_scoring_engine_submissions = getCountByLabel('hixny_scoring_engine_submissions');
const healthelink_shinny_datalake_submissions = getCountByLabel('healthelink_shinny_datalake_submissions');
const healtheconnections_shinny_datalake_submissions = getCountByLabel('healtheconnections_shinny_datalake_submissions');
const healthix_shinny_datalake_submissions = getCountByLabel('healthix_shinny_datalake_submissions');
const grrhio_shinny_datalake_submissions = getCountByLabel('grrhio_shinny_datalake_submissions');
const hixny_shinny_datalake_submissions = getCountByLabel('hixny_shinny_datalake_submissions');

// Construct Mermaid diagram code with fetched data
const mermaidCode = `
sequenceDiagram
participant CrossroadsSCN as Crossroads SCN
sequenceDiagram
participant QE as QE
participant Tech by Design as Tech by Design
participant ScoringEngine as Scoring Engine
participant SHINNY as SHIN-NY Data Lake
participant SHIN-NY Data Lake as SHIN-NY Data Lake
participant MDW as MDW
CrossroadsSCN ->> QE: Send Test JSON (${crossRoadsScn})
QE ->> Tech by Design: HEALTHeLINK Proxy FHIR JSON (${healthelink})
QE ->> Tech by Design: Healtheconnections Proxy FHIR JSON (${healtheconnections})
QE ->> Tech by Design: Healthix Proxy FHIR JSON (${healthix})
QE ->> Tech by Design: Rochester Proxy FHIR JSON (${grrhio})
QE ->> Tech by Design: HixNY Proxy FHIR JSON (${hixny})
Tech by Design ->> ScoringEngine: HEALTHeLINK Proxy Validated FHIR JSON (${healthelink_scoring_engine_submissions})
Tech by Design ->> ScoringEngine: Healtheconnections Proxy Validated FHIR JSON (${healtheconnections_scoring_engine_submissions})
Tech by Design ->> ScoringEngine: Healthix Proxy Validated FHIR JSON (${healthix_scoring_engine_submissions})
Tech by Design ->> ScoringEngine: Rochester Proxy Validated FHIR JSON (${grrhio_scoring_engine_submissions})
Tech by Design ->> ScoringEngine: HixNY Proxy Validated FHIR JSON (${hixny_scoring_engine_submissions})
ScoringEngine ->> SHINNY: HEALTHeLINK Proxy Submit to Data lake (?)
ScoringEngine ->> SHINNY: Healtheconnections Proxy Submit to Data lake (?)
ScoringEngine ->> SHINNY: Healthix Proxy Submit to Data lake (?)
ScoringEngine ->> SHINNY: Rochester Proxy Submit to Data lake (?)
ScoringEngine ->> SHINNY: HixNY Proxy Submit to Data lake (?)
SHINNY ->> MDW: HEALTHeLINK Proxy Submit to MDW (?)
SHINNY ->> MDW: Healtheconnections Proxy Submit to MDW (?)
SHINNY ->> MDW: Healthix Proxy Submit to MDW (?)
SHINNY ->> MDW: Rochester Proxy Submit to MDW (?)
SHINNY ->> MDW: HixNY Proxy Submit to MDW (?)
Tech by Design ->> SHIN-NY Data Lake: HEALTHeLINK Proxy Validated FHIR JSON (${healthelink_shinny_datalake_submissions})
Tech by Design ->> SHIN-NY Data Lake: Healtheconnections Proxy Validated FHIR JSON (${healtheconnections_shinny_datalake_submissions})
Tech by Design ->> SHIN-NY Data Lake: Healthix Proxy Validated FHIR JSON (${healthix_shinny_datalake_submissions})
Tech by Design ->> SHIN-NY Data Lake: Rochester Proxy Validated FHIR JSON (${grrhio_shinny_datalake_submissions})
Tech by Design ->> SHIN-NY Data Lake: HixNY Proxy Validated FHIR JSON (${hixny_shinny_datalake_submissions})
SHIN-NY Data Lake ->> MDW: HEALTHeLINK Proxy Submit to MDW (?)
SHIN-NY Data Lake ->> MDW: Healtheconnections Proxy Submit to MDW (?)
SHIN-NY Data Lake ->> MDW: Healthix Proxy Submit to MDW (?)
SHIN-NY Data Lake ->> MDW: Rochester Proxy Submit to MDW (?)
SHIN-NY Data Lake ->> MDW: HixNY Proxy Submit to MDW (?)
`;

// Inject the Mermaid code into the HTML
Expand Down
Loading

0 comments on commit 8fb2fd6

Please sign in to comment.