Merge pull request #34 from 007vedant/dev

Updated PatientNofifications Model and introduced new field of rtype

Author: 007vedant

server/healthOfficial/routes.py

@@ -3,7 +3,7 @@
 from bson import ObjectId
 from flask import request, jsonify, Blueprint
 from server.utils import token_required
-from server.models import Patient, HealthOfficial, Record, ConsultationRequest
+from server.models import Patient, HealthOfficial, Record, PatientNotifications
 from flask_cors import CORS
 
 healthOfficial = Blueprint("healthOfficial", __name__)
@@ -169,9 +169,15 @@ def deleteRequest(_id):
             crequests.append(crequest)
 
     healthOfficial.consultationRequests = crequests
+    pnotif = PatientNotifications(healthOfficial=ObjectId(_id), rtype="consult")
 
     if approved == "True":
         healthOfficial.patients.append(ObjectId(p_id))
+        pnotif.approved = True
 
+    patient = Patient.objects(_id=ObjectId(p_id)).first()
+    patient.notifs.append(pnotif)
+
+    patient.save()
     healthOfficial.save()
     return jsonify({"message": "Request executed successfully."})

server/models.py

@@ -19,6 +19,7 @@ class PatientNotifications(EmbeddedDocument):
     approved = BooleanField(default=False)
     healthOfficial = ObjectIdField()
     record = ObjectIdField()
+    rtype = StringField()
 
     meta = {"collection": "patientNotifications"}
 

server/notifications/routes.py

@@ -17,7 +17,7 @@ def getNotifications(_id):
 
         try:
             notif = PatientNotifications(
-                healthOfficial=ObjectId(_id), record=ObjectId(rid)
+                healthOfficial=ObjectId(_id), record=ObjectId(rid), rtype="consent"
             )
             patient = Patient.objects(_id=ObjectId(pid)).first()
             patient.notifs.append(notif)
@@ -37,6 +37,7 @@ def getNotifications(_id):
             notif_obj = dict()
             notif_obj["id"] = str(notif._id)
             notif_obj["approved"] = notif.approved
+            notif_obj["rtype"] = notif.rtype
 
             rid = notif.record
             record_obj = dict()