Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix bed assignment validation for admission #1945

Merged
merged 3 commits into from
Mar 5, 2024
Merged

Fix bed assignment validation for admission #1945

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
16b7cbb
Fix bed assignment validation for admission
Ashesh3 Mar 5, 2024
89f9749
add tests
Ashesh3 Mar 5, 2024
d37985a
add comments for suggestion choices
Ashesh3 Mar 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions care/facility/api/serializers/daily_round.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,8 +179,11 @@ def create(self, validated_data):
)
# Authorisation Checks End

# Patient needs to have a bed assigned
if not consultation.current_bed:
# Patient needs to have a bed assigned for admission
if (
not consultation.current_bed
and consultation.suggestion == SuggestionChoices.A
):
raise ValidationError(
{
"bed": "Patient does not have a bed assigned. Please assign a bed first"
Expand Down
26 changes: 22 additions & 4 deletions care/facility/tests/test_patient_daily_rounds_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
from rest_framework.test import APITestCase

from care.facility.models import PatientRegistration
from care.facility.models.patient_consultation import PatientConsultation
from care.utils.tests.test_utils import TestUtils


Expand All @@ -19,8 +20,15 @@ def setUpTestData(cls) -> None:
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.consultation_without_bed = cls.create_consultation(
facility=cls.facility, patient=cls.patient
cls.admission_consultation_no_bed = cls.create_consultation(
facility=cls.facility,
patient=cls.patient,
suggestion=PatientConsultation.SUGGESTION_CHOICES[1][0],
Ashesh3 marked this conversation as resolved.
Show resolved Hide resolved
)
cls.domiciliary_consultation_no_bed = cls.create_consultation(
facility=cls.facility,
patient=cls.patient,
suggestion=PatientConsultation.SUGGESTION_CHOICES[4][0],
)
cls.consultation_with_bed = cls.create_consultation(
facility=cls.facility, patient=cls.patient
Expand Down Expand Up @@ -65,11 +73,11 @@ def test_action_in_log_update(
patient.action, PatientRegistration.ActionEnum.DISCHARGE_RECOMMENDED.value
)

def test_log_update_without_bed(
def test_log_update_without_bed_for_admission(
self,
):
response = self.client.post(
f"/api/v1/consultation/{self.consultation_without_bed.external_id}/daily_rounds/",
f"/api/v1/consultation/{self.admission_consultation_no_bed.external_id}/daily_rounds/",
data=self.log_update,
format="json",
)
Expand All @@ -78,3 +86,13 @@ def test_log_update_without_bed(
response.data["bed"],
"Patient does not have a bed assigned. Please assign a bed first",
)

def test_log_update_without_bed_for_domiciliary(
self,
):
response = self.client.post(
f"/api/v1/consultation/{self.domiciliary_consultation_no_bed.external_id}/daily_rounds/",
data=self.log_update,
format="json",
)
self.assertEqual(response.status_code, status.HTTP_201_CREATED)
Loading