clinicedc 2.0.33__py3-none-any.whl → 2.0.35__py3-none-any.whl

edc_appointment/form_validators/appointment_form_validator.py

@@ -17,8 +17,8 @@ from edc_form_validators import INVALID_ERROR
 from edc_form_validators.form_validator import FormValidator
 from edc_metadata.metadata_helper import MetadataHelperMixin
 from edc_sites.form_validator_mixin import SiteFormValidatorMixin
-from edc_utils import formatted_datetime, to_utc
 from edc_utils.date import to_local
+from edc_utils.text import formatted_datetime
 from edc_visit_schedule.site_visit_schedules import site_visit_schedules
 from edc_visit_schedule.subject_schedule import NotOnScheduleError
 from edc_visit_schedule.utils import get_onschedule_model_instance, is_baseline
@@ -219,11 +219,7 @@ class AppointmentFormValidator(
     def validate_not_future_appt_datetime(self: Any) -> None:
         appt_datetime = self.cleaned_data.get("appt_datetime")
         appt_status = self.cleaned_data.get("appt_status")
-        if (
-            appt_datetime
-            and appt_status != NEW_APPT
-            and to_utc(appt_datetime) > timezone.now()
-        ):
+        if appt_datetime and appt_status != NEW_APPT and appt_datetime > timezone.now():
             self.raise_validation_error(
                 {"appt_datetime": "Cannot be a future date/time."},
                 INVALID_APPT_DATE,
@@ -242,14 +238,12 @@ class AppointmentFormValidator(
             appt_datetime = self.cleaned_data.get("appt_datetime")
             appt_status = self.cleaned_data.get("appt_status")
             if appt_datetime and appt_status != NEW_APPT:
-                appt_datetime_utc = to_utc(appt_datetime)
                 consent_datetime = self.get_consent_datetime_or_raise(
-                    report_datetime=appt_datetime_utc,
-                    site=self.site,
-                    fldname="appt_datetime",
+                    reference_datetime=appt_datetime,
+                    reference_datetime_field="appt_datetime",
                     error_code=INVALID_APPT_DATE,
                 )
-                if appt_datetime_utc.date() < consent_datetime.date():
+                if to_local(appt_datetime).date() < to_local(consent_datetime).date():
                     formatted_date = formatted_datetime(
                         to_local(consent_datetime), format_as_date=True
                     )
@@ -283,11 +277,11 @@ class AppointmentFormValidator(
             )
         except AppointmentBaselineError as e:
             self.raise_validation_error(
-                {"appt_timing": str(e)}, INVALID_APPT_STATUS_AT_BASELINE
+                {"appt_timing": str(e)}, INVALID_APPT_STATUS_AT_BASELINE, exc=e
             )
         except UnscheduledAppointmentError as e:
             self.raise_validation_error(
-                {"appt_timing": str(e)}, INVALID_MISSED_APPT_NOT_ALLOWED
+                {"appt_timing": str(e)}, INVALID_MISSED_APPT_NOT_ALLOWED, exc=e
             )
 
         try:
@@ -299,14 +293,14 @@ class AppointmentFormValidator(
             )
         except AppointmentReasonUpdaterCrfsExistsError as e:
             self.raise_validation_error(
-                {"appt_timing": str(e)}, INVALID_APPT_TIMING_CRFS_EXIST
+                {"appt_timing": str(e)}, INVALID_APPT_TIMING_CRFS_EXIST, exc=e
             )
         except AppointmentReasonUpdaterRequisitionsExistsError as e:
             self.raise_validation_error(
-                {"appt_timing": str(e)}, INVALID_APPT_TIMING_REQUISITIONS_EXIST
+                {"appt_timing": str(e)}, INVALID_APPT_TIMING_REQUISITIONS_EXIST, exc=e
             )
         except AppointmentReasonUpdaterError as e:
-            self.raise_validation_error({"appt_timing": str(e)}, INVALID_APPT_TIMING)
+            self.raise_validation_error({"appt_timing": str(e)}, INVALID_APPT_TIMING, exc=e)
 
     def validate_appt_datetime_not_before_previous_appt_datetime(self):
         appt_datetime = self.cleaned_data.get("appt_datetime")
@@ -316,7 +310,7 @@ class AppointmentFormValidator(
             and appt_status
             and appt_status != NEW_APPT
             and self.instance.relative_previous
-            and to_utc(appt_datetime) < self.instance.relative_previous.appt_datetime
+            and appt_datetime < self.instance.relative_previous.appt_datetime
         ):
             formatted_date = formatted_datetime(self.instance.relative_previous.appt_datetime)
             self.raise_validation_error(
@@ -338,7 +332,7 @@ class AppointmentFormValidator(
             and appt_status
             and appt_status != NEW_APPT
             and self.instance.relative_next
-            and to_utc(appt_datetime) > self.instance.relative_next.appt_datetime
+            and appt_datetime > self.instance.relative_next.appt_datetime
         ):
             formatted_date = formatted_datetime(self.instance.relative_next.appt_datetime)
             self.raise_validation_error(
@@ -425,7 +419,7 @@ class AppointmentFormValidator(
                 {
                     "appt_status": format_html(
                         'Invalid. Not all <a href="{url}">required CRFs</a> have been keyed',
-                        url=mark_safe(url),  # nosec B703, B308
+                        url=mark_safe(url),  # nosec B703, B308  # noqa: S308
                     )
                 },
                 INVALID_APPT_STATUS,
@@ -443,7 +437,7 @@ class AppointmentFormValidator(
                             'Invalid. Not all <a href="{url}">required requisitions</a> '
                             "have been keyed"
                         ),
-                        url=mark_safe(url),  # nosec B703, B308
+                        url=mark_safe(url),  # nosec B703, B308  # noqa: S308
                     )
                 },
                 INVALID_APPT_STATUS,
@@ -599,12 +593,11 @@ class AppointmentFormValidator(
     def changelist_url(self: Any, model_name: str) -> Any:
         """Returns the model's changelist url with filter querystring"""
         url = reverse(f"edc_metadata_admin:edc_metadata_{model_name}_changelist")
-        url = (
+        return (
             f"{url}?q={self.subject_identifier}"
             f"&visit_code={self.instance.visit_code}"
             f"&visit_code_sequence={self.instance.visit_code_sequence}"
         )
-        return url
 
     def validate_subject_on_schedule(self: Any) -> None:
         if self.cleaned_data.get("appt_datetime"):
@@ -623,7 +616,7 @@ class AppointmentFormValidator(
                     subject_identifier=subject_identifier,
                     visit_schedule_name=self.instance.visit_schedule_name,
                     schedule_name=self.instance.schedule_name,
-                    reference_datetime=to_utc(appt_datetime),
+                    reference_datetime=appt_datetime,
                 )
             except NotOnScheduleError:
                 self.raise_validation_error(

edc_appointment/management/commands/close_appointments.py

@@ -18,7 +18,7 @@ def close_appointments():
             form.save(commit=False)
         except ValueError:
             obj.refresh_from_db()
-            print(
+            print(  # noqa: T201
                 obj.subject_identifier,
                 obj.visit_code,
                 obj.visit_code_sequence,
@@ -42,7 +42,7 @@ def close_appointments():
             pass
         else:
             obj.refresh_from_db()
-            print(
+            print(  # noqa: T201
                 obj.subject_identifier,
                 obj.visit_code,
                 obj.visit_code_sequence,
@@ -52,5 +52,5 @@ def close_appointments():
 
 
 class Command(BaseCommand):
-    def handle(self, *args, **options):
+    def handle(self, *args, **options):  # noqa: ARG002
         close_appointments()

edc_appointment/management/commands/reset_visit_code_sequences.py

@@ -14,7 +14,7 @@ class Command(BaseCommand):
         "and reset if needed."
     )
 
-    def handle(self, *args, **options):
+    def handle(self, *args, **options):  # noqa: ARG002
         sys.stdout.write(
             "Validating (and resetting, if needed) appointment visit code sequences ...\n"
         )

edc_appointment/management/commands/update_appointment_status.py

@@ -8,9 +8,9 @@ from edc_appointment.utils import update_appt_status
 class Command(BaseCommand):
     help = "Update appointment status for all appointments"
 
-    def handle(self, *args, **options) -> None:
+    def handle(self, *args, **options) -> None:  # noqa: ARG002
         appointments = Appointment.objects.all().order_by("subject_identifier")
         total = appointments.count()
         for appointment in tqdm(appointments, total=total):
             update_appt_status(appointment, save=True)
-        print("\n\nDone")
+        print("\n\nDone")  # noqa: T201

edc_appointment/management/commands/update_skipped_appointments.py

@@ -17,9 +17,9 @@ style = color_style()
 class Command(BaseCommand):
     help = "Update skipped appointments"
 
-    def handle(self, *args, **options) -> None:
+    def handle(self, *args, **options) -> None:  # noqa: ARG002
         errors: dict[str, list[str]] = {}
-        for model, _ in get_allow_skipped_appt_using().items():
+        for model in get_allow_skipped_appt_using():
             crf_model_cls = django_apps.get_model(model)
             qs = RegisteredSubject.objects.all().order_by("subject_identifier")
             total = qs.count()
@@ -47,10 +47,10 @@ class Command(BaseCommand):
                                 errors[subject_visit.subject_identifier].append(msg)
                             except KeyError:
                                 errors.update({subject_visit.subject_identifier: [msg]})
-                            print(msg)
-        print("\nERRORS\n")
+                            print(msg)  # noqa: T201
+        print("\nERRORS\n")  # noqa: T201
         for k, v in errors.items():
-            print(f"{k} ---------------")
+            print(f"{k} ---------------")  # noqa: T201
             for msg in v:
-                print(msg)
-        print("\n\nDone")
+                print(msg)  # noqa: T201
+        print("\n\nDone")  # noqa: T201

edc_appointment/managers.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import contextlib
 from typing import TYPE_CHECKING, Any
 
 from django.db import models, transaction
@@ -43,7 +44,7 @@ class AppointmentManager(models.Manager):
         )
 
     @staticmethod
-    def get_query_options(**kwargs) -> dict[Any]:
+    def get_query_options(**kwargs) -> dict[str, Any]:
         """Returns a dictionary or options.
 
         Dictionary is based on the appointment instance or everything
@@ -53,14 +54,14 @@ class AppointmentManager(models.Manager):
         schedule_name = kwargs.get("schedule_name")
         subject_identifier = kwargs.get("subject_identifier")
         visit_schedule_name = kwargs.get("visit_schedule_name")
-        options: dict[Any] = dict(visit_code_sequence=0)
+        options = dict(visit_code_sequence=0)
         try:
             options.update(
                 subject_identifier=appointment.subject_identifier,
                 visit_schedule_name=appointment.visit_schedule_name,
                 schedule_name=appointment.schedule_name,
             )
-        except AttributeError:
+        except AttributeError as e:
             options.update(subject_identifier=subject_identifier)
             try:
                 visit_schedule_name, schedule_name = visit_schedule_name.split(".")
@@ -75,7 +76,7 @@ class AppointmentManager(models.Manager):
                 raise TypeError(
                     f"Expected visit_schedule_name for schedule_name "
                     f"'{schedule_name}'. Got {visit_schedule_name}"
-                )
+                ) from e
             if schedule_name:
                 options.update(schedule_name=schedule_name)
         return options
@@ -230,10 +231,8 @@ class AppointmentManager(models.Manager):
             f"appt_datetime__{op}": cutoff_datetime,
         }
         if not is_offstudy:
-            try:
+            with contextlib.suppress(ValueError, AttributeError):
                 visit_schedule_name, schedule_name = visit_schedule_name.split(".")
-            except (ValueError, AttributeError):
-                pass
             if not schedule_name or not visit_schedule_name:
                 raise AppointmentManagerError(
                     f"Expected both the visit_schedule_name and schedule_name. "

edc_appointment/model_mixins/appointment_model_mixin.py

@@ -17,7 +17,7 @@ from edc_identifier.model_mixins import NonUniqueSubjectIdentifierFieldMixin
 from edc_metadata.model_mixins import MetadataHelperModelMixin
 from edc_offstudy.model_mixins import OffstudyNonCrfModelMixin
 from edc_timepoint.model_mixins import TimepointModelMixin
-from edc_utils import formatted_datetime, to_utc
+from edc_utils.text import formatted_datetime
 from edc_visit_schedule.model_mixins import VisitScheduleModelMixin
 from edc_visit_schedule.site_visit_schedules import site_visit_schedules
 from edc_visit_schedule.subject_schedule import NotOnScheduleError
@@ -78,8 +78,7 @@ class AppointmentModelMixin(
                         schedule.onschedule_model
                     ).objects.get(
                         subject_identifier=self.subject_identifier,
-                        onschedule_datetime__lte=to_utc(self.appt_datetime)
-                        + relativedelta(seconds=1),
+                        onschedule_datetime__lte=self.appt_datetime + relativedelta(seconds=1),
                     )
                 except ObjectDoesNotExist as e:
                     dte_as_str = formatted_datetime(self.appt_datetime)
@@ -92,7 +91,7 @@ class AppointmentModelMixin(
                     # update appointment timepoints
                     schedule.put_on_schedule(
                         subject_identifier=self.subject_identifier,
-                        onschedule_datetime=to_utc(self.appt_datetime),
+                        onschedule_datetime=self.appt_datetime,
                         skip_baseline=True,
                     )
             else:

edc_appointment/modeladmin_mixins/next_appointment_crf_modeladmin_mixin.py

@@ -46,7 +46,7 @@ class NextAppointmentCrfModelAdminMixin(admin.ModelAdmin):
         audit_fieldset_tuple,
     )
 
-    radio_fields = {
+    radio_fields = {  # noqa: RUF012
         "offschedule_today": admin.VERTICAL,
         "crf_status": admin.VERTICAL,
         "info_source": admin.VERTICAL,
@@ -103,5 +103,5 @@ class NextAppointmentCrfModelAdminMixin(admin.ModelAdmin):
             site=next_appt.site
         )
 
-    def get_default_info_source(self, request):
+    def get_default_info_source(self, request):  # noqa: ARG002
         return django_apps.get_model("edc_appointment.infosources").objects.get(name=PATIENT)

edc_appointment/modelform_mixins/next_appointment_crf_modelform_mixins.py

@@ -8,8 +8,8 @@ from django.conf import settings
 from django.utils.translation import gettext_lazy as _
 
 from edc_metadata.utils import has_keyed_metadata
-from edc_utils import convert_php_dateformat
 from edc_utils.date import to_local
+from edc_utils.text import convert_php_dateformat
 from edc_visit_schedule.exceptions import ScheduledVisitWindowError
 
 from ..utils import get_appointment_by_datetime
@@ -46,31 +46,32 @@ class NextAppointmentCrfModelFormMixin:
         )
 
     def validate_suggested_date_with_future_appointments(self):
-        if self.suggested_date and (
-            self.related_visit.appointment.next.related_visit
-            or has_keyed_metadata(self.related_visit.appointment.next)
-        ):
-            if (
+        if (
+            self.suggested_date
+            and (
+                self.related_visit.appointment.next.related_visit
+                or has_keyed_metadata(self.related_visit.appointment.next)
+            )
+            and (
                 self.suggested_date
                 != to_local(self.related_visit.appointment.next.appt_datetime).date()
-            ):
-                appointment = self.related_visit.appointment.next
-                date_format = convert_php_dateformat(settings.SHORT_DATE_FORMAT)
-                next_appt_date = (
-                    to_local(appointment.appt_datetime).date().strftime(date_format)
-                )
-                raise forms.ValidationError(
-                    {
-                        self.appt_date_fld: _(
-                            "Invalid. Next visit report already submitted. Expected "
-                            "`%(dt)s`. See `%(visit_code)s`."
-                        )
-                        % {
-                            "dt": next_appt_date,
-                            "visit_code": appointment.visit_code,
-                        }
+            )
+        ):
+            appointment = self.related_visit.appointment.next
+            date_format = convert_php_dateformat(settings.SHORT_DATE_FORMAT)
+            next_appt_date = to_local(appointment.appt_datetime).date().strftime(date_format)
+            raise forms.ValidationError(
+                {
+                    self.appt_date_fld: _(
+                        "Invalid. Next visit report already submitted. Expected "
+                        "`%(dt)s`. See `%(visit_code)s`."
+                    )
+                    % {
+                        "dt": next_appt_date,
+                        "visit_code": appointment.visit_code,
                     }
-                )
+                }
+            )
 
         if (
             self.suggested_date
@@ -107,7 +108,7 @@ class NextAppointmentCrfModelFormMixin:
                     raise_if_in_gap=False,
                 )
             except ScheduledVisitWindowError as e:
-                raise forms.ValidationError({self.appt_date_fld: str(e)})
+                raise forms.ValidationError({self.appt_date_fld: str(e)}) from e
             if not appointment:
                 raise forms.ValidationError(
                     {self.appt_date_fld: _("Invalid. Must be within the followup period.")}

edc_appointment/models/signals.py

@@ -4,7 +4,7 @@ from django.dispatch import receiver
 from django.utils import timezone
 
 from edc_constants.constants import NO
-from edc_utils import formatted_datetime
+from edc_utils.text import formatted_datetime
 from edc_visit_schedule.site_visit_schedules import site_visit_schedules
 from edc_visit_tracking.utils import get_related_visit_model_cls
 

edc_appointment/skip_appointments.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import contextlib
 from datetime import date, datetime
 from typing import TYPE_CHECKING, Any
 from zoneinfo import ZoneInfo
@@ -104,20 +105,14 @@ class SkipAppointments:
         ).exclude(
             appt_status__in=[SKIPPED_APPT, NEW_APPT],
         ):
-            try:
+            with contextlib.suppress(AppointmentAlreadyStarted):
                 reset_appointment(appointment)
-            except AppointmentAlreadyStarted:
-                pass
 
         for appointment in self.scheduled_appointments.filter(
             appt_datetime__gt=self.appointment.appt_datetime,
         ):
-            try:
+            with contextlib.suppress(IntegrityError, AppointmentAlreadyStarted):
                 reset_appointment(appointment)
-            except IntegrityError as e:
-                print(e)
-            except AppointmentAlreadyStarted:
-                pass
 
     def update_appointments(self) -> bool:
         """Return True if next scheduled appointment is updated.
@@ -152,10 +147,8 @@ class SkipAppointments:
                     next_scheduled_appointment_updated = True
                 break
             else:
-                try:
+                with contextlib.suppress(AppointmentAlreadyStarted):
                     skip_appointment(appointment, comment=skip_comment)
-                except AppointmentAlreadyStarted:
-                    pass
             appointment = appointment.relative_next
         for appointment in cancelled_appointments:
             appointment.delete()
@@ -198,7 +191,7 @@ class SkipAppointments:
             except FieldError as e:
                 raise SkipAppointmentsFieldError(
                     f"{e}. See {self.crf_model_cls._meta.label_lower}."
-                )
+                ) from e
         return self._last_crf_obj
 
     @property
@@ -215,11 +208,11 @@ class SkipAppointments:
         if not self._next_appt_date:
             try:
                 self._next_appt_date = getattr(self.last_crf_obj, self.dt_fld)
-            except AttributeError:
+            except AttributeError as e:
                 raise SkipAppointmentsFieldError(
                     f"Unknown field name for next scheduled appointment date. See "
                     f"{self.last_crf_obj._meta.label_lower}. Got `{self.dt_fld}`."
-                )
+                ) from e
         return self._next_appt_date
 
     @property
@@ -265,11 +258,11 @@ class SkipAppointments:
         if not self._next_visit_code:
             try:
                 self._next_visit_code = getattr(self.last_crf_obj, self.visit_code_fld)
-            except AttributeError:
+            except AttributeError as e:
                 raise SkipAppointmentsFieldError(
                     "Unknown field name for visit code. See "
                     f"{self.last_crf_obj._meta.label_lower}. Got `{self.visit_code_fld}`."
-                )
+                ) from e
             self._next_visit_code = getattr(
                 self._next_visit_code, "visit_code", self._next_visit_code
             )
@@ -285,7 +278,7 @@ class SkipAppointments:
         try:
             raise_on_appt_datetime_not_in_window(appointment)
         except AppointmentWindowError as e:
-            raise SkipAppointmentsValueError(e)
+            raise SkipAppointmentsValueError(e) from e
 
         next_appt = get_appointment_by_datetime(
             self.next_appt_datetime,
@@ -309,15 +302,3 @@ class SkipAppointments:
             raise_if_in_gap=False,
         )
         return self.appointment == next_appointment
-
-        # and getattr(
-        #     self.crf_obj, "allow_create_interim", None
-        # ):
-        #         subject_identifier=self.appointment.subject_identifier,
-        #         visit_schedule_name=self.appointment.visit_schedule_name,
-        #         schedule_name=self.appointment.schedule_name,
-        #         timepoint=self.appointment.timepoint,
-        #         visit_code=self.appointment.visit_code,
-        #         visit_code_sequence=self.appointment.visit_code_sequence + 1,
-        #         facility=self.appointment.facility,
-        #     )

edc_appointment/utils.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 import calendar
 import sys
 import warnings
+from collections.abc import Callable
 from datetime import datetime
 from typing import TYPE_CHECKING, Any
 
@@ -18,7 +19,7 @@ from django.core.exceptions import (
     ValidationError,
 )
 from django.core.handlers.wsgi import WSGIRequest
-from django.db import IntegrityError, transaction
+from django.db import transaction
 from django.db.models import Count, ProtectedError
 from django.urls import reverse
 from django.utils.translation import gettext as _
@@ -33,8 +34,8 @@ from edc_metadata.utils import (
     get_requisition_metadata_model_cls,
     has_keyed_metadata,
 )
-from edc_utils import convert_php_dateformat
 from edc_utils.date import to_local
+from edc_utils.text import convert_php_dateformat
 from edc_visit_schedule.exceptions import (
     ScheduledVisitWindowError,
     UnScheduledVisitWindowError,
@@ -200,6 +201,7 @@ def get_appt_reason_default() -> str:
             "Settings attribute `EDC_APPOINTMENT_DEFAULT_APPT_REASON` has "
             "been deprecated in favor of `EDC_APPOINTMENT_APPT_REASON_DEFAULT`. ",
             DeprecationWarning,
+            stacklevel=2,
         )
     return value or SCHEDULED_APPT
 
@@ -258,10 +260,10 @@ def missed_appointment(appointment: Appointment) -> None:
 
 
 def reset_visit_code_sequence_or_pass(
-    subject_identifier: str = None,
-    visit_schedule_name: str = None,
-    schedule_name: str = None,
-    visit_code: str = None,
+    subject_identifier: str,
+    visit_schedule_name: str,
+    schedule_name: str,
+    visit_code: str,
     appointment: Appointment | None = None,
     write_stdout: bool | None = None,
 ) -> Appointment | None:
@@ -294,36 +296,33 @@ def reset_visit_code_sequence_or_pass(
             visit_code_sequence__gt=0, **opts
         ).delete()
 
-        try:
-            with transaction.atomic():
-                # set appt and related visit visit_code_sequences to the
-                # negative of the current value
-                for obj in get_appointment_model_cls().objects.filter(
-                    visit_code_sequence__gt=0, **opts
-                ):
-                    obj.visit_code_sequence = obj.visit_code_sequence * -1
-                    obj.save_base(update_fields=["visit_code_sequence"])
-                    if getattr(obj, "related_visit", None):
-                        obj.related_visit.visit_code_sequence = obj.visit_code_sequence
-                        obj.related_visit.save_base(update_fields=["visit_code_sequence"])
-                        obj.related_visit.metadata_create()
-
-                # reset sequence order by appt_datetime
-                for index, obj in enumerate(
-                    get_appointment_model_cls()
-                    .objects.filter(visit_code_sequence__lt=0, **opts)
-                    .order_by("appt_datetime"),
-                    start=1,
-                ):
-                    obj.visit_code_sequence = index
-                    obj.save_base(update_fields=["visit_code_sequence"])
-                    if getattr(obj, "related_visit", None):
-                        obj.related_visit.visit_code_sequence = index
-                        obj.related_visit.save_base(update_fields=["visit_code_sequence"])
-                        obj.related_visit.metadata_create()
-
-        except IntegrityError:
-            raise
+        with transaction.atomic():
+            # set appt and related visit visit_code_sequences to the
+            # negative of the current value
+            for obj in get_appointment_model_cls().objects.filter(
+                visit_code_sequence__gt=0, **opts
+            ):
+                obj.visit_code_sequence = obj.visit_code_sequence * -1
+                obj.save_base(update_fields=["visit_code_sequence"])
+                if getattr(obj, "related_visit", None):
+                    obj.related_visit.visit_code_sequence = obj.visit_code_sequence
+                    obj.related_visit.save_base(update_fields=["visit_code_sequence"])
+                    obj.related_visit.metadata_create()
+
+            # reset sequence order by appt_datetime
+            for index, obj in enumerate(
+                get_appointment_model_cls()
+                .objects.filter(visit_code_sequence__lt=0, **opts)
+                .order_by("appt_datetime"),
+                start=1,
+            ):
+                obj.visit_code_sequence = index
+                obj.save_base(update_fields=["visit_code_sequence"])
+                if getattr(obj, "related_visit", None):
+                    obj.related_visit.visit_code_sequence = index
+                    obj.related_visit.save_base(update_fields=["visit_code_sequence"])
+                    obj.related_visit.metadata_create()
+
         if appointment:
             # refresh the given appt if not None since
             # appointment visit_code_sequence may have changed
@@ -332,9 +331,9 @@ def reset_visit_code_sequence_or_pass(
 
 
 def reset_visit_code_sequence_for_subject(
-    subject_identifier: str = None,
-    visit_schedule_name: str = None,
-    schedule_name: str = None,
+    subject_identifier: str,
+    visit_schedule_name: str,
+    schedule_name: str,
 ) -> None:
     """Resets / validates appointment `visit code sequences` for any
     `visit code` with unscheduled appointments for the given subject
@@ -376,7 +375,7 @@ def update_appt_status(appointment: Appointment, save: bool | None = None):
     relative to the visit tracking model and CRFs and
     requisitions
     """
-    if appointment.appt_status == CANCELLED_APPT or appointment.appt_status == SKIPPED_APPT:
+    if appointment.appt_status in (CANCELLED_APPT, SKIPPED_APPT):
         pass
     elif not appointment.related_visit:
         appointment.appt_status = NEW_APPT
@@ -640,16 +639,16 @@ def get_appointment_by_datetime(
                 and in_next_window_adjusted
                 and appointment.next.visit.add_window_gap_to_lower
             ):
-                appointment = appointment.next
+                appointment = appointment.next  # noqa: PLW2901
                 break
             if (
                 in_gap
                 and not in_next_window_adjusted
                 and appointment.next.visit.add_window_gap_to_lower
             ):
-                appointment = None
+                appointment = None  # noqa: PLW2901
                 break
-            appointment = appointment.next
+            appointment = appointment.next  # noqa: PLW2901
         else:
             break
     return appointment
@@ -790,7 +789,7 @@ def refresh_appointments(
 
 
 def validate_date_is_on_clinic_day(
-    cleaned_data: dict = None, clinic_days=None, raise_validation_error: callable = None
+    cleaned_data: dict, clinic_days: list[int], raise_validation_error: Callable | None = None
 ):
     raise_validation_error = raise_validation_error or ValidationError
     if cleaned_data.get("appt_date"):
@@ -833,9 +832,6 @@ def validate_date_is_on_clinic_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])
             raise raise_validation_error(
                 {
                     "appt_date": _(