canvas 0.63.0__py3-none-any.whl → 0.89.0__py3-none-any.whl

canvas_sdk/v1/data/lab.py

@@ -3,19 +3,20 @@ from typing import cast
 from django.db import models
 
 from canvas_sdk.v1.data.base import (
+    AuditedModel,
     BaseModelManager,
     BaseQuerySet,
     CommittableQuerySetMixin,
     ForPatientQuerySetMixin,
     IdentifiableModel,
-    Model,
     TimeframeLookupQuerySetMixin,
+    TimestampedModel,
     ValueSetLookupQuerySet,
 )
 from canvas_sdk.v1.data.staff import Staff
 
 
-class LabReportQuerySet(BaseQuerySet, CommittableQuerySetMixin, ForPatientQuerySetMixin):
+class LabReportQuerySet(CommittableQuerySetMixin, ForPatientQuerySetMixin, BaseQuerySet):
     """A queryset for lab reports."""
 
     pass
@@ -32,7 +33,7 @@ class TransmissionType(models.TextChoices):
     MANUAL = "M", "manual"
 
 
-class LabReport(IdentifiableModel):
+class LabReport(AuditedModel, IdentifiableModel):
     """A class representing a lab report."""
 
     class Meta:
@@ -40,8 +41,6 @@ class LabReport(IdentifiableModel):
 
     objects = cast(LabReportQuerySet, LabReportManager())
 
-    created = models.DateTimeField(auto_now_add=True)
-    modified = models.DateTimeField(auto_now=True)
     review_mode = models.CharField(max_length=2)
     junked = models.BooleanField()
     requires_signature = models.BooleanField()
@@ -60,19 +59,9 @@ class LabReport(IdentifiableModel):
     original_date = models.DateTimeField()
     date_performed = models.DateTimeField()
     custom_document_name = models.CharField(max_length=500)
-    originator = models.ForeignKey(
-        "v1.CanvasUser", on_delete=models.DO_NOTHING, null=True, related_name="+"
-    )
-    committer = models.ForeignKey(
-        "v1.CanvasUser", on_delete=models.DO_NOTHING, null=True, related_name="+"
-    )
-    entered_in_error = models.ForeignKey(
-        "v1.CanvasUser", on_delete=models.DO_NOTHING, null=True, related_name="+"
-    )
-    deleted = models.BooleanField()
 
 
-class LabReviewQuerySet(BaseQuerySet, CommittableQuerySetMixin, ForPatientQuerySetMixin):
+class LabReviewQuerySet(CommittableQuerySetMixin, ForPatientQuerySetMixin, BaseQuerySet):
     """A queryset for lab reviews."""
 
     pass
