Merge pull request #893 from cdisc-org/CT_Pickle

updated codelist_term_map logic

Author: RamilCDISC

cdisc_rules_engine/rules_engine.py

@@ -239,6 +239,13 @@ def validate_rule(
         # Update rule for certain rule types
         # SPECIAL CASES FOR RULE TYPES ###############################
         # TODO: Handle these special cases better.
+        if self.library_metadata:
+            kwargs[
+                "variable_codelist_map"
+            ] = self.library_metadata.variable_codelist_map
+            kwargs[
+                "codelist_term_maps"
+            ] = self.library_metadata.get_all_ct_package_metadata()
         if rule.get("rule_type") == RuleTypes.DEFINE_ITEM_METADATA_CHECK.value:
             if self.library_metadata:
                 kwargs[

cdisc_rules_engine/services/cdisc_library_service.py

@@ -138,13 +138,15 @@ def get_codelist_terms_map(self, package_version: str) -> dict:
         for codelist in package.get("codelists"):
             terms_map = {
                 "extensible": codelist.get("extensible", "").lower() == "true",
+                "terms": [],
             }
-            allowed_values = []
             for term in codelist.get("terms", []):
-                allowed_values.append(term.get("preferredTerm"))
-                allowed_values.append(term.get("submissionValue"))
-                allowed_values.extend(term.get("synonyms", []))
-            terms_map["allowed_terms"] = allowed_values
+                term_info = {
+                    "preferredTerm": term.get("preferredTerm"),
+                    "submissionValue": term.get("submissionValue"),
+                    "synonyms": term.get("synonyms", []),
+                }
+                terms_map["terms"].append(term_info)
             codelist_map[codelist.get("conceptId")] = terms_map
         return codelist_map