clinicedc 2.0.3__py3-none-any.whl → 2.0.5__py3-none-any.whl

edc_adverse_event/model_mixins/ae_tmg/ae_tmg_fields_model_mixin.py

@@ -41,13 +41,13 @@ class AeTmgFieldsModelMixin(models.Model):
         verbose_name="Date and time of clinical review: ",
     )
 
-    ae_description = models.TextField(blank=True, null=True, verbose_name="Description of AE:")
+    ae_description = models.TextField(blank=True, verbose_name="Description of AE:")
 
     investigator_comments = models.TextField(
-        blank=True, null=True, verbose_name="This investigator's comments:"
+        blank=True, verbose_name="This investigator's comments:"
     )
 
-    ae_classification = models.CharField(max_length=150, blank=True, null=True)
+    ae_classification = models.CharField(max_length=150, blank=True)
 
     ae_classification_other = OtherCharField(max_length=250, blank=True, null=True)
 
@@ -56,11 +56,10 @@ class AeTmgFieldsModelMixin(models.Model):
         max_length=15,
         choices=YES_NO,
         blank=False,
-        null=True,
         help_text="If No, explain in the narrative below",
     )
 
-    investigator_narrative = models.TextField(verbose_name="Narrative", blank=True, null=True)
+    investigator_narrative = models.TextField(verbose_name="Narrative", blank=True)
 
     investigator_ae_classification_agreed = models.CharField(
         verbose_name=(

edc_adverse_event/model_mixins/ae_tmg/ae_tmg_methods_model_mixin.py

@@ -2,6 +2,9 @@ from django.db import models
 
 
 class AeTmgMethodsModelMixin(models.Model):
+    class Meta:
+        abstract = True
+
     def __str__(self):
         return f"{self.action_identifier[-9:]}"
 
@@ -10,7 +13,7 @@ class AeTmgMethodsModelMixin(models.Model):
         super().save(*args, **kwargs)
 
     def natural_key(self):
-        return (self.action_identifier,)  # noqa
+        return (self.action_identifier,)
 
     def get_action_item_reason(self):
         return self.ae_initial.ae_description
@@ -20,6 +23,3 @@ class AeTmgMethodsModelMixin(models.Model):
         fields.append("subject_identifier")
         fields.append("report_status")
         return fields
-
-    class Meta:
-        abstract = True

edc_adverse_event/model_mixins/ae_tmg/ae_tmg_model_mixin.py

@@ -36,7 +36,7 @@ class AeTmgModelMixin(
         verbose_name = "AE TMG Report"
         verbose_name_plural = "AE TMG Reports"
         indexes = (
-            NonUniqueSubjectIdentifierFieldMixin.Meta.indexes
-            + ActionModelMixin.Meta.indexes
-            + [models.Index(fields=["subject_identifier", "action_identifier", "site", "id"])]
+            *NonUniqueSubjectIdentifierFieldMixin.Meta.indexes,
+            *ActionModelMixin.Meta.indexes,
+            models.Index(fields=["subject_identifier", "action_identifier", "site", "id"]),
         )

edc_adverse_event/model_mixins/death_report/death_report_extra_fields_model_mixin.py

@@ -22,14 +22,14 @@ class DeathReportExtraFieldsModelMixin(models.Model):
 
     hospital_death = models.CharField(
         verbose_name=(
-            "Did the participant die in hospital, or die just after " "visiting a hospital?"
+            "Did the participant die in hospital, or die just after visiting a hospital?"
         ),
         max_length=50,
         choices=YES_NO,
     )
 
     hospital_name = models.CharField(
-        verbose_name="Which hospital was this", max_length=50, null=True, blank=True
+        verbose_name="Which hospital was this", max_length=50, blank=True
     )
 
     informant = models.CharField(
@@ -50,7 +50,6 @@ class DeathReportExtraFieldsModelMixin(models.Model):
 
     comment = models.TextField(
         verbose_name="Comment",
-        null=True,
         blank=True,
         help_text="Provide any additional details, if relevant",
     )

edc_adverse_event/model_mixins/death_report/death_report_model_mixin.py

@@ -69,7 +69,6 @@ class DeathReportModelMixin(
         choices=YES_NO,
         max_length=5,
         verbose_name="Death as inpatient",
-        null=True,
         blank=False,
     )
 
@@ -78,7 +77,7 @@ class DeathReportModelMixin(
         on_delete=PROTECT,
         verbose_name="Main cause of death",
         help_text=(
-            "Main cause of death in the opinion of the " "local study doctor and local PI"
+            "Main cause of death in the opinion of the local study doctor and local PI"
         ),
         null=True,
         blank=False,
@@ -86,7 +85,7 @@ class DeathReportModelMixin(
 
     cause_of_death_other = OtherCharField(max_length=100, blank=True, null=True)
 
-    narrative = models.TextField(verbose_name="Narrative", blank=False, null=True)
+    narrative = models.TextField(verbose_name="Narrative", blank=False)
 
     objects = ActionIdentifierModelManager()
 
@@ -94,11 +93,6 @@ class DeathReportModelMixin(
 
     history = HistoricalRecords(inherit=True)
 
-    def natural_key(self):
-        return (self.action_identifier,)  # noqa
-
-    natural_key.dependencies = ["edc_adverse_event.causeofdeath"]
-
     class Meta(
         SiteModelMixin.Meta,
         UniqueSubjectIdentifierFieldMixin.Meta,
@@ -107,6 +101,12 @@ class DeathReportModelMixin(
         abstract = True
         verbose_name = "Death Report"
         verbose_name_plural = "Death Reports"
-        indexes = ActionNoManagersModelMixin.Meta.indexes + [
-            models.Index(fields=["subject_identifier", "action_identifier", "site", "id"])
-        ]
+        indexes = (
+            *ActionNoManagersModelMixin.Meta.indexes,
+            models.Index(fields=["subject_identifier", "action_identifier", "site", "id"]),
+        )
+
+    def natural_key(self):
+        return (self.action_identifier,)
+
+    natural_key.dependencies = ("edc_adverse_event.causeofdeath",)

edc_adverse_event/model_mixins/death_report/death_report_tmg_model_mixin.py

@@ -59,7 +59,7 @@ class DeathReportTmgFieldsModelMixin(models.Model):
         on_delete=PROTECT,
         verbose_name="Main cause of death",
         help_text=(
-            "Main cause of death in the opinion of the " "local study doctor and local PI"
+            "Main cause of death in the opinion of the local study doctor and local PI"
         ),
         null=True,
     )
@@ -68,24 +68,25 @@ class DeathReportTmgFieldsModelMixin(models.Model):
         verbose_name='If "Other" above, please specify',
         max_length=100,
         blank=True,
-        null=True,
     )
 
     cause_of_death_agreed = models.CharField(
         verbose_name="Is the cause of death agreed between study doctor and TMG member?",
         max_length=15,
         choices=YES_NO,
-        null=True,
         help_text="If No, explain in the narrative below",
     )
 
-    narrative = models.TextField(verbose_name="Narrative", blank=True, null=True)
+    narrative = models.TextField(verbose_name="Narrative", blank=True)
 
     class Meta:
         abstract = True
 
 
 class DeathReportTmgMethodsModelMixin(models.Model):
+    class Meta:
+        abstract = True
+
     def __str__(self):
         return str(self.death_report)
 
@@ -94,13 +95,10 @@ class DeathReportTmgMethodsModelMixin(models.Model):
         super().save(*args, **kwargs)
 
     def natural_key(self):
-        return (self.action_identifier,)  # noqa
+        return (self.action_identifier,)
 
     natural_key.dependencies = ["edc_adverse_event.causeofdeath"]
 
-    class Meta:
-        abstract = True
-
 
 class DeathReportTmgModelMixin(
     SiteModelMixin,
@@ -126,7 +124,7 @@ class DeathReportTmgModelMixin(
         verbose_name = "Death Report TMG (1st)"
         verbose_name_plural = "Death Report TMG (1st)"
         indexes = (
-            NonUniqueSubjectIdentifierFieldMixin.Meta.indexes
-            + ActionModelMixin.Meta.indexes
-            + [models.Index(fields=["subject_identifier", "action_identifier", "site", "id"])]
+            *NonUniqueSubjectIdentifierFieldMixin.Meta.indexes,
+            *ActionModelMixin.Meta.indexes,
+            models.Index(fields=["subject_identifier", "action_identifier", "site", "id"]),
         )

edc_adverse_event/model_mixins/death_report/simple_death_report_model_mixin.py

@@ -50,13 +50,14 @@ class SimpleDeathReportModelMixin(
 
     on_site = ActionIdentifierSiteManager()
 
-    def natural_key(self):
-        return (self.action_identifier,)
-
     class Meta(ActionModelMixin.Meta):
         abstract = True
         verbose_name = "Death Report"
         verbose_name_plural = "Death Reports"
-        indexes = ActionModelMixin.Meta.indexes + [
-            models.Index(fields=["subject_identifier", "action_identifier", "site", "id"])
-        ]
+        indexes = (
+            *ActionModelMixin.Meta.indexes,
+            models.Index(fields=["subject_identifier", "action_identifier", "site", "id"]),
+        )
+
+    def natural_key(self):
+        return (self.action_identifier,)

edc_adverse_event/model_mixins/hospitaization/hospitalization_model_mixin.py

@@ -55,7 +55,6 @@ class HospitalizationModelMixin(NonUniqueSubjectIdentifierFieldMixin, models.Mod
     narrative = models.TextField(
         verbose_name="Narrative",
         max_length=500,
-        null=True,
         blank=True,
     )
 

edc_adverse_event/modeladmin_mixins/ae_followup_admin_mixin.py

@@ -45,7 +45,7 @@ class AeFollowupModelAdminMixin(
         audit_fieldset_tuple,
     )
 
-    radio_fields = {
+    radio_fields = {  # noqa: RUF012
         "outcome": admin.VERTICAL,
         "followup": admin.VERTICAL,
         "ae_grade": admin.VERTICAL,
@@ -54,14 +54,12 @@ class AeFollowupModelAdminMixin(
     def get_search_fields(self, request) -> tuple[str, ...]:
         search_fields = super().get_search_fields(request)
         return tuple(
-            set(
-                search_fields
-                + (
-                    "action_identifier",
-                    "ae_initial__subject_identifier",
-                    "ae_initial__action_identifier",
-                )
-            )
+            {
+                *search_fields,
+                "action_identifier",
+                "ae_initial__subject_identifier",
+                "ae_initial__action_identifier",
+            }
         )
 
     def get_list_display(self, request) -> tuple[str, ...]:
@@ -72,7 +70,7 @@ class AeFollowupModelAdminMixin(
             "description_column",
             "documents_column",
         )
-        return custom_fields + tuple(f for f in list_display if f not in custom_fields)
+        return tuple({*list_display, *custom_fields})
 
     def get_list_filter(self, request) -> tuple[str, ...]:
         list_filter = super().get_list_filter(request)
@@ -83,7 +81,7 @@ class AeFollowupModelAdminMixin(
             "outcome",
             "report_datetime",
         )
-        return custom_fields + tuple(f for f in list_filter if f not in custom_fields)
+        return tuple({*list_filter, *custom_fields})
 
     @display(description="Description", ordering="-report_datetime")
     def description_column(self, obj):

edc_adverse_event/modeladmin_mixins/ae_initial_admin_mixin.py

@@ -1,5 +1,3 @@
-from typing import Tuple
-
 from django.contrib import admin
 from django.contrib.admin import display
 from django.template.loader import render_to_string
@@ -90,8 +88,8 @@ class AeInitialModelAdminMixin(
     additional_instructions = format_html(  # nosec B308, B703
         "Complete the initial AE report and forward to the TMG. "
         'Email to <a href="mailto:{}">{}</a>',
-        mark_safe(email_contact),  # nosec B308, B703
-        mark_safe(email_contact),  # nosec B308, B703
+        mark_safe(email_contact),  # noqa: S308
+        mark_safe(email_contact),  # noqa: S308
     )
 
     fieldsets = (
@@ -114,7 +112,7 @@ class AeInitialModelAdminMixin(
         "ae_classification_other",
     )
 
-    def get_list_display(self, request) -> Tuple[str, ...]:
+    def get_list_display(self, request) -> tuple[str, ...]:
         list_display = super().get_list_display(request)
         custom_fields = (
             "subject_identifier_column",
@@ -125,7 +123,7 @@ class AeInitialModelAdminMixin(
         )
         return custom_fields + tuple(f for f in list_display if f not in custom_fields)
 
-    def get_list_filter(self, request) -> Tuple[str, ...]:
+    def get_list_filter(self, request) -> tuple[str, ...]:
         list_filter = super().get_list_filter(request)
         custom_fields = (
             AeAwarenessListFilter,

edc_adverse_event/modeladmin_mixins/modeladmin_mixins.py

@@ -65,7 +65,7 @@ class AdverseEventModelAdminMixin:
         """Returns formatted usernames and creation/modification dates."""
         return format_html(
             "{}",
-            mark_safe(
+            mark_safe(  # noqa: S308
                 "<BR>".join(
                     [
                         obj.user_created,

edc_adverse_event/modeladmin_mixins/utils.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from dataclasses import dataclass, field
 from datetime import date, datetime
-from typing import TYPE_CHECKING, Type
+from typing import TYPE_CHECKING
 
 from django.conf import settings
 from django.urls import reverse
@@ -15,11 +15,11 @@ if TYPE_CHECKING:
 
     from .modeladmin_mixins import AdverseEventModelAdminMixin
 
-    class ModelAdmin(AdverseEventModelAdminMixin, admin.ModelAdmin): ...  # noqa
+    class ModelAdmin(AdverseEventModelAdminMixin, admin.ModelAdmin): ...
 
     class Model(BaseUuidModel):
         report_datetime: datetime
-        ...  # noqa
+        ...
 
 
 @dataclass(order=True)
@@ -34,7 +34,7 @@ class ColumnItem:
     date_field: str | None = field(default="report_datetime", compare=False)
     verbose_name: str = field(init=False, repr=False, compare=False)
     formatted_date: str = field(init=False, repr=False, compare=False)
-    model_cls: Type[Model] = field(init=False, repr=False, compare=False)
+    model_cls: type[Model] = field(init=False, repr=False, compare=False)
     date_value: date = field(init=False, repr=False, compare=True)
 
     def __post_init__(self):

edc_adverse_event/models/signals.py

@@ -12,14 +12,8 @@ from ..utils import get_ae_model
 
 
 @receiver(m2m_changed, weak=False, dispatch_uid="update_ae_notifications_for_tmg_group")
-def update_ae_notifications_for_tmg_group(
-    action, instance, reverse, model, pk_set, using, **kwargs
-):
-    try:
-        instance.userprofile
-    except AttributeError:
-        pass
-    else:
+def update_ae_notifications_for_tmg_group(action, instance, **kwargs):  # noqa: ARG001
+    if getattr(instance, "userprofile", None):
         try:
             tmg_ae_notification = Notification.objects.get(name=AE_TMG_ACTION)
         except ObjectDoesNotExist:
@@ -35,7 +29,7 @@ def update_ae_notifications_for_tmg_group(
 
 
 @receiver(post_save, weak=False, dispatch_uid="update_ae_initial_for_susar")
-def update_ae_initial_for_susar(sender, instance, raw, update_fields, **kwargs):
+def update_ae_initial_for_susar(sender, instance, raw, update_fields, **kwargs):  # noqa: ARG001
     if not raw and not update_fields:
         try:
             ae_susar_model_cls = get_ae_model("AeSusar")
@@ -61,7 +55,7 @@ def update_ae_initial_for_susar(sender, instance, raw, update_fields, **kwargs):
     weak=False,
     dispatch_uid="update_ae_initial_susar_reported",
 )
-def update_ae_initial_susar_reported(sender, instance, raw, update_fields, **kwargs):
+def update_ae_initial_susar_reported(sender, instance, raw, update_fields, **kwargs):  # noqa: ARG001
     if not raw and not update_fields:
         try:
             ae_initial_model_cls = get_ae_model("AeInitial")
@@ -83,7 +77,7 @@ def update_ae_initial_susar_reported(sender, instance, raw, update_fields, **kwa
 
 
 @receiver(post_delete, weak=False, dispatch_uid="post_delete_ae_susar")
-def post_delete_ae_susar(instance, **kwargs):
+def post_delete_ae_susar(instance, **kwargs):  # noqa: ARG001
     try:
         ae_susar_model_cls = get_ae_model("AeSusar")
     except LookupError:
@@ -99,14 +93,8 @@ def post_delete_ae_susar(instance, **kwargs):
 
 
 @receiver(m2m_changed, weak=False, dispatch_uid="update_death_notifications_for_tmg_group")
-def update_death_notifications_for_tmg_group(
-    action, instance, reverse, model, pk_set, using, **kwargs
-):
-    try:
-        instance.userprofile
-    except AttributeError:
-        pass
-    else:
+def update_death_notifications_for_tmg_group(action, instance, **kwargs):  # noqa: ARG001
+    if getattr(instance, "userprofile", None):
         try:
             tmg_death_notification = Notification.objects.get(name=DEATH_REPORT_TMG_ACTION)
         except ObjectDoesNotExist:

edc_adverse_event/pdf_reports/death_pdf_report.py

@@ -95,16 +95,15 @@ class DeathPdfReport(CrfPdfReport):
         row = ["Main cause of death:"]
         if not self.model_obj.cause_of_death:
             row.append(self.not_reported_text)
-        else:
-            if self.cause_of_death == OTHER:
-                row.append(
-                    fill(
-                        f"{self.cause_of_death}: " f"{self.cause_of_death_other}",
-                        width=80,
-                    )
+        elif self.cause_of_death == OTHER:
+            row.append(
+                fill(
+                    f"{self.cause_of_death}: {self.cause_of_death_other}",
+                    width=80,
                 )
-            else:
-                row.append(fill(self.cause_of_death))
+            )
+        else:
+            row.append(fill(self.cause_of_death))
         rows.append(row)
 
         t = Table(rows, (4 * cm, 14 * cm))

edc_adverse_event/templatetags/edc_adverse_event_extras.py

@@ -42,15 +42,15 @@ if TYPE_CHECKING:
         DeathReportTmgModelMixin,
     )
 
-    class DeathReportTmgModel(DeathReportTmgModelMixin, BaseUuidModel): ...  # noqa
+    class DeathReportTmgModel(DeathReportTmgModelMixin, BaseUuidModel): ...
 
-    class DeathReportTmgSecondModel(DeathReportTmgModelMixin, BaseUuidModel): ...  # noqa
+    class DeathReportTmgSecondModel(DeathReportTmgModelMixin, BaseUuidModel): ...
 
-    class AeInitialModel(AeInitialModelMixin, BaseUuidModel): ...  # noqa
+    class AeInitialModel(AeInitialModelMixin, BaseUuidModel): ...
 
-    class AeFollowupModel(AeFollowupModelMixin, BaseUuidModel): ...  # noqa
+    class AeFollowupModel(AeFollowupModelMixin, BaseUuidModel): ...
 
-    class DeathReportModel(DeathReportModelMixin, BaseUuidModel): ...  # noqa
+    class DeathReportModel(DeathReportModelMixin, BaseUuidModel): ...
 
 
 register = template.Library()
@@ -89,17 +89,13 @@ def format_ae_description(context, ae_initial, wrap_length):
     try:
         context["sae_reason"] = format_html(
             "{}",
-            mark_safe(
-                wrapx(escape_braces(ae_initial.sae_reason.name), wrap_length)
-            ),  # nosec B703, B308
+            mark_safe(wrapx(escape_braces(ae_initial.sae_reason.name), wrap_length)),  # nosec B703, B308
         )
     except AttributeError:
         context["sae_reason"] = ""
     context["ae_description"] = format_html(
         "{}",
-        mark_safe(
-            wrapx(escape_braces(ae_initial.ae_description), wrap_length)
-        ),  # nosec B703, B308
+        mark_safe(wrapx(escape_braces(ae_initial.ae_description), wrap_length)),  # nosec B703, B308
     )
     return context
 
@@ -124,15 +120,11 @@ def format_ae_followup_description(context, ae_followup, wrap_length):
         context["sae_reason"] = ""
     context["relevant_history"] = format_html(
         "{}",
-        mark_safe(
-            wrapx(escape_braces(ae_followup.relevant_history), wrap_length)
-        ),  # nosec B703, B308
+        mark_safe(wrapx(escape_braces(ae_followup.relevant_history), wrap_length)),  # nosec B703, B308
     )
     context["ae_description"] = format_html(
         "{}",
-        mark_safe(
-            wrapx(escape_braces(ae_followup.ae_initial.ae_description), wrap_length)
-        ),  # nosec B703, B308
+        mark_safe(wrapx(escape_braces(ae_followup.ae_initial.ae_description), wrap_length)),  # nosec B703, B308
     )
     return context
 
@@ -158,9 +150,7 @@ def format_ae_susar_description(context, ae_susar, wrap_length):
     )
     context["ae_description"] = format_html(
         "{}",
-        mark_safe(
-            wrapx(escape_braces(ae_susar.ae_initial.ae_description), wrap_length)
-        ),  # nosec B703, B308
+        mark_safe(wrapx(escape_braces(ae_susar.ae_initial.ae_description), wrap_length)),  # nosec B703, B308
     )
     return context
 

edc_adverse_event/urls.py

@@ -3,11 +3,15 @@ from django.urls.conf import path
 from edc_protocol.research_protocol_config import ResearchProtocolConfig
 
 from .admin_site import edc_adverse_event_admin
-from .views import AeHomeView, ClosedTmgAeListboardView
+from .views import (
+    AeHomeView,
+    ClosedTmgAeListboardView,
+    NewTmgAeListboardView,
+    OpenTmgAeListboardView,
+    TmgHomeView,
+)
 from .views import DeathListboardView as TmgDeathListboardView
-from .views import NewTmgAeListboardView, OpenTmgAeListboardView
 from .views import SummaryListboardView as TmgSummaryListboardView
-from .views import TmgHomeView
 
 app_name = "edc_adverse_event"
 

edc_adverse_event/utils.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Type
+from typing import TYPE_CHECKING
 
 from django import forms
 from django.apps import apps as django_apps
@@ -71,7 +71,7 @@ def get_hospitalization_model_app_label() -> str:
 
 def get_ae_model(
     model_name,
-) -> Type[DeathReportModelMixin] | Type[AeInitialModelMixin] | Type[AeFollowupModelMixin]:
+) -> type[DeathReportModelMixin] | type[AeInitialModelMixin] | type[AeFollowupModelMixin]:
     return django_apps.get_model(f"{get_adverse_event_app_label()}.{model_name}")
 
 

edc_adverse_event/view_utils/tmg_button.py

@@ -17,13 +17,13 @@ if TYPE_CHECKING:
     )
     from edc_model.models import BaseUuidModel
 
-    class AeInitialModel(AeInitialModelMixin, BaseUuidModel): ...  # noqa
+    class AeInitialModel(AeInitialModelMixin, BaseUuidModel): ...
 
-    class AeFollowupModel(AeFollowupModelMixin, BaseUuidModel): ...  # noqa
+    class AeFollowupModel(AeFollowupModelMixin, BaseUuidModel): ...
 
-    class DeathReportTmgModel(DeathReportTmgModelMixin, BaseUuidModel): ...  # noqa
+    class DeathReportTmgModel(DeathReportTmgModelMixin, BaseUuidModel): ...
 
-    class DeathReportModel(DeathReportModelMixin, BaseUuidModel): ...  # noqa
+    class DeathReportModel(DeathReportModelMixin, BaseUuidModel): ...
 
 
 @dataclass

edc_appconfig/system_checks.py

@@ -21,7 +21,7 @@ def check_for_edc_appconfig(app_configs, **kwargs) -> list[CheckMessage]:
                     id="edc_appconfig.E001",
                 )
             )
-        if "edc_appconfig.apps.AppConfig" != settings.INSTALLED_APPS[-1:][0]:
+        if settings.INSTALLED_APPS[-1:][0] != "edc_appconfig.apps.AppConfig":
             errors.append(
                 Error(
                     "edc_appconfig should be the last app in INSTALLED_APPS. "

edc_appointment/appointment_status_updater.py

@@ -25,18 +25,17 @@ class AppointmentStatusUpdater:
             raise AppointmentStatusUpdaterError(
                 f"Not an Appointment model instance. Got {self.appointment._meta.label_lower}."
             )
-        else:
-            if not getattr(self.appointment, "id", None):
-                raise AppointmentStatusUpdaterError(
-                    "Appointment instance must exist. Got `id` is None"
-                )
-            if change_to_in_progress and self.appointment.appt_status != IN_PROGRESS_APPT:
-                self.appointment.appt_status = IN_PROGRESS_APPT
-                self.appointment.save_base(update_fields=["appt_status"])
-            if clear_others_in_progress:
-                for appointment in self.appointment.__class__.objects.filter(
-                    visit_schedule_name=self.appointment.visit_schedule_name,
-                    schedule_name=self.appointment.schedule_name,
-                    appt_status=IN_PROGRESS_APPT,
-                ).exclude(id=self.appointment.id):
-                    update_appt_status(appointment, save=True)
+        if not getattr(self.appointment, "id", None):
+            raise AppointmentStatusUpdaterError(
+                "Appointment instance must exist. Got `id` is None"
+            )
+        if change_to_in_progress and self.appointment.appt_status != IN_PROGRESS_APPT:
+            self.appointment.appt_status = IN_PROGRESS_APPT
+            self.appointment.save_base(update_fields=["appt_status"])
+        if clear_others_in_progress:
+            for appointment in self.appointment.__class__.objects.filter(
+                visit_schedule_name=self.appointment.visit_schedule_name,
+                schedule_name=self.appointment.schedule_name,
+                appt_status=IN_PROGRESS_APPT,
+            ).exclude(id=self.appointment.id):
+                update_appt_status(appointment, save=True)