@@ -81,7 +70,7 @@ class LabReviewQuerySet(BaseQuerySet, CommittableQuerySetMixin, ForPatientQueryS
 LabReviewManager = BaseModelManager.from_queryset(LabReviewQuerySet)
 
 
-class LabReview(IdentifiableModel):
+class LabReview(AuditedModel, IdentifiableModel):
     """A class representing a lab review."""
 
     class Meta:
@@ -89,18 +78,6 @@ class LabReview(IdentifiableModel):
 
     objects = cast(LabReviewQuerySet, LabReviewManager())
 
-    created = models.DateTimeField(auto_now_add=True)
-    modified = models.DateTimeField(auto_now=True)
-    originator = models.ForeignKey(
-        "v1.CanvasUser", on_delete=models.DO_NOTHING, null=True, related_name="+"
-    )
-    deleted = models.BooleanField()
-    committer = models.ForeignKey(
-        "v1.CanvasUser", on_delete=models.DO_NOTHING, null=True, related_name="+"
-    )
-    entered_in_error = models.ForeignKey(
-        "v1.CanvasUser", on_delete=models.DO_NOTHING, null=True, related_name="+"
-    )
     internal_comment = models.TextField()
     message_to_patient = models.CharField(max_length=2048)
     status = models.CharField(max_length=50)
@@ -119,13 +96,13 @@ class LabValueTimeframeLookupQuerySetMixin(TimeframeLookupQuerySetMixin):
         return "report__original_date"
 
 
-class LabValueQuerySet(ValueSetLookupQuerySet, LabValueTimeframeLookupQuerySetMixin):
+class LabValueQuerySet(LabValueTimeframeLookupQuerySetMixin, ValueSetLookupQuerySet):
     """LabValueQuerySet."""
 
     pass
 
 
-class LabValue(IdentifiableModel):
+class LabValue(TimestampedModel, IdentifiableModel):
     """A class representing a lab value."""
 
     class Meta:
@@ -133,8 +110,6 @@ class LabValue(IdentifiableModel):
 
     objects = LabValueQuerySet.as_manager()
 
-    created = models.DateTimeField(auto_now_add=True)
-    modified = models.DateTimeField(auto_now=True)
     report = models.ForeignKey(
         "LabReport", on_delete=models.DO_NOTHING, related_name="values", null=True
     )
@@ -148,14 +123,12 @@ class LabValue(IdentifiableModel):
     observation_status = models.CharField(max_length=24)
 
 
-class LabValueCoding(Model):
+class LabValueCoding(TimestampedModel):
     """A class representing a lab value coding."""
 
     class Meta:
         db_table = "canvas_sdk_data_api_labvaluecoding_001"
 
-    created = models.DateTimeField(auto_now_add=True)
-    modified = models.DateTimeField(auto_now=True)
     value = models.ForeignKey(
         LabValue, on_delete=models.DO_NOTHING, related_name="codings", null=True
     )
@@ -164,7 +137,7 @@ class LabValueCoding(Model):
     system = models.CharField(max_length=128)
 
 
-class LabOrder(IdentifiableModel):
+class LabOrder(AuditedModel, IdentifiableModel):
     """A class representing a lab order."""
 
     class SpecimenCollectionType(models.TextChoices):
@@ -192,18 +165,6 @@ class LabOrder(IdentifiableModel):
     class Meta:
         db_table = "canvas_sdk_data_api_laborder_001"
 
-    created = models.DateTimeField(auto_now_add=True)
-    modified = models.DateTimeField(auto_now=True)
-    originator = models.ForeignKey(
-        "v1.CanvasUser", on_delete=models.DO_NOTHING, null=True, related_name="+"
-    )
-    deleted = models.BooleanField()
-    committer = models.ForeignKey(
-        "v1.CanvasUser", on_delete=models.DO_NOTHING, null=True, related_name="+"
-    )
-    entered_in_error = models.ForeignKey(
-        "v1.CanvasUser", on_delete=models.DO_NOTHING, null=True, related_name="+"
-    )
     patient = models.ForeignKey(
         "v1.Patient", on_delete=models.DO_NOTHING, related_name="lab_orders", null=True
     )
@@ -238,7 +199,7 @@ class LabOrder(IdentifiableModel):
     reports = models.ManyToManyField("v1.LabReport", through="v1.LabTest")
 
 
-class LabOrderReason(Model):
+class LabOrderReason(AuditedModel):
     """A class representing a lab order reason."""
 
     class LabReasonMode(models.TextChoices):
@@ -252,32 +213,18 @@ class LabOrderReason(Model):
     class Meta:
         db_table = "canvas_sdk_data_api_laborderreason_001"
 
-    created = models.DateTimeField(auto_now_add=True)
-    modified = models.DateTimeField(auto_now=True)
-    originator = models.ForeignKey(
-        "v1.CanvasUser", on_delete=models.DO_NOTHING, null=True, related_name="+"
-    )
-    deleted = models.BooleanField()
-    committer = models.ForeignKey(
-        "v1.CanvasUser", on_delete=models.DO_NOTHING, null=True, related_name="+"
-    )
-    entered_in_error = models.ForeignKey(
-        "v1.CanvasUser", on_delete=models.DO_NOTHING, null=True, related_name="+"
-    )
     order = models.ForeignKey(
         LabOrder, on_delete=models.DO_NOTHING, related_name="reasons", null=True
     )
     mode = models.CharField(max_length=30, choices=LabReasonMode)
 
 
-class LabOrderReasonCondition(Model):
+class LabOrderReasonCondition(TimestampedModel):
     """A class representing a lab order reason's condition."""
 
     class Meta:
         db_table = "canvas_sdk_data_api_laborderreasoncondition_001"
 
-    created = models.DateTimeField(auto_now_add=True)
-    modified = models.DateTimeField(auto_now=True)
     reason = models.ForeignKey(
         LabOrderReason, on_delete=models.DO_NOTHING, related_name="reason_conditions", null=True
     )

canvas_sdk/v1/data/line_item_transaction.py

@@ -1,7 +1,7 @@
 from django.db import models
 from django.db.models import QuerySet
 
-from canvas_sdk.v1.data.base import Model
+from canvas_sdk.v1.data.base import TimestampedModel
 
 
 class AbstractLineItemQuerySet(models.QuerySet):
@@ -12,7 +12,7 @@ class AbstractLineItemQuerySet(models.QuerySet):
         return self.filter(entered_in_error__isnull=True)
 
 
-class AbstractLineItemTransaction(Model):
+class AbstractLineItemTransaction(TimestampedModel):
     """Abstract class with common properties for both payments and adjustments."""
 
     class Meta:
@@ -28,9 +28,6 @@ class AbstractLineItemTransaction(Model):
     )
     amount = models.DecimalField(max_digits=8, decimal_places=2)
 
