Fix Whatsapp Messages

ohcnetwork · Jun 23, 2021 · 3bce6e6 · 3bce6e6
1 parent b70204a
commit 3bce6e6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/care/facility/api/serializers/patient_consultation.py b/care/facility/api/serializers/patient_consultation.py
@@ -95,8 +95,12 @@ def update(self, instance, validated_data):
             if validated_data["is_kasp"] and (not instance.is_kasp):
                 validated_data["kasp_enabled_date"] = localtime(now())
 
+        _temp = instance.assigned_to
+
+        consultation = super().update(instance, validated_data)
+
         if "assigned_to" in validated_data:
-            if validated_data["assigned_to"] != instance.assigned_to:
+            if validated_data["assigned_to"] != _temp and validated_data["assigned_to"]:
                 NotificationGenerator(
                     event=Notification.Event.PATIENT_CONSULTATION_ASSIGNMENT,
                     caused_by=self.context["request"].user,
@@ -105,8 +109,6 @@ def update(self, instance, validated_data):
                     notification_mediums=[Notification.Medium.SYSTEM, Notification.Medium.WHATSAPP],
                 ).generate()
 
-        consultation = super().update(instance, validated_data)
-
         NotificationGenerator(
             event=Notification.Event.PATIENT_CONSULTATION_UPDATED,
             caused_by=self.context["request"].user,

diff --git a/care/utils/notification_handler.py b/care/utils/notification_handler.py
@@ -348,9 +348,9 @@ def generate(self):
             elif medium == Notification.Medium.WHATSAPP.value and settings.ENABLE_WHATSAPP:
                 for user in self.generate_whatsapp_users():
                     number = user.alt_phone_number
+                    message = self.generate_whatsapp_message()
                     notification_obj = self.generate_message_for_user(
                         user, message, Notification.Medium.WHATSAPP.value
                     )
-                    message = self.generate_whatsapp_message()
                     sendWhatsappMessage(number, message, notification_obj.external_id)