(erikvw changes) convert screening_model to list, add

_filter_cdefs_by_screening_model_or_raise()

Author: JonathanWillitts

edc_consent/consent_definition.py

@@ -41,7 +41,7 @@ class ConsentDefinition:
     version: str = field(default="1", compare=False)
     updates: ConsentDefinition = field(default=None, compare=False)
     end_extends_on_update: bool = field(default=False, compare=False)
-    screening_model: str = field(default=None, compare=False)
+    screening_model: list[str] = field(default_factory=list, compare=False)
     age_min: int = field(default=18, compare=False)
     age_max: int = field(default=110, compare=False)
     age_is_adult: int = field(default=18, compare=False)
@@ -63,7 +63,7 @@ def __post_init__(self):
         self.sort_index = self.name
         self.gender = [MALE, FEMALE] if not self.gender else self.gender
         if not self.screening_model:
-            self.screening_model = get_subject_screening_model()
+            self.screening_model = [get_subject_screening_model()]
         if MALE not in self.gender and FEMALE not in self.gender:
             raise ConsentDefinitionError(f"Invalid gender. Got {self.gender}.")
         if not self.start.tzinfo:

edc_consent/site_consents.py

@@ -217,8 +217,8 @@ def get_consent_definitions(
         )
         cdefs = self.filter_cdefs_by_site_or_raise(site, cdefs, error_messages)
 
-        cdefs, error_msg = self._filter_cdefs_by_model_or_raise(
-            screening_model, cdefs, error_messages, attrname="screening_model"
+        cdefs, error_msg = self._filter_cdefs_by_screening_model_or_raise(
+            screening_model, cdefs, error_messages
         )
 
         # apply additional criteria
@@ -246,6 +246,33 @@ def _filter_cdefs_by_model_or_raise(
                 errror_messages.append(f"model={model}")
         return cdefs, errror_messages
 
+    @staticmethod
+    def _filter_cdefs_by_screening_model_or_raise(
+        model: str | None,
+        consent_definitions: list[ConsentDefinition],
+        errror_messages: list[str] = None,
+    ) -> tuple[list[ConsentDefinition], list[str]]:
+        cdefs = consent_definitions
+        if model:
+            cdefs = []
+            for cdef in consent_definitions:
+                if isinstance(cdef.screening_model, list):
+                    for screening_model in cdef.screening_model:
+                        if model == screening_model:
+                            if cdef not in cdefs:
+                                cdefs.append(cdef)
+                else:
+                    if model == cdef.screening_model:
+                        cdefs.append(cdef)
+            if not cdefs:
+                raise ConsentDefinitionDoesNotExist(
+                    "There are no consent definitions using this screening model."
+                    f"Got {model}."
+                )
+            else:
+                errror_messages.append(f"model={model}")
+        return cdefs, errror_messages
+
     def _filter_cdefs_by_report_datetime_or_raise(
         self,
         report_datetime: datetime | None,