-    created = models.DateTimeField(auto_now_add=True)
-    modified = models.DateTimeField(auto_now=True)
-
 
 class NewLineItemPayment(AbstractLineItemTransaction):
     """Subclass that represents a payment on a billing line item."""

canvas_sdk/v1/data/medication.py

@@ -8,9 +8,9 @@ from canvas_sdk.v1.data.base import (
     CommittableQuerySetMixin,
     ForPatientQuerySetMixin,
     IdentifiableModel,
-    Model,
     ValueSetLookupQuerySet,
 )
+from canvas_sdk.v1.data.coding import Coding
 
 
 class Status(TextChoices):
@@ -20,7 +20,7 @@ class Status(TextChoices):
     INACTIVE = "inactive", "inactive"
 
 
-class MedicationQuerySet(ValueSetLookupQuerySet, CommittableQuerySetMixin, ForPatientQuerySetMixin):
+class MedicationQuerySet(CommittableQuerySetMixin, ForPatientQuerySetMixin, ValueSetLookupQuerySet):
     """MedicationQuerySet."""
 
     def active(self) -> Self:
@@ -59,17 +59,12 @@ class Medication(IdentifiableModel):
     erx_quantity = models.FloatField()
 
 
-class MedicationCoding(Model):
+class MedicationCoding(Coding):
     """MedicationCoding."""
 
     class Meta:
         db_table = "canvas_sdk_data_api_medicationcoding_001"
 
-    system = models.CharField(max_length=255)
-    version = models.CharField(max_length=255)
-    code = models.CharField(max_length=255)
-    display = models.CharField(max_length=1000)
-    user_selected = models.BooleanField()
     medication = models.ForeignKey(
         Medication, on_delete=models.DO_NOTHING, related_name="codings", null=True
     )

canvas_sdk/v1/data/medication_history.py

