fix(patient): adjusted field types (#99)

* adjusted field types

* pre commit fixes

Author: dkoutsonikolis

tmh_registry/registry/api/serializers.py

@@ -58,6 +58,19 @@ class Meta:
         model = PatientHospitalMapping
         fields = ["patient_hospital_id", "hospital_id"]
 
+    def to_representation(self, instance):
+        data = super(
+            PatientHospitalMappingPatientSerializer, self
+        ).to_representation(instance)
+
+        data["patient_hospital_id"] = (
+            int(data["patient_hospital_id"])
+            if data["patient_hospital_id"]
+            else None
+        )
+
+        return data
+
 
 class ReadPatientSerializer(ModelSerializer):
     age = IntegerField(allow_null=True)
@@ -135,6 +148,35 @@ def to_representation(self, instance):
         return serializer.data
 
     def create(self, validated_data):
+        try:
+            input_national_id = validated_data.get("national_id")
+            validated_data["national_id"] = (
+                int(input_national_id) if input_national_id else None
+            )
+        except ValueError:
+            raise ValidationError(
+                {"error": "The 'national_id' field should be an integer."}
+            )
+
+        try:
+            input_phone_1 = validated_data.get("phone_1")
+            validated_data["phone_1"] = (
+                int(input_phone_1) if input_phone_1 else None
+            )
+        except ValueError:
+            raise ValidationError(
+                {"error": "The 'phone_1' field should be an integer."}
+            )
+
+        try:
+            input_phone_2 = validated_data.get("phone_2")
+            validated_data["phone_2"] = (
+                int(input_phone_2) if input_phone_2 else None
+            )
+        except ValueError:
+            raise ValidationError(
+                {"error": "The 'phone_2' field should be an integer."}
+            )
 
         if not validated_data.get("year_of_birth", None):
             if validated_data["age"]:
@@ -165,7 +207,18 @@ def create(self, validated_data):
                 {"error": "The patient needs to be registered to a hospital."}
             )
 
