Merge pull request #33 from 007vedant/dev

Update consultation request routes & models to included patient name in JSON response object

Author: 007vedant

server/models.py

@@ -10,8 +10,8 @@
     BooleanField,
     ObjectIdField,
     EmbeddedDocumentField,
+    EmbeddedDocumentListField,
 )
-from mongoengine.fields import EmbeddedDocumentListField
 
 
 class PatientNotifications(EmbeddedDocument):
@@ -47,6 +47,7 @@ class ConsultationData(EmbeddedDocument):
 class ConsultationRequest(EmbeddedDocument):
     _id = ObjectIdField(default=ObjectId)
     patient = ObjectIdField()
+    patientName = StringField()
     healthOfficial = ObjectIdField()
     consultationData = EmbeddedDocumentField(ConsultationData)
     approved = BooleanField(default=False)
@@ -75,4 +76,4 @@ class HealthOfficial(Document):
     consultationRequests = EmbeddedDocumentListField(ConsultationRequest)
     records = StringField()
 
-    meta = {"collection": "healthOfficial"}
+    meta = {"collection": "healthOfficial"}

server/records/routes.py

@@ -211,6 +211,7 @@ def addConsultationRequest(_id):
             )
             consultationRequest = ConsultationRequest(
                 patient=ObjectId(_id),
+                patientName=Patient.objects.get(_id=ObjectId(_id)).name,
                 healthOfficial=ObjectId(hid),
                 consultationData=consultationData,
             )
@@ -225,4 +226,4 @@ def addConsultationRequest(_id):
             return jsonify({"message": "Unexpected error occurred."}), 500
 
     else:
-        return jsonify({"message": "Bad Request"}), 400
+        return jsonify({"message": "Bad Request"}), 400