@@ -0,0 +1,142 @@
+from django.contrib.postgres.fields import ArrayField
+from django.db import models
+from django.db.models import TextChoices
+
+from canvas_sdk.v1.data.base import (
+    IdentifiableModel,
+    TimestampedModel,
+)
+from canvas_sdk.v1.data.coding import Coding
+
+
+class MedicationHistoryMedication(TimestampedModel, IdentifiableModel):
+    """MedicationHistoryMedication."""
+
+    class Meta:
+        db_table = "canvas_sdk_data_api_medicationhistorymedication_001"
+
+    patient = models.ForeignKey(
+        "v1.Patient",
+        on_delete=models.DO_NOTHING,
+        related_name="medication_history_medications",
+        null=True,
+    )
+
+    drug_description = models.TextField(blank=True, default="")
+
+    strength_value = models.CharField(max_length=255, blank=True, default="")
+    strength_form = models.CharField(max_length=255, blank=True, default="")
+    strength_unit_of_measure = models.CharField(max_length=255, blank=True, default="")
+
+    quantity = models.FloatField(null=True)
+    quantity_unit_of_measure = models.CharField(max_length=255, blank=True, default="")
+    quantity_code_list_qualifier = models.CharField(max_length=255, blank=True, default="")
+
+    days_supply = models.IntegerField(null=True)
+
+    last_fill_date = models.DateTimeField(db_index=True)
+    written_date = models.DateTimeField(blank=True, null=True)
+
+    other_date = models.DateTimeField(blank=True, null=True)
+    other_date_qualifier = models.CharField(max_length=255, blank=True, default="")
+
+    substitutions = models.BooleanField(null=True)
+
+    refills_remaining = models.IntegerField(null=True)
+
+    diagnosis_code = models.CharField(max_length=255, blank=True, default="")
+    diagnosis_qualifier = models.CharField(max_length=255, blank=True, default="")
+    diagnosis_description = models.CharField(max_length=255, blank=True, default="")
+
+    secondary_diagnosis_code = models.CharField(max_length=255, blank=True, default="")
+    secondary_diagnosis_qualifier = models.CharField(max_length=255, blank=True, default="")
+    secondary_diagnosis_description = models.CharField(max_length=255, blank=True, default="")
+
+    dea_schedule = models.CharField(max_length=255, blank=True, default="")
+
+    potency_unit_code = models.CharField(max_length=20, blank=True, default="")
+    etc_path_id = ArrayField(base_field=models.IntegerField(), null=True)
+    etc_path_name = ArrayField(base_field=models.CharField(max_length=255), null=True)
+
+    fill_number = models.IntegerField(blank=True, null=True)
+
+    prescriber_order_number = models.CharField(max_length=255, blank=True, default="")
+
+    source_description = models.CharField(max_length=255, blank=True, default="")
+    source_qualifier = models.CharField(max_length=255, blank=True, default="")
+    source_payer_id = models.CharField(max_length=255, blank=True, default="")
+    source_type = models.CharField(max_length=255, blank=True, default="")
+
+    note = models.TextField(blank=True, default="")
+    sig = models.TextField(blank=True, default="")
+
+    prior_authorization_status = models.CharField(max_length=255, blank=True, default="")
+    prior_authorization = models.CharField(max_length=255, blank=True, default="")
+
+    pharmacy_name = models.CharField(max_length=255, blank=True, default="")
+    pharmacy_ncpdp_id = models.CharField(max_length=255, blank=True, default="")
+    pharmacy_npi = models.CharField(max_length=255, blank=True, default="")
+
+    prescriber_business_name = models.CharField(max_length=255, blank=True, default="")
+    prescriber_first_name = models.CharField(max_length=255, blank=True, default="")
+    prescriber_last_name = models.CharField(max_length=255, blank=True, default="")
+    prescriber_npi = models.CharField(max_length=255, blank=True, default="")
+    prescriber_dea_number = models.CharField(max_length=255, blank=True, default="")
+
+
+class MedicationHistoryMedicationCoding(Coding):
+    """MedicationHistoryMedicationCoding."""
+
+    class Meta:
+        db_table = "canvas_sdk_data_api_medicationhistorymedicationcoding_001"
+
+    medication = models.ForeignKey(
+        MedicationHistoryMedication, on_delete=models.CASCADE, related_name="codings"
+    )
+
+
+class MedicationHistoryResponseStatus(TextChoices):
+    """MedicationHistoryResponseStatus."""
+
+    STATUS_APPROVED = "approved"
+    STATUS_DENIED = "denied"
+
+
+class MedicationHistoryResponse(TimestampedModel, IdentifiableModel):
+    """MedicationHistoryResponse."""
+
+    class Meta:
+        db_table = "canvas_sdk_data_api_medicationhistoryresponse_001"
+
+    patient = models.ForeignKey(
+        "v1.Patient",
+        on_delete=models.CASCADE,
+        related_name="medication_history_responses",
+    )
+    staff = models.ForeignKey(
+        "v1.Staff",
+        on_delete=models.CASCADE,
+        related_name="medication_history_responses",
+        null=True,
+    )
+
+    message_id = models.CharField(max_length=35, blank=True, default="", db_index=True)
+    related_to_message_id = models.CharField(max_length=35, blank=True, default="", db_index=True)
+
+    status = models.CharField(choices=MedicationHistoryResponseStatus.choices, max_length=20)
+
+    reason = models.TextField(blank=True, default="")
+    reason_code = models.CharField(max_length=2, blank=True, default="")
+
+    note = models.TextField(blank=True, default="")
+
+    start_date = models.DateField()
+    end_date = models.DateField()
+
+
+__exports__ = (
+    "MedicationHistoryMedication",
+    "MedicationHistoryMedicationCoding",
+    "MedicationHistoryResponseStatus",
+    "MedicationHistoryResponse",
+)

