update database query to support multiple accordion use case (#2561)

* reconcile rob and brandon's database interface code

* add sql

* [pre-commit.ci] auto fixes from pre-commit hooks

* delete a newline

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

containers/tefca-viewer/flyway/sql/V01_03__insert_hardcoded_values.sql

@@ -12,20 +12,20 @@ INSERT INTO valuesets VALUES('2_20240909','2','20240909','Cancer (Leukemia)','DI
 INSERT INTO valuesets VALUES('3_20240909','3','20240909','Cancer Leukemia','DIBBs','mrtc');
 
 -- Missing Syphilis valueset(s)
-INSERT INTO valuesets VALUES('4_20240909','4','20240909','Missing Syphilis mrtc','DIBBs','mrtc');
-INSERT INTO valuesets VALUES('5_20240909','5','20240909','Missing Syphilis dxtc','DIBBs','dxtc');
-INSERT INTO valuesets VALUES('6_20240909','6','20240909','Missing Syphilis sdtc','DIBBs','sdtc');
+INSERT INTO valuesets VALUES('4_20240909','4','20240909','Syphilis Medication','DIBBs','mrtc');
+INSERT INTO valuesets VALUES('5_20240909','5','20240909','Syphilis Diagnosis Problem','DIBBs','dxtc');
+INSERT INTO valuesets VALUES('6_20240909','6','20240909','Suspected Syphilis Disorder','DIBBs','sdtc');
 
 -- Missing Gonorhea valueset(s)
-INSERT INTO valuesets VALUES('7_20240909','7','20240909','Missing Gonorhea mrtc','DIBBs','mrtc');
-INSERT INTO valuesets VALUES('8_20240909','8','20240909','Missing Gonorhea dxtc','DIBBs','dxtc');
-INSERT INTO valuesets VALUES('9_20240909','9','20240909','Missing Gonorhea lotc','DIBBs','lotc');
-INSERT INTO valuesets VALUES('10_20240909','10','20240909','Missing Gonorhea lrtc','DIBBs','lrtc');
+INSERT INTO valuesets VALUES('7_20240909','7','20240909','Gonorrhea Medication','DIBBs','mrtc');
+INSERT INTO valuesets VALUES('8_20240909','8','20240909','Gonorrhea Diagnosis Problem','DIBBs','dxtc');
+INSERT INTO valuesets VALUES('9_20240909','9','20240909','Gonorrhea Lab Organism','DIBBs','lotc');
+INSERT INTO valuesets VALUES('10_20240909','10','20240909','Gonorrhea Lab Result','DIBBs','lrtc');
 
 -- Missing Chlamydia valueset(s)
-INSERT INTO valuesets VALUES('11_20240910','11','20240910','Missing Chlamydia mrtc','DIBBs','mrtc');
-INSERT INTO valuesets VALUES('12_20240910','12','20240910','Missing Chlamydia lrtc','DIBBs','lrtc');
-INSERT INTO valuesets VALUES('13_20240910','13','20240910','Missing Chlamydia sdtc','DIBBs','sdtc');
+INSERT INTO valuesets VALUES('11_20240910','11','20240910','Chlamydia Medication','DIBBs','mrtc');
+INSERT INTO valuesets VALUES('12_20240910','12','20240910','Chlamydia Lab Result','DIBBs','lrtc');
+INSERT INTO valuesets VALUES('13_20240910','13','20240910','Suspected Chlamydia Diagnosis','DIBBs','sdtc');
 
 
 -- Newborn Screening concepts
@@ -56,8 +56,8 @@ INSERT INTO concepts VALUES('1_11350-6','11350-6','http://loinc.org','History of
 INSERT INTO concepts VALUES('1_82810-3','82810-3','http://loinc.org','Pregnancy status','828103','2024-09');
 INSERT INTO concepts VALUES('1_83317-8','83317-8','http://loinc.org','Sexual activity with anonymous partner in the past year','833178','2024-09');
 
-INSERT INTO concepts VALUES('1_82122','82122','https://www.nlm.nih.gov/research/umls/rxnorm','levofloxacin','82122','2024-09');
-INSERT INTO concepts VALUES('1_1649987','1649987','https://www.nlm.nih.gov/research/umls/rxnorm','doxycycline hyclate 100 MG','1649987','2024-09');
+INSERT INTO concepts VALUES('1_82122','82122','http://www.nlm.nih.gov/research/umls/rxnorm','levofloxacin','82122','2024-09');
+INSERT INTO concepts VALUES('1_1649987','1649987','http://www.nlm.nih.gov/research/umls/rxnorm','doxycycline hyclate 100 MG','1649987','2024-09');
 INSERT INTO concepts VALUES('1_72828-7','72828-7','http://loinc.org','Chlamydia trachomatis and Neisseria gonorrhoeae DNA panel - Specimen','728287','2024-09');
 INSERT INTO concepts VALUES('1_2339001','2339001','http://snomed.info/sct','Sexual overexposure','2339001','2024-09');
 
@@ -134,4 +134,3 @@ INSERT INTO valueset_to_concept VALUES('45309','13_20240910','1_2339001');
 
 
 COMMIT;
-

containers/tefca-viewer/src/app/constants.ts

@@ -314,6 +314,7 @@ export interface ValueSetItem {
   include: boolean;
   author: string;
   clinicalServiceType: string;
+  valueSetName: string;
 }
 
 /*Type to specify the expected expected types of valueset items that will be displayed 

containers/tefca-viewer/src/app/database-service.ts

@@ -5,7 +5,7 @@ import { ValueSetItem } from "./constants";
 import { QueryStruct } from "./demoQueries";
 
 const getQuerybyNameSQL = `
-select q.query_name, q.id, q.author, qtv.valueset_id, vs.type, qic.concept_id, qic.include, c.code, c.code_system, c.display 
+select q.query_name, q.id, qtv.valueset_id, vs.name as valueset_name, vs.author as author, vs.type, qic.concept_id, qic.include, c.code, c.code_system, c.display 
   from query q 
   left join query_to_valueset qtv on q.id = qtv.query_id 
   left join valuesets vs on qtv.valueset_id = vs.id
@@ -94,6 +94,7 @@ export const mapQueryRowsToValueSetItems = async (rows: QueryResultRow[]) => {
       system: r["code_system"],
       include: r["include"],
       author: r["author"],
+      valueSetName: r["valueset_name"],
       clinicalServiceType: r["type"],
     };
     return vsTranslation;