add taken at field for events

care/facility/api/serializers/daily_round.py

@@ -253,6 +253,7 @@ def create(self, validated_data):
                 daily_round_obj,
                 daily_round_obj.created_by_id,
                 daily_round_obj.created_date,
+                taken_at=daily_round_obj.taken_at,
             )
             return daily_round_obj
 

care/facility/api/serializers/patient_consultation.py

@@ -273,7 +273,7 @@ def update(self, instance, validated_data):
             consultation,
             self.context["request"].user.id,
             consultation.modified_date,
-            old_instance,
+            old=old_instance,
         )
 
         if "assigned_to" in validated_data:
@@ -819,7 +819,7 @@ def update(self, instance: PatientConsultation, validated_data):
                 instance,
                 self.context["request"].user.id,
                 instance.modified_date,
-                old_instance,
+                old=old_instance,
             )
 
             return instance

care/facility/api/viewsets/events.py

@@ -49,9 +49,11 @@ def roots(self, request):
 class PatientConsultationEventFilterSet(filters.FilterSet):
     class Meta:
         model = PatientConsultationEvent
-        fields = {
-            "event_type": ["exact"],
-        }
+        fields = [
+            "event_type",
+            "caused_by",
+            "is_latest",
+        ]
 
 
 class PatientConsultationEventViewSet(ReadOnlyModelViewSet):
@@ -60,8 +62,9 @@ class PatientConsultationEventViewSet(ReadOnlyModelViewSet):
         "event_type", "caused_by"
     )
     permission_classes = (IsAuthenticated,)
-    filter_backends = (filters.DjangoFilterBackend,)
+    filter_backends = (filters.DjangoFilterBackend, filters.OrderingFilter)
     filterset_class = PatientConsultationEventFilterSet
+    ordering_fields = ("created_date", "taken_at")
     # lookup_field = "external_id"
     # lookup_url_kwarg = "external_id"
 

care/facility/events/handler.py

@@ -16,6 +16,7 @@ def create_consultation_event_entry(
     object_instance: Model,
     caused_by: int,
     created_date: datetime,
+    taken_at: datetime,
     old_instance: Model | None = None,
     fields_to_store: set[str] | None = None,
 ):
@@ -49,7 +50,7 @@ def create_consultation_event_entry(
                 is_latest=True,
                 object_model=object_instance.__class__.__name__,
                 object_id=object_instance.id,
-                created_date__lt=created_date,
+                taken_at__lt=taken_at,
             ).update(is_latest=False)
             batch.append(
                 PatientConsultationEvent(
@@ -58,6 +59,7 @@ def create_consultation_event_entry(
                     event_type_id=group_id,
                     is_latest=True,
                     created_date=created_date,
+                    taken_at=taken_at,
                     object_model=object_instance.__class__.__name__,
                     object_id=object_instance.id,
                     value=value,
@@ -78,12 +80,16 @@ def create_consultation_events(
     objects: list | QuerySet | Model,
     caused_by: int,
     created_date: datetime = None,
+    taken_at: datetime = None,
     old: Model | None = None,
     fields_to_store: list[str] | set[str] | None = None,
 ):
     if created_date is None:
         created_date = now()
 
+    if taken_at is None:
+        taken_at = created_date
+
     with transaction.atomic():
         if isinstance(objects, (QuerySet, list, tuple)):
             if old is not None:
@@ -96,6 +102,7 @@ def create_consultation_events(
                     obj,
                     caused_by,
                     created_date,
+                    taken_at,
                     fields_to_store=set(fields_to_store) if fields_to_store else None,
                 )
         else:
@@ -104,6 +111,7 @@ def create_consultation_events(
                 objects,
                 caused_by,
                 created_date,
+                taken_at,
                 old,
                 fields_to_store=set(fields_to_store) if fields_to_store else None,
             )

care/facility/migrations/0447_patientconsultationevent_taken_at.py

@@ -0,0 +1,30 @@
+# Generated by Django 4.2.10 on 2024-07-02 10:44
+
+from django.db import migrations, models
+
+
+def backfill_taken_at(apps, schema_editor):
+    PatientConsultationEvent = apps.get_model("facility", "PatientConsultationEvent")
+    PatientConsultationEvent.objects.filter(taken_at__isnull=True).update(
+        taken_at=models.F("created_date")
+    )
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("facility", "0446_alter_notification_event"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="patientconsultationevent",
+            name="taken_at",
+            field=models.DateTimeField(db_index=True, null=True),
+        ),
+        migrations.RunPython(backfill_taken_at, reverse_code=migrations.RunPython.noop),
+        migrations.AlterField(
+            model_name="patientconsultationevent",
+            name="taken_at",
+            field=models.DateTimeField(db_index=True),
+        ),
+    ]

care/facility/models/events.py

@@ -55,6 +55,7 @@ class PatientConsultationEvent(models.Model):
     )
     caused_by = models.ForeignKey(User, on_delete=models.PROTECT)
     created_date = models.DateTimeField(db_index=True)
+    taken_at = models.DateTimeField(db_index=True)
     object_model = models.CharField(
         max_length=50, db_index=True, null=False, blank=False
     )