canvas_sdk/v1/data/medication_statement.py

@@ -0,0 +1,41 @@
+from django.db import models
+
+from canvas_sdk.v1.data.base import AuditedModel, IdentifiableModel
+
+
+class MedicationStatement(AuditedModel, IdentifiableModel):
+    """MedicationStatement."""
+
+    class Meta:
+        db_table = "canvas_sdk_data_api_medicationstatement_001"
+
+    patient = models.ForeignKey(
+        "v1.Patient", on_delete=models.DO_NOTHING, related_name="medication_statements"
+    )
+    note = models.ForeignKey(
+        "v1.Note", on_delete=models.DO_NOTHING, related_name="medication_statements"
+    )
+    medication = models.ForeignKey(
+        "v1.Medication",
+        on_delete=models.DO_NOTHING,
+        related_name="medication_statements",
+        null=True,
+    )
+    indications = models.ManyToManyField(
+        "v1.Assessment",
+        related_name="treatments_stated",
+        db_table="canvas_sdk_data_api_medicationstatement_indications_001",
+    )
+    start_date_original_input = models.CharField(max_length=255, default="")
+    start_date = models.DateField(default=None, null=True)
+    end_date_original_input = models.CharField(max_length=255, default="")
+    end_date = models.DateField(default=None, null=True)
+    dose_quantity = models.FloatField(null=True)
+    dose_form = models.CharField(max_length=255, default="")
+    dose_route = models.CharField(max_length=255, default="")
+    dose_frequency = models.FloatField(null=True)
+    dose_frequency_interval = models.CharField(max_length=255, default="")
+    sig_original_input = models.CharField(max_length=1000, default="")
+
+
+__exports__ = ("MedicationStatement",)

canvas_sdk/v1/data/message.py

@@ -1,6 +1,6 @@
 from django.db import models
 
-from canvas_sdk.v1.data.base import IdentifiableModel
+from canvas_sdk.v1.data.base import IdentifiableModel, TimestampedModel
 
 
 class TransmissionChannel(models.TextChoices):
@@ -12,14 +12,12 @@ class TransmissionChannel(models.TextChoices):
     NOOP = "noop", "No-op"
 
 
-class Message(IdentifiableModel):
+class Message(TimestampedModel, IdentifiableModel):
     """Message."""
 
     class Meta:
         db_table = "canvas_sdk_data_api_message_001"
 
-    created = models.DateTimeField(auto_now_add=True)
-    modified = models.DateTimeField(auto_now=True)
     content = models.TextField()
     sender = models.ForeignKey(
         "v1.CanvasUser", on_delete=models.DO_NOTHING, related_name="sent_messages", null=True
@@ -30,7 +28,7 @@ class Message(IdentifiableModel):
     note = models.ForeignKey(
         "v1.Note", on_delete=models.DO_NOTHING, related_name="message", null=True
     )
-    read = models.BooleanField()
+    read = models.DateTimeField(null=True, blank=True)
 
 
 class MessageAttachment(IdentifiableModel):
@@ -46,14 +44,12 @@ class MessageAttachment(IdentifiableModel):
     )
 
 
