Add created_by, last_edit_by, created_date, modified_date to PatientSample

care/facility/api/serializers/patient_sample.py

@@ -9,6 +9,8 @@
 from care.facility.models.patient_sample import SAMPLE_TYPE_CHOICES, PatientSample, PatientSampleFlow
 from care.utils.serializer.external_id_field import ExternalIdSerializerField
 from config.serializers import ChoiceField
+from care.users.api.serializers.user import UserBaseMinimumSerializer
+from care.facility.api.serializers import TIMESTAMP_FIELDS
 
 
 class PatientSampleFlowSerializer(serializers.ModelSerializer):
@@ -51,26 +53,37 @@ class PatientSampleSerializer(serializers.ModelSerializer):
 
     testing_facility = ExternalIdSerializerField(queryset=Facility.objects.all(), required=False)
     testing_facility_object = FacilityBasicInfoSerializer(source="testing_facility", read_only=True)
+    last_edited_by = UserBaseMinimumSerializer(read_only=True)
+    created_by = UserBaseMinimumSerializer(read_only=True)
 
     class Meta:
         model = PatientSample
-        read_only_fields = (
+        read_only_fields = TIMESTAMP_FIELDS + (
             "id",
             "facility",
+            "last_edited_by",
+            "created_by",
         )
-        exclude = TIMESTAMP_FIELDS + ("external_id",)
+        exclude = ("external_id", "deleted")
 
     def create(self, validated_data):
         validated_data.pop("status", None)
         validated_data.pop("result", None)
 
-        return super(PatientSampleSerializer, self).create(validated_data)
+        sample = super(PatientSampleSerializer, self).create(validated_data)
+        sample.created_by = self.context["request"].user
+        sample.last_edited_by = self.context["request"].user
+        sample.save()
+
+        return sample
+
 
 
 class PatientSamplePatchSerializer(PatientSampleSerializer):
     notes = serializers.CharField(required=False)
 
     def update(self, instance, validated_data):
+        instance.last_edited_by = self.context["request"].user
         try:
             is_completed = validated_data.get("result") in [1, 2]
             new_status = validated_data.get(

care/facility/migrations/0276_auto_20210930_1451.py

@@ -0,0 +1,26 @@
+# Generated by Django 2.2.11 on 2021-09-30 09:21
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('facility', '0275_auto_20210917_1544'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='patientsample',
+            name='created_by',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='created_by', to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AddField(
+            model_name='patientsample',
+            name='last_edited_by',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='last_edited_by', to=settings.AUTH_USER_MODEL),
+        ),
+    ]

care/facility/models/patient_sample.py

@@ -86,6 +86,9 @@ class PatientSample(FacilityBaseModel):
 
     testing_facility = models.ForeignKey("Facility", on_delete=models.SET_NULL, null=True, blank=True)
 
+    created_by = models.ForeignKey(User, on_delete=models.SET_NULL, null=True, related_name="created_by")
+    last_edited_by = models.ForeignKey(User, on_delete=models.SET_NULL, null=True, related_name="last_edited_by")
+
     def save(self, *args, **kwargs) -> None:
         if self.testing_facility is None:
             self.testing_facility = self.patient.facility