-        patient_hospital_id = validated_data.pop("patient_hospital_id", None)
+        try:
+            patient_hospital_id = validated_data.pop("patient_hospital_id")
+            patient_hospital_id = (
+                int(patient_hospital_id) if patient_hospital_id else None
+            )
+        except ValueError:
+            raise ValidationError(
+                {
+                    "error": "The 'patient_hospital_id' field should be an integer."
+                }
+            )
+
         if patient_hospital_id:
             if PatientHospitalMapping.objects.filter(
                 hospital_id=hospital.id,
@@ -179,7 +232,7 @@ def create(self, validated_data):
                 )
         else:
             raise ValidationError(
-                {"error": "The patient needs to be registered to a hospital."}
+                {"error": "The 'patient_hospital_id' should be provided."}
             )
 
         validated_data["gender"] = (
@@ -211,6 +264,19 @@ class Meta:
         model = PatientHospitalMapping
         fields = ["patient", "hospital", "patient_hospital_id"]
 
+    def to_representation(self, instance):
+        data = super(
+            PatientHospitalMappingReadSerializer, self
+        ).to_representation(instance)
+
+        data["patient_hospital_id"] = (
+            int(data["patient_hospital_id"])
+            if data["patient_hospital_id"]
+            else None
+        )
+
+        return data
+
 
 class PatientHospitalMappingWriteSerializer(ModelSerializer):
     patient_id = PrimaryKeyRelatedField(queryset=Patient.objects.all())
@@ -225,6 +291,19 @@ def to_representation(self, instance):
         return serializer.data
 
     def create(self, validated_data):
+        try:
+            validated_data["patient_hospital_id"] = int(
+                validated_data.get("patient_hospital_id")
+            )
+        except ValueError:
+            raise ValidationError(
+                {
+                    "error": "The 'patient_hospital_id' field should be an integer."
+                }
+            )
+        validated_data["patient_hospital_id"] = str(
+            validated_data["patient_hospital_id"]
+        )
         validated_data["patient_id"] = validated_data["patient_id"].id
         validated_data["hospital_id"] = validated_data["hospital_id"].id
 

tmh_registry/registry/factories.py

@@ -52,7 +52,9 @@ class Meta:
 
     patient = SubFactory(PatientFactory)
     hospital = SubFactory(HospitalFactory)
-    patient_hospital_id = LazyAttribute(lambda _: faker.ssn())
+    patient_hospital_id = LazyAttribute(
+        lambda _: faker.numerify(text="#########")
+    )
 
 
 class EpisodeFactory(DjangoModelFactory):

tmh_registry/registry/tests/api/viewsets/episodes/test_post.py

@@ -100,7 +100,7 @@ def test_create_episode_successful(self):
 
         self.assertEqual(
             response.data["patient_hospital_mapping"]["patient_hospital_id"],
-            self.patient_hospital_mapping.patient_hospital_id,
+            int(self.patient_hospital_mapping.patient_hospital_id),
         )
         self.assertEqual(response.data["surgery_date"], data["surgery_date"])
         self.assertEqual(response.data["episode_type"], data["episode_type"])

tmh_registry/registry/tests/api/viewsets/test_patient_hospital_mappings.py

@@ -24,7 +24,7 @@ def test_create_successful(self):
         data = {
             "patient_id": patient.id,
             "hospital_id": hospital.id,
-            "patient_hospital_id": "blabla",
+            "patient_hospital_id": 1234,
         }
 
         response = self.client.post(

tmh_registry/registry/tests/api/viewsets/test_patients.py

@@ -1,6 +1,7 @@
 import datetime
 
 from django.test import TestCase
+from parameterized import parameterized
 from pytest import mark
 from rest_framework.authtoken.models import Token
 from rest_framework.status import (
@@ -37,7 +38,7 @@ def setUpClass(cls) -> None:
         cls.patient.created_at = datetime.date(year=2021, month=4, day=11)
         cls.patient.save()
 
-        cls.patient_hospital_mapping = PatientHospitalMapping.objects.create(
+        cls.patient_hospital_mapping = PatientHospitalMappingFactory(
             patient=cls.patient, hospital=cls.hospital
         )
         cls.episode = EpisodeFactory(
@@ -63,7 +64,7 @@ def get_patient_test_data(self):
             "phone_2": 324362141,
             "address": "16 Test Street, Test City, Test Country",
             "hospital_id": self.hospital.id,
-            "patient_hospital_id": "1111",
+            "patient_hospital_id": 1111,
         }
 
     ######################
@@ -82,7 +83,7 @@ def test_get_patients_list_successful(self):
             1, len(response.data["results"][0]["hospital_mappings"])
         )
         self.assertEqual(
-            self.patient_hospital_mapping.patient_hospital_id,
+            int(self.patient_hospital_mapping.patient_hospital_id),
             response.data["results"][0]["hospital_mappings"][0][
                 "patient_hospital_id"
             ],
@@ -224,7 +225,7 @@ def test_get_patients_detail_successful(self):
             response.data["hospital_mappings"][0]["hospital_id"],
         )
         self.assertEqual(
-            patient_hospital_id,
+            int(patient_hospital_id),
             response.data["hospital_mappings"][0]["patient_hospital_id"],
         )
 
@@ -286,7 +287,8 @@ def test_get_patients_detail_with_multiple_hospitals(self):
                 patient_id=self.patient.id,
             ).patient_hospital_id
             self.assertEqual(
-                patient_hospital_id, hospital_mapping["patient_hospital_id"]
+                int(patient_hospital_id),
+                hospital_mapping["patient_hospital_id"],
             )
 
     ########################
@@ -343,7 +345,7 @@ def test_create_patients_only_with_mandatory_fields(self):
         data["full_name"] = "John Doe"
         data["year_of_birth"] = 1989
         data["hospital_id"] = self.hospital.id
-        data["patient_hospital_id"] = "1111"
+        data["patient_hospital_id"] = 1111
 
         response = self.client.post(
             "/api/v1/patients/", data=data, format="json"
@@ -434,3 +436,21 @@ def test_create_patient_without_hospital_id(self):
         )
 
         self.assertEqual(HTTP_400_BAD_REQUEST, response.status_code)
+
+    @parameterized.expand(
+        [
+            ("national_id", "ABC12345"),
+            ("phone_1", "GR30697111111"),
+            ("phone_2", "GR30697122222"),
+            ("patient_hospital_id", "HOSP1234"),
+        ]
+    )
+    def test_create_patient_with_invalid_values(self, field, value):
+        data = self.get_patient_test_data()
+        data[field] = value
+
+        response = self.client.post(
+            "/api/v1/patients/", data=data, format="json"
+        )
+
+        self.assertEqual(HTTP_400_BAD_REQUEST, response.status_code)