-class MessageTransmission(IdentifiableModel):
+class MessageTransmission(TimestampedModel, IdentifiableModel):
     """Message Transmission."""
 
     class Meta:
         db_table = "canvas_sdk_data_api_messagetransmission_001"
 
-    created = models.DateTimeField(auto_now_add=True)
-    modified = models.DateTimeField(auto_now=True)
     message = models.ForeignKey(
         "v1.Message", on_delete=models.DO_NOTHING, related_name="transmissions", null=True
     )

canvas_sdk/v1/data/note.py

@@ -1,8 +1,13 @@
+import uuid
+
 from django.contrib.postgres.fields import ArrayField
 from django.db import models
+from django.utils import timezone
 
-from canvas_sdk.v1.data.base import IdentifiableModel
+from canvas_sdk.v1.data.base import IdentifiableModel, TimestampedModel
 from canvas_sdk.v1.data.claim import Claim
+from canvas_sdk.v1.data.coding import Coding
+from canvas_sdk.v1.data.utils import empty_note_body
 
 
 class NoteTypeCategories(models.TextChoices):
@@ -103,6 +108,7 @@ class NoteStates(models.TextChoices):
     RECALLED = "RCL", "Recalled"
     UNDELETED = "UND", "Undeleted"
     DISCHARGED = "DSC", "Discharged"
+    SIGNED = "SGN", "Signed"
     # Appointment note
     SCHEDULING = "SCH", "Scheduling"
     BOOKED = "BKD", "Booked"
@@ -114,7 +120,7 @@ class NoteStates(models.TextChoices):
     CONFIRM_IMPORT = "CNF", "Confirmed"
 
 
-class NoteType(IdentifiableModel):
+class NoteType(TimestampedModel, IdentifiableModel, Coding):
     """NoteType."""
 
     objects: models.Manager["NoteType"]
@@ -122,45 +128,37 @@ class NoteType(IdentifiableModel):
     class Meta:
         db_table = "canvas_sdk_data_api_notetype_001"
 
-    created = models.DateTimeField(auto_now_add=True)
-    modified = models.DateTimeField(auto_now=True)
-    system = models.CharField(max_length=255)
-    version = models.CharField(max_length=255)
-    code = models.CharField(max_length=255)
-    display = models.CharField(max_length=1000)
-    user_selected = models.BooleanField()
     name = models.CharField(max_length=250)
     icon = models.CharField(max_length=250)
     category = models.CharField(choices=NoteTypeCategories.choices, max_length=50)
-    rank = models.PositiveIntegerField()
-    is_default_appointment_type = models.BooleanField()
-    is_scheduleable = models.BooleanField()
-    is_telehealth = models.BooleanField()
-    is_billable = models.BooleanField()
-    defer_place_of_service_to_practice_location = models.BooleanField()
+    rank = models.PositiveIntegerField(default=1)
+    is_default_appointment_type = models.BooleanField(default=False)
+    is_scheduleable = models.BooleanField(default=True)
+    is_telehealth = models.BooleanField(default=False)
+    is_billable = models.BooleanField(default=True)
+    defer_place_of_service_to_practice_location = models.BooleanField(default=False)
     available_places_of_service = ArrayField(
         models.CharField(choices=PracticeLocationPOS.choices, max_length=5)
     )
     default_place_of_service = models.CharField(choices=PracticeLocationPOS.choices, max_length=5)
