updated pickle cache

Author: SFJohnson24

cdisc_rules_engine/services/cache/cache_populator_service.py

@@ -311,14 +311,31 @@ async def _async_get_rules_by_catalog(self, catalog_link: str) -> List[dict]:
 
     async def _get_codelist_term_maps(self) -> List[dict]:
         """
-        For each CT package in CDISC library,
-        generate a map of codelist to codelist term. Ex:
+        For each CT package in CDISC library, creates mapping with:
+        1. Submission value lookup: Map of submission values to codelist/term IDs
+        2. Full codelist data: Complete metadata and terms keyed by codelist ID
         {
-            "package": "sdtmct-2021-12-17"
-            "C123": {
-                "extensible": True,
-                "allowed_terms": ["TEST", "HOUR"]
-            }
+            "package": "adamct-2024-03-29",
+            "submission_lookup": {
+                "GAD02PC": {"codelist": "C172334", "term": "N/A"},     # this is at codelist level
+                "GAD02TS": {"codelist": "C172334", "term": "C172451"}, # this is at term level
+            "C172334": {
+            "definition": "A parameter code codelist for the Generalized Anxiety Disorder - 7 Version 2 Questionnaire
+            (GAD-7 V2) to support the calculation of total score in ADaM.",
+            "extensible": False,
+            "name": "Generalized Anxiety Disorder - 7 Version 2 Questionnaire Parameter Code",
+            "preferredTerm": "CDISC ADaM Generalized Anxiety Disorder-7 Version 2 Questionnaire Parameter
+            Code Terminology",
+            "submissionValue": "GAD02PC",
+            "synonyms": ["Generalized Anxiety Disorder - 7 Version 2 Questionnaire Parameter Code"],
+            "terms": [{
+                "conceptId": "C172451",
+                "definition": "Generalized Anxiety Disorder - 7 Version 2 - Total score used for analysis.",
+                "preferredTerm": "Generalized Anxiety Disorder - 7 Version 2 - Total Score for Analysis",
+                "submissionValue": "GAD02TS",
+                "synonyms": ["GAD02-Total Score - Analysis"],
+                "extensible": False
+        }]
         }
         """
         packages = self.library_service.get_all_ct_packages()

cdisc_rules_engine/services/cdisc_library_service.py

@@ -134,20 +134,38 @@ def get_all_analysis_ig_standards(self) -> List[dict]:
     def get_codelist_terms_map(self, package_version: str) -> dict:
         uri = f"/mdr/ct/packages/{package_version}"
         package = self._client.get_api_json(uri)
-        codelist_map = {"package": package_version}
+        codelist_map = {"package": package_version, "submission_lookup": {}}
         for codelist in package.get("codelists"):
-            terms_map = {
+            codelist_id = codelist.get("conceptId")
+            codelist_map[codelist_id] = {
+                "definition": codelist.get("definition"),
                 "extensible": codelist.get("extensible", "").lower() == "true",
+                "name": codelist.get("name"),
+                "preferredTerm": codelist.get("preferredTerm"),
+                "submissionValue": codelist.get("submissionValue"),
+                "synonyms": codelist.get("synonyms", []),
                 "terms": [],
             }
+            codelist_map["submission_lookup"][codelist.get("submissionValue")] = {
+                "codelist": codelist_id,
+                "term": "N/A",
+            }
             for term in codelist.get("terms", []):
+                term_id = term.get("conceptId")
                 term_info = {
+                    "conceptId": term_id,
+                    "definition": term.get("definition"),
                     "preferredTerm": term.get("preferredTerm"),
                     "submissionValue": term.get("submissionValue"),
                     "synonyms": term.get("synonyms", []),
+                    "extensible": codelist.get("extensible", "").lower() == "true",
                 }
-                terms_map["terms"].append(term_info)
-            codelist_map[codelist.get("conceptId")] = terms_map
+                codelist_map[codelist_id]["terms"].append(term_info)
+                if term.get("submissionValue"):
+                    codelist_map["submission_lookup"][term["submissionValue"]] = {
+                        "codelist": codelist_id,
+                        "term": term_id,
+                    }
         return codelist_map
 
     def get_variable_codelists_map(self, standard_type: str, version: str) -> dict: