clinicedc 2.0.7__py3-none-any.whl → 2.0.8__py3-none-any.whl

{clinicedc-2.0.7.dist-info → clinicedc-2.0.8.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: uv 0.8.17
+Generator: uv 0.8.18
 Root-Is-Purelib: true
 Tag: py3-none-any

edc_action_item/auths.py

@@ -15,39 +15,44 @@ from .auth_objects import (
     navbar_tuples,
 )
 
-site_auths.add_post_update_func(
-    "edc_action_item",
-    remove_default_model_permissions_from_edc_permissions,
-)
 
-site_auths.add_custom_permissions_tuples(
-    model="edc_action_item.edcpermissions", codename_tuples=navbar_tuples
-)
+def update_site_auths():
 
-site_auths.add_group(*action_items_codenames, name=ACTION_ITEM)
-site_auths.add_group(*action_items_codenames, name=ACTION_ITEM_VIEW_ONLY, view_only=True)
-site_auths.add_group(
-    "edc_action_item.export_actionitem",
-    "edc_action_item.export_actiontype",
-    "edc_action_item.export_historicalactionitem",
-    name=ACTION_ITEM_EXPORT,
-)
+    site_auths.add_post_update_func(
+        "edc_action_item",
+        remove_default_model_permissions_from_edc_permissions,
+    )
 
-site_auths.add_custom_permissions_tuples(
-    model="edc_action_item.historicalactionitem",
-    codename_tuples=[
-        (
-            "edc_action_item.export_historicalactionitem",
-            "Cane export historicalactionitem",
-        ),
-        (
-            "edc_action_item.export_historicalreference",
-            "Cane export historicalreference",
-        ),
-    ],
-)
+    site_auths.add_custom_permissions_tuples(
+        model="edc_action_item.edcpermissions", codename_tuples=navbar_tuples
+    )
+
+    site_auths.add_group(*action_items_codenames, name=ACTION_ITEM)
+    site_auths.add_group(*action_items_codenames, name=ACTION_ITEM_VIEW_ONLY, view_only=True)
+    site_auths.add_group(
+        "edc_action_item.export_actionitem",
+        "edc_action_item.export_actiontype",
+        "edc_action_item.export_historicalactionitem",
+        name=ACTION_ITEM_EXPORT,
+    )
+
+    site_auths.add_custom_permissions_tuples(
+        model="edc_action_item.historicalactionitem",
+        codename_tuples=[
+            (
+                "edc_action_item.export_historicalactionitem",
+                "Cane export historicalactionitem",
+            ),
+            (
+                "edc_action_item.export_historicalreference",
+                "Cane export historicalreference",
+            ),
+        ],
+    )
+
+    site_auths.update_role(ACTION_ITEM, name=CLINICIAN_ROLE)
+    site_auths.update_role(ACTION_ITEM, name=NURSE_ROLE)
+    site_auths.update_role(ACTION_ITEM, name=CLINICIAN_SUPER_ROLE)
+    site_auths.update_role(ACTION_ITEM_VIEW_ONLY, name=AUDITOR_ROLE)
 
-site_auths.update_role(ACTION_ITEM, name=CLINICIAN_ROLE)
-site_auths.update_role(ACTION_ITEM, name=NURSE_ROLE)
-site_auths.update_role(ACTION_ITEM, name=CLINICIAN_SUPER_ROLE)
-site_auths.update_role(ACTION_ITEM_VIEW_ONLY, name=AUDITOR_ROLE)
+update_site_auths()

edc_action_item/models/action_model_mixin.py

@@ -113,8 +113,7 @@ class ActionNoManagersModelMixin(models.Model):
     def natural_key(self: Any) -> tuple:
         return (self.action_identifier,)
 
-    # noinspection PyTypeHints
-    natural_key.dependencies = ["edc_action_item.actionitem"]  # type:ignore
+    natural_key.dependencies = ("edc_action_item.actionitem",)
 
     @classmethod
     def get_action_cls(cls) -> type[Action]:

edc_action_item/models/signals.py

@@ -97,18 +97,17 @@ def action_on_reference_model_post_delete(sender, instance: Any, using, **kwargs
                 raise
         else:
             reset_and_delete_action_item(instance, using)
-    elif isinstance(instance, ActionItem):
-        if instance.parent_action_item:
-            try:
-                parent_reference_obj = instance.parent_reference_obj
-            except ObjectDoesNotExist:
-                pass
-            else:
-                parent_reference_obj.action_item.action_cls(
-                    action_item=instance.parent_reference_obj.action_item,
-                    subject_identifier=instance.subject_identifier,
-                    using=using,
-                ).create_next_action_items()
+    elif isinstance(instance, ActionItem) and instance.parent_action_item:
+        try:
+            parent_reference_obj = instance.parent_reference_obj
+        except ObjectDoesNotExist:
+            pass
+        else:
+            parent_reference_obj.action_item.action_cls(
+                action_item=instance.parent_reference_obj.action_item,
+                subject_identifier=instance.subject_identifier,
+                using=using,
+            ).create_next_action_items()
 
 
 @receiver(
@@ -126,15 +125,15 @@ def action_item_notification_on_post_create_historical_record(
     if (
         site_notifications.loaded
         and instance._meta.label_lower == "edc_action_item.actionitem"
+        and instance.status != CLOSED
     ):
-        if instance.status != CLOSED:
-            opts = dict(
-                instance=instance,
-                user=instance.user_modified or instance.user_created,
-                history_date=history_date,
-                history_user=history_user,
-                history_change_reason=history_change_reason,
-                fail_silently=True,
-                **kwargs,
-            )
-            site_notifications.notify(**opts)
+        opts = dict(
+            instance=instance,
+            user=instance.user_modified or instance.user_created,
+            history_date=history_date,
+            history_user=history_user,
+            history_change_reason=history_change_reason,
+            fail_silently=True,
+            **kwargs,
+        )
+        site_notifications.notify(**opts)

edc_action_item/site_action_items.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import contextlib
 import copy
 import sys
 from dataclasses import InitVar, dataclass, field
@@ -26,7 +27,7 @@ if TYPE_CHECKING:
     from .action_with_notification import ActionWithNotification
 
 
-class AlreadyRegistered(Exception):
+class AlreadyRegistered(Exception):  # noqa: N818
     pass
 
 
@@ -84,10 +85,8 @@ class SiteActionItemCollection:
                 model=action_cls.get_reference_model(),
                 url_namespace=action_cls.admin_site_name,
             )
-            try:
+            with contextlib.suppress(PrnAlreadyRegistered):
                 site_prn_forms.register(prn)
-            except PrnAlreadyRegistered:
-                pass
         try:
             action_cls.notification_email_to
         except AttributeError:
@@ -103,10 +102,8 @@ class SiteActionItemCollection:
         See edc_notification.
         """
         if action_cls.notification_cls():
-            try:
+            with contextlib.suppress(NotificationAlreadyRegistered):
                 site_notifications.register(action_cls.notification_cls())
-            except NotificationAlreadyRegistered:
-                pass
 
     @property
     def all(self) -> dict[str, type[Action] | type[ActionWithNotification]]:
@@ -129,12 +126,11 @@ class SiteActionItemCollection:
         return None
 
     def get_add_actions_to_show(self) -> dict[str, type[Action]]:
-        actions = {
+        return {
             action_cls.name: action_cls
             for action_cls in self.registry.values()
             if action_cls.show_link_to_add
         }
-        return actions
 
     def create_or_update_action_types(self) -> None:
         """Populates the ActionType model."""

edc_action_item/utils.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+import contextlib
+
 from django.apps import apps as django_apps
 from django.core.exceptions import ObjectDoesNotExist
 from tqdm import tqdm
@@ -68,10 +70,8 @@ def reset_and_delete_action_item(instance, using=None):
 
 def register_actions(*action_cls):
     for cls in action_cls:
-        try:
+        with contextlib.suppress(AlreadyRegistered):
             site_action_items.register(cls)
-        except AlreadyRegistered:
-            pass
 
 
 def get_reference_obj(action_item: ActionItem | None):

edc_adverse_event/auths.py

@@ -17,65 +17,69 @@ from .auth_objects import (
 )
 from .constants import AE, AE_REVIEW, AE_ROLE, AE_SUPER, TMG, TMG_REVIEW, TMG_ROLE
 
-site_auths.add_post_update_func(
-    "edc_adverse_event", remove_default_model_permissions_from_edc_permissions
-)
 
-permissions_model = "edc_adverse_event.edcpermissions"
+def update_site_auths():
+    site_auths.add_post_update_func(
+        "edc_adverse_event", remove_default_model_permissions_from_edc_permissions
+    )
 
-# custom perms
-site_auths.add_custom_permissions_tuples(
-    model=permissions_model, codename_tuples=ae_dashboard_tuples
-)
-site_auths.add_custom_permissions_tuples(
-    model=permissions_model, codename_tuples=tmg_dashboard_tuples
-)
+    permissions_model = "edc_adverse_event.edcpermissions"
 
-site_auths.add_custom_permissions_tuples(
-    model=permissions_model, codename_tuples=tmg_navbar_tuples
-)
-site_auths.add_custom_permissions_tuples(
-    model=permissions_model, codename_tuples=ae_navbar_tuples
-)
+    # custom perms
+    site_auths.add_custom_permissions_tuples(
+        model=permissions_model, codename_tuples=ae_dashboard_tuples
+    )
+    site_auths.add_custom_permissions_tuples(
+        model=permissions_model, codename_tuples=tmg_dashboard_tuples
+    )
 
-# groups
-site_auths.add_group(*ae_codenames, name=AE, no_delete=True)
-site_auths.update_group(
-    *[c[0] for c in ae_dashboard_tuples], *[c[0] for c in ae_navbar_tuples], name=AE
-)
+    site_auths.add_custom_permissions_tuples(
+        model=permissions_model, codename_tuples=tmg_navbar_tuples
+    )
+    site_auths.add_custom_permissions_tuples(
+        model=permissions_model, codename_tuples=ae_navbar_tuples
+    )
 
-site_auths.add_group(*ae_codenames, name=AE_SUPER)
-site_auths.update_group(
-    *[c[0] for c in ae_dashboard_tuples],
-    *[c[0] for c in ae_navbar_tuples],
-    name=AE_SUPER,
-)
+    # groups
+    site_auths.add_group(*ae_codenames, name=AE, no_delete=True)
+    site_auths.update_group(
+        *[c[0] for c in ae_dashboard_tuples], *[c[0] for c in ae_navbar_tuples], name=AE
+    )
 
-site_auths.add_group(*ae_codenames, name=AE_REVIEW, view_only=True)
-site_auths.update_group(
-    *[c[0] for c in ae_dashboard_tuples],
-    *[c[0] for c in ae_navbar_tuples],
-    name=AE_REVIEW,
-)
+    site_auths.add_group(*ae_codenames, name=AE_SUPER)
+    site_auths.update_group(
+        *[c[0] for c in ae_dashboard_tuples],
+        *[c[0] for c in ae_navbar_tuples],
+        name=AE_SUPER,
+    )
 
-site_auths.add_group(*tmg_codenames, name=TMG)
-site_auths.update_group(
-    *[c[0] for c in tmg_dashboard_tuples], *[c[0] for c in tmg_navbar_tuples], name=TMG
-)
+    site_auths.add_group(*ae_codenames, name=AE_REVIEW, view_only=True)
+    site_auths.update_group(
+        *[c[0] for c in ae_dashboard_tuples],
+        *[c[0] for c in ae_navbar_tuples],
+        name=AE_REVIEW,
+    )
 
-site_auths.add_group(*tmg_codenames, name=TMG_REVIEW, view_only=True)
-site_auths.update_group(
-    *[c[0] for c in tmg_dashboard_tuples],
-    *[c[0] for c in tmg_navbar_tuples],
-    name=TMG_REVIEW,
-)
+    site_auths.add_group(*tmg_codenames, name=TMG)
+    site_auths.update_group(
+        *[c[0] for c in tmg_dashboard_tuples], *[c[0] for c in tmg_navbar_tuples], name=TMG
+    )
+
+    site_auths.add_group(*tmg_codenames, name=TMG_REVIEW, view_only=True)
+    site_auths.update_group(
+        *[c[0] for c in tmg_dashboard_tuples],
+        *[c[0] for c in tmg_navbar_tuples],
+        name=TMG_REVIEW,
+    )
+
+    # add roles
+    site_auths.add_role(AE, name=AE_ROLE)
+    site_auths.add_role(AE_REVIEW, TMG, name=TMG_ROLE)
 
-# add roles
-site_auths.add_role(AE, name=AE_ROLE)
-site_auths.add_role(AE_REVIEW, TMG, name=TMG_ROLE)
+    site_auths.update_role(AE, name=CLINICIAN_ROLE)
+    site_auths.update_role(AE, name=NURSE_ROLE)
+    site_auths.update_role(AE_REVIEW, TMG_REVIEW, name=AUDITOR_ROLE)
+    site_auths.update_role(AE_SUPER, name=CLINICIAN_SUPER_ROLE)
 
 
-site_auths.update_role(AE, name=CLINICIAN_ROLE)
-site_auths.update_role(AE, name=NURSE_ROLE)
-site_auths.update_role(AE_REVIEW, TMG_REVIEW, name=AUDITOR_ROLE)
-site_auths.update_role(AE_SUPER, name=CLINICIAN_SUPER_ROLE)
+update_site_auths()

edc_adverse_event/model_mixins/ae_tmg/ae_tmg_methods_model_mixin.py

@@ -18,8 +18,6 @@ class AeTmgMethodsModelMixin(models.Model):
     def get_action_item_reason(self):
         return self.ae_initial.ae_description
 
-    def get_search_slug_fields(self):
+    def get_search_slug_fields(self) -> tuple[str]:
         fields = super().get_search_slug_fields()
-        fields.append("subject_identifier")
-        fields.append("report_status")
-        return fields
+        return *fields, "subject_identifier", "report_status"

edc_appointment/auths.py

@@ -8,17 +8,21 @@ from edc_auth.site_auths import site_auths
 
 from .auth_objects import APPOINTMENT, APPOINTMENT_EXPORT, APPOINTMENT_VIEW, codenames
 
-site_auths.add_group(*codenames, name=APPOINTMENT_VIEW, view_only=True)
 
-site_auths.add_group(*codenames, name=APPOINTMENT)
+def update_site_auths():
+    site_auths.add_group(*codenames, name=APPOINTMENT_VIEW, view_only=True)
 
-site_auths.add_group(
-    "edc_appointment.export_appointment",
-    name=APPOINTMENT_EXPORT,
-)
+    site_auths.add_group(*codenames, name=APPOINTMENT)
+
+    site_auths.add_group(
+        "edc_appointment.export_appointment",
+        name=APPOINTMENT_EXPORT,
+    )
+
+    site_auths.update_role(APPOINTMENT, name=CLINICIAN_ROLE)
+    site_auths.update_role(APPOINTMENT, name=NURSE_ROLE)
+    site_auths.update_role(APPOINTMENT_VIEW, name=AUDITOR_ROLE)
+    site_auths.update_role(APPOINTMENT, name=CLINICIAN_SUPER_ROLE)
 
 
-site_auths.update_role(APPOINTMENT, name=CLINICIAN_ROLE)
-site_auths.update_role(APPOINTMENT, name=NURSE_ROLE)
-site_auths.update_role(APPOINTMENT_VIEW, name=AUDITOR_ROLE)
-site_auths.update_role(APPOINTMENT, name=CLINICIAN_SUPER_ROLE)
+update_site_auths()

edc_appointment/creators/appointment_creator.py

@@ -215,7 +215,7 @@ class AppointmentCreator:
                 raise CreateAppointmentDateError(
                     f"{e} Visit={self.visit!r}. "
                     f"Try setting 'best_effort_available_datetime=True' on facility."
-                )
+                ) from e
         else:
             return self.suggested_datetime
         return arw.datetime

edc_appointment/creators/appointments_creator.py

@@ -85,7 +85,7 @@ class AppointmentsCreator:
             except FacilityError as e:
                 raise CreateAppointmentError(
                     f"{e} See {visit!r}. Got facility_name={visit.facility_name}"
-                )
+                ) from e
             appointment = self.update_or_create_appointment(
                 visit=visit,
                 taken_datetimes=taken_datetimes,

edc_appointment/model_mixins/appointment_methods_model_mixin.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import contextlib
 from typing import TYPE_CHECKING, TypeVar
 
 from django.core.exceptions import ObjectDoesNotExist
@@ -154,10 +155,8 @@ class AppointmentMethodsModelMixin(models.Model):
     def related_visit(self: Appointment) -> VisitModel | None:
         """Returns the related visit model for the current instance."""
         related_visit = None
-        try:
+        with contextlib.suppress(ObjectDoesNotExist):
             related_visit = getattr(self, self.related_visit_model_attr())
-        except ObjectDoesNotExist:
-            pass
         return related_visit
 
     @property

edc_appointment/model_mixins/appointment_model_mixin.py

@@ -87,7 +87,7 @@ class AppointmentModelMixin(
                         "Subject is not on a schedule. Using subject_identifier="
                         f"`{self.subject_identifier}` and appt_datetime=`{dte_as_str}`."
                         f"Got {e}"
-                    )
+                    ) from e
                 if self.appt_datetime > onschedule_obj.onschedule_datetime:
                     # update appointment timepoints
                     schedule.put_on_schedule(
@@ -122,33 +122,36 @@ class AppointmentModelMixin(
         return self.pk
 
     def validate_appt_datetime_not_before_previous(self) -> None:
-        if self.appt_status != CANCELLED_APPT and self.appt_datetime:
-            if (
-                self.relative_previous
-                and self.appt_datetime <= self.relative_previous.appt_datetime
-            ):
-                appt_datetime = formatted_datetime(self.appt_datetime)
-                previous_appt_datetime = formatted_datetime(
-                    self.relative_previous.appt_datetime
-                )
-                raise AppointmentDatetimeError(
-                    "Datetime cannot be on or before previous appointment datetime. "
-                    f"Got {appt_datetime} <= {previous_appt_datetime}. "
-                    f"See appointment `{self}` and "
-                    f"`{self.relative_previous}`."
-                )
+        if (
+            self.appt_status != CANCELLED_APPT
+            and self.appt_datetime
+            and self.relative_previous
+            and self.appt_datetime <= self.relative_previous.appt_datetime
+        ):
+            appt_datetime = formatted_datetime(self.appt_datetime)
+            previous_appt_datetime = formatted_datetime(self.relative_previous.appt_datetime)
+            raise AppointmentDatetimeError(
+                "Datetime cannot be on or before previous appointment datetime. "
+                f"Got {appt_datetime} <= {previous_appt_datetime}. "
+                f"See appointment `{self}` and "
+                f"`{self.relative_previous}`."
+            )
 
     def validate_appt_datetime_not_after_next(self) -> None:
-        if self.appt_status != CANCELLED_APPT and self.appt_datetime and self.relative_next:
-            if self.appt_datetime >= self.relative_next.appt_datetime:
-                appt_datetime = formatted_datetime(self.appt_datetime)
-                next_appt_datetime = formatted_datetime(self.relative_next.appt_datetime)
-                raise AppointmentDatetimeError(
-                    "Datetime cannot be on or after next appointment datetime. "
-                    f"Got {appt_datetime} >= {next_appt_datetime}. "
-                    f"See appointment `{self}` and "
-                    f"`{self.relative_next}`."
-                )
+        if (
+            self.appt_status != CANCELLED_APPT
+            and self.appt_datetime
+            and self.relative_next
+            and self.appt_datetime >= self.relative_next.appt_datetime
+        ):
+            appt_datetime = formatted_datetime(self.appt_datetime)
+            next_appt_datetime = formatted_datetime(self.relative_next.appt_datetime)
+            raise AppointmentDatetimeError(
+                "Datetime cannot be on or after next appointment datetime. "
+                f"Got {appt_datetime} >= {next_appt_datetime}. "
+                f"See appointment `{self}` and "
+                f"`{self.relative_next}`."
+            )
 
     @property
     def title(self: Appointment) -> str:
@@ -171,7 +174,7 @@ class AppointmentModelMixin(
 
     class Meta(NonUniqueSubjectIdentifierFieldMixin.Meta):
         abstract = True
-        constraints = [
+        constraints = (
             UniqueConstraint(
                 fields=[
                     "subject_identifier",
@@ -192,7 +195,7 @@ class AppointmentModelMixin(
                 ],
                 name="unique_%(app_label)s_%(class)s_200",
             ),
-        ]
+        )
         indexes = (
             models.Index(fields=["appt_datetime"]),
             models.Index(fields=["appt_status"]),

edc_appointment/models/appointment.py

@@ -23,7 +23,7 @@ class Appointment(AppointmentModelMixin, SiteModelMixin, BaseUuidModel):
         )
 
     # noinspection PyTypeHints
-    natural_key.dependencies = ["sites.Site"]  # type: ignore
+    natural_key.dependencies = ("sites.Site",)
 
     class Meta(AppointmentModelMixin.Meta, SiteModelMixin.Meta, BaseUuidModel.Meta):
         indexes = (*AppointmentModelMixin.Meta.indexes, *BaseUuidModel.Meta.indexes)

edc_appointment/utils.py

@@ -80,7 +80,7 @@ class AppointmentDateWindowPeriodGapError(Exception):
     pass
 
 
-class AppointmentAlreadyStarted(Exception):
+class AppointmentAlreadyStarted(Exception):  # noqa: N818
     pass
 
 
@@ -157,10 +157,9 @@ def raise_on_appt_may_not_be_missed(
 
 
 def get_appointment_form_meta_options() -> dict:
-    options = getattr(
+    return getattr(
         settings, "EDC_APPOINTMENT_FORM_META_OPTIONS", dict(labels={}, help_texts={})
     )
-    return options
 
 
 def get_appt_reason_choices() -> tuple[str, ...]:
@@ -516,11 +515,11 @@ def raise_on_appt_datetime_not_in_window(
         except ScheduledVisitWindowError as e:
             msg = str(e)
             msg.replace("Invalid datetime", "Invalid appointment datetime (S)")
-            raise AppointmentWindowError(msg)
+            raise AppointmentWindowError(msg) from e
         except UnScheduledVisitWindowError as e:
             msg = str(e)
             msg.replace("Invalid datetime", "Invalid appointment datetime (U)")
-            raise AppointmentWindowError(msg)
+            raise AppointmentWindowError(msg) from e
 
 
 def get_window_gap_days(appointment) -> int:
@@ -623,7 +622,7 @@ def get_appointment_by_datetime(
             raise_on_appt_datetime_not_in_window(
                 appointment, appt_datetime=suggested_appt_datetime
             )
-        except AppointmentWindowError:
+        except AppointmentWindowError as e:
             in_gap = appt_datetime_in_gap(appointment, suggested_appt_datetime)
             in_next_window_adjusted = appt_datetime_in_next_window_adjusted_for_gap(
                 appointment, suggested_appt_datetime
@@ -635,7 +634,7 @@ def get_appointment_by_datetime(
                 raise AppointmentDateWindowPeriodGapError(
                     f"Date falls in a `window period gap` between {appointment.visit_code} "
                     f"and {appointment.next.visit_code}. Got {dt}."
-                )
+                ) from e
             if (
                 in_gap
                 and in_next_window_adjusted
@@ -674,7 +673,7 @@ def reset_appointment(appointment: Appointment, **kwargs):
         appt_status=appointment._meta.get_field("appt_status").default,
         appt_timing=appointment._meta.get_field("appt_timing").default,
         appt_type=None,
-        appt_type_other=None,
+        appt_type_other="",
         appt_datetime=appointment.timepoint_datetime,
         comment="",
     )
@@ -705,7 +704,7 @@ def skip_appointment(appointment: Appointment, comment: str | None = None):
         appt_status=SKIPPED_APPT,
         appt_timing=NOT_APPLICABLE,
         appt_type=NOT_APPLICABLE,
-        comment=comment,
+        comment=comment or "",
     )
 
 
@@ -722,11 +721,6 @@ def get_unscheduled_appointment_url(appointment: Appointment = None) -> str:
         visit_code_sequence=appointment.visit_code_sequence + 1,
         timepoint=appointment.timepoint,
     )
-    # if appointment := (
-    #     appointment.__class__.objects.filter(visit_code_sequence__gt=0, **kwargs)
-    #     .order_by("visit_code_sequence")
-    #     .last()
-    # ):
     kwargs.update(visit_code_sequence=str(appointment.visit_code_sequence + 1))
     kwargs.update(redirect_url=dashboard_url)
     return reverse(unscheduled_appointment_url_name, kwargs=kwargs)
@@ -741,19 +735,18 @@ def update_appt_status_for_timepoint(related_visit: RelatedVisitModel) -> None:
         ):
             related_visit.appointment.appt_status = INCOMPLETE_APPT
             related_visit.appointment.save_base(update_fields=["appt_status"])
-    elif related_visit.appointment.appt_status == INCOMPLETE_APPT:
-        if (
-            not related_visit.metadata[CRF].filter(entry_status=REQUIRED).exists()
-            and not related_visit.metadata[REQUISITION].filter(entry_status=REQUIRED).exists()
-        ):
-            related_visit.appointment.appt_status = COMPLETE_APPT
-            related_visit.appointment.save_base(update_fields=["appt_status"])
+    elif related_visit.appointment.appt_status == INCOMPLETE_APPT and (
+        not related_visit.metadata[CRF].filter(entry_status=REQUIRED).exists()
+        and not related_visit.metadata[REQUISITION].filter(entry_status=REQUIRED).exists()
+    ):
+        related_visit.appointment.appt_status = COMPLETE_APPT
+        related_visit.appointment.save_base(update_fields=["appt_status"])
 
 
 def refresh_appointments(
-    subject_identifier: str = None,
-    visit_schedule_name: str = None,
-    schedule_name: str = None,
+    subject_identifier: str | None = None,
+    visit_schedule_name: str | None = None,
+    schedule_name: str | None = None,
     request: WSGIRequest | None = None,
     warn_only: bool | None = None,
 ) -> tuple[str, str]:
@@ -839,6 +832,8 @@ def validate_date_is_on_clinic_day(
             and calendar.weekday(appt_date.year, appt_date.month, appt_date.day)
             not in clinic_days
         ):
+
+            days_str = [day_abbr[d] for d in clinic_days]
             days_str = []
             for d in clinic_days:
                 days_str.append(day_abbr[d])