From b8da01310e05b7b47b6bd4a0d0fd175b232a2e7a Mon Sep 17 00:00:00 2001 From: Abhiuday Date: Tue, 27 Feb 2024 19:53:49 +0530 Subject: [PATCH] fix(daily_round): added field level validation --- care/facility/api/serializers/daily_round.py | 12 +++++------- .../tests/test_patient_daily_rounds_api.py | 16 ++++------------ 2 files changed, 9 insertions(+), 19 deletions(-) diff --git a/care/facility/api/serializers/daily_round.py b/care/facility/api/serializers/daily_round.py index 0502fcd38d..053167a41c 100644 --- a/care/facility/api/serializers/daily_round.py +++ b/care/facility/api/serializers/daily_round.py @@ -50,7 +50,11 @@ class DailyRoundSerializer(serializers.ModelSerializer): required=False, ) temperature = serializers.DecimalField( - max_digits=5, decimal_places=2, required=True + max_value=106, + min_value=95, + max_digits=5, + decimal_places=2, + required=True, ) review_interval = serializers.IntegerField( source="consultation__review_interval", required=False @@ -350,12 +354,6 @@ def validate(self, attrs): } ) - if "temperature" in validated: - if validated["temperature"] < 95 or validated["temperature"] > 106: - raise ValidationError( - {"temperature": ["This field value must be between 95 and 106."]} - ) - if "additional_symptoms" in validated: if SymptomChoiceDict["OTHERS"] in validated["additional_symptoms"]: if "other_symptoms" not in validated: diff --git a/care/facility/tests/test_patient_daily_rounds_api.py b/care/facility/tests/test_patient_daily_rounds_api.py index 0bc804cf12..160c5bd032 100644 --- a/care/facility/tests/test_patient_daily_rounds_api.py +++ b/care/facility/tests/test_patient_daily_rounds_api.py @@ -14,19 +14,11 @@ def setUpTestData(cls) -> None: cls.district = cls.create_district(cls.state) cls.local_body = cls.create_local_body(cls.district) cls.super_user = cls.create_super_user("su", cls.district) - cls.facility = cls.create_facility( - cls.super_user, cls.district, cls.local_body - ) - cls.user = cls.create_user( - "staff1", cls.district, home_facility=cls.facility - ) - cls.patient = cls.create_patient( - district=cls.district, facility=cls.facility - ) + cls.facility = cls.create_facility(cls.super_user, cls.district, cls.local_body) + cls.user = cls.create_user("staff1", cls.district, home_facility=cls.facility) + cls.patient = cls.create_patient(district=cls.district, facility=cls.facility) cls.asset_location = cls.create_asset_location(cls.facility) - cls.bed = cls.create_bed( - facility=cls.facility, location=cls.asset_location - ) + cls.bed = cls.create_bed(facility=cls.facility, location=cls.asset_location) cls.consultation_without_bed = cls.create_consultation( facility=cls.facility, patient=cls.patient )