research_protocol_config

clinicedc · Jan 26, 2024 · a56dbbe · a56dbbe
1 parent 7fea412
commit a56dbbe
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/edc_identifier/research_identifier.py b/edc_identifier/research_identifier.py
@@ -4,7 +4,7 @@
 from typing import TYPE_CHECKING, Optional
 
 from django.apps import apps as django_apps
-from edc_protocol import Protocol
+from edc_protocol.research_protocol_config import ResearchProtocolConfig
 
 from .checkdigit_mixins import LuhnMixin
 from .exceptions import IdentifierError
@@ -48,7 +48,7 @@ def __init__(
         self.template = template or self.template
         app_config = django_apps.get_app_config("edc_device")
         self.device_id = device_id or app_config.device_id
-        self.protocol_number = protocol_number or Protocol().protocol_number
+        self.protocol_number = protocol_number or ResearchProtocolConfig().protocol_number
         self.site = site or django_apps.get_model("sites.site").objects.get_current()
         if identifier:
             # load an existing identifier

diff --git a/edc_identifier/utils.py b/edc_identifier/utils.py
@@ -1,7 +1,7 @@
 import re
 import secrets
 
-from edc_protocol import Protocol
+from edc_protocol.research_protocol_config import ResearchProtocolConfig
 
 from .exceptions import SubjectIdentifierError
 
@@ -15,14 +15,16 @@ def is_subject_identifier_or_raise(subject_identifier, reference_obj=None, raise
       `raise_on_none` is `True`.
     """
     if subject_identifier or raise_on_none:
-        if not re.match(Protocol().subject_identifier_pattern, subject_identifier or ""):
+        if not re.match(
+            ResearchProtocolConfig().subject_identifier_pattern, subject_identifier or ""
+        ):
             reference_msg = ""
             if reference_obj:
                 reference_msg = f"See {repr(reference_obj)}. "
             raise SubjectIdentifierError(
                 f"Invalid format for subject identifier. {reference_msg}"
                 f"Got `{subject_identifier or ''}`. "
-                f"Expected pattern `{Protocol().subject_identifier_pattern}`"
+                f"Expected pattern `{ResearchProtocolConfig().subject_identifier_pattern}`"
             )
     return subject_identifier