-    is_system_managed = models.BooleanField()
-    is_visible = models.BooleanField()
-    is_active = models.BooleanField()
-    unique_identifier = models.UUIDField()
-    deprecated_at = models.DateTimeField()
-    is_patient_required = models.BooleanField()
-    allow_custom_title = models.BooleanField()
-    is_scheduleable_via_patient_portal = models.BooleanField()
-    online_duration = models.IntegerField()
-
-
-class Note(IdentifiableModel):
+    is_system_managed = models.BooleanField(default=False, editable=False)
+    is_visible = models.BooleanField(default=True)
+    is_active = models.BooleanField(default=True)
+    unique_identifier = models.UUIDField(default=uuid.uuid4, editable=False)
+    deprecated_at = models.DateTimeField(null=True, editable=False)
+    is_patient_required = models.BooleanField(default=False)
+    allow_custom_title = models.BooleanField(default=False)
+    is_scheduleable_via_patient_portal = models.BooleanField(default=False)
+    online_duration = models.IntegerField(default=0)
+    is_sig_required = models.BooleanField(default=True)
+
+
+class Note(TimestampedModel, IdentifiableModel):
     """Note."""
 
     class Meta:
         db_table = "canvas_sdk_data_api_note_001"
 
-    created = models.DateTimeField(auto_now_add=True)
-    modified = models.DateTimeField(auto_now=True)
     patient = models.ForeignKey(
         "v1.Patient", on_delete=models.DO_NOTHING, related_name="notes", null=True
     )
@@ -169,19 +167,19 @@ class Note(IdentifiableModel):
     )
     note_type = models.CharField(choices=NoteTypes.choices, null=True, max_length=50)
     note_type_version = models.ForeignKey(
-        "v1.NoteType", on_delete=models.DO_NOTHING, related_name="notes", null=True
+        "v1.NoteType", on_delete=models.DO_NOTHING, related_name="notes"
     )
-    title = models.TextField()
-    body = models.JSONField()
+    title = models.TextField(default="", blank=True)
+    body = models.JSONField(default=empty_note_body)
     originator = models.ForeignKey("v1.CanvasUser", on_delete=models.DO_NOTHING, null=True)
     last_modified_by_staff = models.ForeignKey("v1.Staff", on_delete=models.DO_NOTHING, null=True)
     checksum = models.CharField(max_length=32)
     billing_note = models.TextField()
     # TODO -implement InpatientStay model
     # inpatient_stay = models.ForeignKey("v1.InpatientStay", on_delete=models.DO_NOTHING, null=True)
-    related_data = models.JSONField()
+    related_data = models.JSONField(default=dict, blank=True)
     location = models.ForeignKey("v1.PracticeLocation", on_delete=models.DO_NOTHING, null=True)
-    datetime_of_service = models.DateTimeField()
+    datetime_of_service = models.DateTimeField(default=timezone.now)
     place_of_service = models.CharField(max_length=255)
 
     def get_claim(self) -> Claim | None:
@@ -192,14 +190,13 @@ class Note(IdentifiableModel):
         return self.claims.order_by("-created").first()
 
 
-class NoteStateChangeEvent(IdentifiableModel):
+class NoteStateChangeEvent(TimestampedModel, IdentifiableModel):
     """NoteStateChangeEvent."""
 
     class Meta:
+        ordering = ("created", "id")
         db_table = "canvas_sdk_data_api_notestatechangeevent_001"
 
-    created = models.DateTimeField()
-    modified = models.DateTimeField()
     note = models.ForeignKey("v1.Note", on_delete=models.DO_NOTHING, related_name="state_history")
     originator = models.ForeignKey("v1.CanvasUser", on_delete=models.DO_NOTHING, null=True)
     state = models.CharField(choices=NoteStates.choices, max_length=3)
@@ -217,7 +214,9 @@ class CurrentNoteStateEvent(IdentifiableModel):
         db_table = "canvas_sdk_data_current_note_state_001"
 
     state = models.CharField(choices=NoteStates.choices, max_length=3)
-    note = models.ForeignKey("v1.Note", on_delete=models.DO_NOTHING, related_name="current_state")
+    note = models.OneToOneField(
+        "v1.Note", on_delete=models.DO_NOTHING, related_name="current_state"
+    )
 
     def editable(self) -> bool:
         """Returns a boolean to indicate if the related note can be edited."""