Add check for empty comments and notes (#838)

* add checks for empty comments and notes

* use strip

care/facility/api/serializers/patient.py

@@ -119,7 +119,10 @@ class Meta:
     #     source="nearest_facility", read_only=True
     # )
 
-    source = ChoiceField(choices=PatientRegistration.SourceChoices, default=PatientRegistration.SourceEnum.CARE.value,)
+    source = ChoiceField(
+        choices=PatientRegistration.SourceChoices,
+        default=PatientRegistration.SourceEnum.CARE.value,
+    )
     disease_status = ChoiceField(choices=DISEASE_STATUS_CHOICES, default=DiseaseStatusEnum.SUSPECTED.value)
 
     meta_info = PatientMetaInfoSerializer(required=False, allow_null=True)
@@ -215,9 +218,7 @@ def create(self, validated_data):
                 patient.save()
 
             if contacted_patients:
-                contacted_patient_objs = [
-                    PatientContactDetails(**data, patient=patient) for data in contacted_patients
-                ]
+                contacted_patient_objs = [PatientContactDetails(**data, patient=patient) for data in contacted_patients]
                 PatientContactDetails.objects.bulk_create(contacted_patient_objs)
 
             patient.last_edited = self.context["request"].user
@@ -264,9 +265,7 @@ def update(self, instance, validated_data):
                 patient.contacted_patients.all().delete()
 
             if contacted_patients:
-                contacted_patient_objs = [
-                    PatientContactDetails(**data, patient=patient) for data in contacted_patients
-                ]
+                contacted_patient_objs = [PatientContactDetails(**data, patient=patient) for data in contacted_patients]
                 PatientContactDetails.objects.bulk_create(contacted_patient_objs)
 
             patient.last_edited = self.context["request"].user
@@ -315,7 +314,12 @@ class PatientSearchSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = PatientSearch
-        exclude = ("date_of_birth", "year_of_birth", "external_id", "id",) + TIMESTAMP_FIELDS
+        exclude = (
+            "date_of_birth",
+            "year_of_birth",
+            "external_id",
+            "id",
+        ) + TIMESTAMP_FIELDS
 
 
 class PatientTransferSerializer(serializers.ModelSerializer):
@@ -347,6 +351,11 @@ class PatientNotesSerializer(serializers.ModelSerializer):
     facility = FacilityBasicInfoSerializer(read_only=True)
     created_by_object = UserBaseMinimumSerializer(source="created_by", read_only=True)
 
+    def validate_empty_values(self, data):
+        if not data.get("note", "").strip():
+            raise serializers.ValidationError({"note": ["Note cannot be empty"]})
+        return super().validate_empty_values(data)
+
     class Meta:
         model = PatientNotes
         fields = ("note", "facility", "created_by_object", "created_date")

care/facility/api/serializers/resources.py

@@ -1,4 +1,3 @@
-from care.facility.models.resources import RESOURCE_SUB_CATEGORY_CHOICES
 from rest_framework import serializers
 from rest_framework.exceptions import ValidationError
 
@@ -9,9 +8,10 @@
     RESOURCE_STATUS_CHOICES,
     Facility,
     ResourceRequest,
-    User,
     ResourceRequestComment,
+    User,
 )
+from care.facility.models.resources import RESOURCE_SUB_CATEGORY_CHOICES
 from care.users.api.serializers.user import UserBaseMinimumSerializer
 from config.serializers import ChoiceField
 
@@ -47,18 +47,14 @@ class ResourceRequestSerializer(serializers.ModelSerializer):
     status = ChoiceField(choices=RESOURCE_STATUS_CHOICES)
 
     orgin_facility_object = FacilityBasicInfoSerializer(source="orgin_facility", read_only=True, required=False)
-    approving_facility_object = FacilityBasicInfoSerializer(
-        source="approving_facility", read_only=True, required=False
-    )
+    approving_facility_object = FacilityBasicInfoSerializer(source="approving_facility", read_only=True, required=False)
     assigned_facility_object = FacilityBasicInfoSerializer(source="assigned_facility", read_only=True, required=False)
 
     category = ChoiceField(choices=RESOURCE_CATEGORY_CHOICES)
     sub_category = ChoiceField(choices=RESOURCE_SUB_CATEGORY_CHOICES)
 
     orgin_facility = serializers.UUIDField(source="orgin_facility.external_id", allow_null=False, required=True)
-    approving_facility = serializers.UUIDField(
-        source="approving_facility.external_id", allow_null=False, required=True
-    )
+    approving_facility = serializers.UUIDField(source="approving_facility.external_id", allow_null=False, required=True)
     assigned_facility = serializers.UUIDField(source="assigned_facility.external_id", allow_null=True, required=False)
 
     assigned_to_object = UserBaseMinimumSerializer(source="assigned_to", read_only=True)
@@ -159,6 +155,11 @@ class ResourceRequestCommentSerializer(serializers.ModelSerializer):
 
     created_by_object = UserBaseMinimumSerializer(source="created_by", read_only=True)
 
+    def validate_empty_values(self, data):
+        if not data.get("comment", "").strip():
+            raise serializers.ValidationError({"comment": ["Comment cannot be empty"]})
+        return super().validate_empty_values(data)
+
     def create(self, validated_data):
         validated_data["created_by"] = self.context["request"].user
 

care/facility/api/serializers/shifting.py

@@ -13,8 +13,8 @@
     Facility,
     PatientRegistration,
     ShiftingRequest,
-    User,
     ShiftingRequestComment,
+    User,
 )
 from care.facility.models.notification import Notification
 from care.users.api.serializers.user import UserBaseMinimumSerializer
@@ -240,6 +240,11 @@ class ShiftingRequestCommentSerializer(serializers.ModelSerializer):
 
     created_by_object = UserBaseMinimumSerializer(source="created_by", read_only=True)
 
+    def validate_empty_values(self, data):
+        if not data.get("comment", "").strip():
+            raise serializers.ValidationError({"comment": ["Comment cannot be empty"]})
+        return super().validate_empty_values(data)
+
     def create(self, validated_data):
         validated_data["created_by"] = self.context["request"].user