Skip to content

Commit

Permalink
fix(daily_round): added field level validation
Browse files Browse the repository at this point in the history
  • Loading branch information
aeswibon committed Feb 27, 2024
1 parent 4daf666 commit b8da013
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 19 deletions.
12 changes: 5 additions & 7 deletions care/facility/api/serializers/daily_round.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down
16 changes: 4 additions & 12 deletions care/facility/tests/test_patient_daily_rounds_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand Down

0 comments on commit b8da013

Please sign in to comment.