require site_id

Author: erikvw

edc_consent/__init__.py

@@ -1,20 +1 @@
-from importlib.metadata import version
-
-__version__ = version("edc_consent")
-__all__ = [
-    "site_consents",
-    "ConsentDefinitionDoesNotExist",
-    "ConsentDefinitionError",
-    "ConsentError",
-    "ConsentVersionSequenceError",
-    "NotConsentedError",
-]
-
-from .exceptions import (
-    ConsentDefinitionDoesNotExist,
-    ConsentDefinitionError,
-    ConsentError,
-    ConsentVersionSequenceError,
-    NotConsentedError,
-)
 from .site_consents import site_consents

edc_consent/form_validators/consent_definition_form_validator_mixin.py

@@ -6,13 +6,14 @@
 from edc_form_validators import INVALID_ERROR
 from edc_sites.site import sites as site_sites
 
-from edc_consent import ConsentDefinitionDoesNotExist, site_consents
 from edc_consent.consent_definition import ConsentDefinition
 from edc_consent.exceptions import (
+    ConsentDefinitionDoesNotExist,
     ConsentDefinitionNotConfiguredForUpdate,
     NotConsentedError,
     SiteConsentError,
 )
+from edc_consent.site_consents import site_consents
 
 
 class ConsentDefinitionFormValidatorMixin:
@@ -47,7 +48,7 @@ def get_consent_or_raise(
         error_code = error_code or INVALID_ERROR
         try:
             consent_obj = site_consents.get_consent_or_raise(
-                subject_identifier=self.subject_consent, report_datetime=report_datetime
+                subject_identifier=self.subject_identifier, report_datetime=report_datetime
             )
         except (NotConsentedError, ConsentDefinitionNotConfiguredForUpdate) as e:
             self.raise_validation_error({fldname: str(e)}, error_code)

edc_consent/modelform_mixins/requires_consent_modelform_mixin.py

@@ -29,7 +29,7 @@ def clean(self):
         return cleaned_data
 
     def validate_against_dob(self, consent_obj):
-        if to_utc(self.report_datetime).date() < consent_obj.dob:
+        if consent_obj and to_utc(self.report_datetime).date() < consent_obj.dob:
             dte_str = formatted_date(consent_obj.dob)
             raise forms.ValidationError(f"Report datetime cannot be before DOB. Got {dte_str}")
 

edc_consent/site_consents.py

@@ -115,7 +115,7 @@ def get_consent_or_raise(
         self,
         subject_identifier: str,
         report_datetime: datetime,
-        site_id: int,
+        site_id: int | None = None,
         raise_if_not_consented: bool | None = None,
     ):
         """Returns a subject consent using this consent_definition's
@@ -133,10 +133,12 @@ def get_consent_or_raise(
         raise_if_not_consented = (
             True if raise_if_not_consented is None else raise_if_not_consented
         )
-        single_site = site_sites.get(site_id)
+
+        single_site = site_sites.get(site_id) if site_id else None
         cdef = self.get_consent_definition(report_datetime=report_datetime, site=single_site)
         consent_obj = cdef.get_consent_for(
-            subject_identifier, raise_if_not_consented=raise_if_not_consented
+            subject_identifier=subject_identifier,
+            raise_if_not_consented=raise_if_not_consented,
         )
         if consent_obj and report_datetime < consent_obj.consent_datetime:
             if not cdef.updates:

edc_consent/system_checks.py

@@ -1,7 +1,7 @@
 from django.core.checks import CheckMessage, Error, Warning
 
-from . import ConsentDefinitionError
 from .consent_definition import ConsentDefinition
+from .exceptions import ConsentDefinitionError
 from .site_consents import site_consents