Fix webhooks

Author: sadiv

whatsapp_api_client_python/tools/webhooks.py

@@ -1,5 +1,6 @@
 from whatsapp_api_client_python.response import Response
 from datetime import datetime
+import json
 from enum import Enum
 
 
@@ -36,62 +37,68 @@ def startReceivingNotifications(self) -> bool:
     def stopReceivingNotifications(self) -> bool:
         self.started = False
 
-    def onIncomingMessageReceived(body):
+    def onIncomingMessageReceived(self, body):
         idMessage = body['idMessage']
         eventDate = datetime.fromtimestamp(body['timestamp'])
         senderData = body['senderData']
         messageData = body['messageData']
         print(idMessage + ': ' 
-            + 'At ' + eventDate + 'Incoming from ' \
-            + senderData + ' message = ' + messageData)
+            + 'At ' + str(eventDate) + ' Incoming from ' \
+            + json.dumps(senderData, ensure_ascii=False) \
+            + ' message = ' + json.dumps(messageData, ensure_ascii=False))
 
-    def onIncomingCall(body):
+    def onIncomingCall(self, body):
         idMessage = body['idMessage']
         eventDate = datetime.fromtimestamp(body['timestamp'])
         fromWho = body['from']
         print(idMessage + ': ' 
             + 'Call from ' + fromWho 
             + ' at ' + str(eventDate))
 
-    def onDeviceInfo(body):
+    def onDeviceInfo(self, body):
         eventDate = datetime.fromtimestamp(body['timestamp'])
         deviceData = body['deviceData']
-        print('At ' + eventDate + ': ' + deviceData)
+        print('At ' + str(eventDate) + ': ' \
+            + json.dumps(deviceData, ensure_ascii=False))
 
-    def onOutgoingMessageReceived(body):
+    def onOutgoingMessageReceived(self, body):
         idMessage = body['idMessage']
         eventDate = datetime.fromtimestamp(body['timestamp'])
         senderData = body['senderData']
         messageData = body['messageData']
         print(idMessage + ': ' 
-            + 'At ' + eventDate + 'Outgoing from ' \
-            + senderData + ' message = ' + messageData)
+            + 'At ' + str(eventDate) + ' Outgoing from ' \
+            + json.dumps(senderData, ensure_ascii=False) \
+            + ' message = ' + json.dumps(messageData, ensure_ascii=False))
 
-    def onOutgoingAPIMessageReceived(body):
+    def onOutgoingAPIMessageReceived(self, body):
         idMessage = body['idMessage']
         eventDate = datetime.fromtimestamp(body['timestamp'])
         senderData = body['senderData']
         messageData = body['messageData']
         print(idMessage + ': ' 
-            + 'At ' + eventDate + ' API outgoing from ' + senderData + \
-            ' message = ' + messageData)
+            + 'At ' + str(eventDate) + ' API outgoing from ' \
+            + json.dumps(senderData, ensure_ascii=False) + \
+            ' message = ' + json.dumps(messageData, ensure_ascii=False))
 
-    def onOutgoingMessageStatus(body):
+    def onOutgoingMessageStatus(self, body):
         idMessage = body['idMessage']
         status = body['status']
         eventDate = datetime.fromtimestamp(body['timestamp'])
         print(idMessage + ': ' 
-            + 'At ' + eventDate + ' status = ' + status)
+            + 'At ' + str(eventDate) + ' status = ' + status)
 
-    def onStateInstanceChanged(body):
+    def onStateInstanceChanged(self, body):
         eventDate = datetime.fromtimestamp(body['timestamp'])
         stateInstance = body['stateInstance']
-        print('At ' + eventDate + ' state instance = ' + stateInstance)
+        print('At ' + str(eventDate) + ' state instance = ' \
+            + json.dumps(stateInstance, ensure_ascii=False))
 
-    def onStatusInstanceChanged(body):
+    def onStatusInstanceChanged(self, body):
         eventDate = datetime.fromtimestamp(body['timestamp'])
         statusInstance = body['statusInstance']
-        print('At ' + eventDate + ' status instance = ' + statusInstance)
+        print('At ' + str(eventDate) + ' status instance = ' \
+            + json.dumps(statusInstance, ensure_ascii=False))
 
     def job(self) -> None:
         print('Incoming notifications are being received. '\
@@ -106,27 +113,27 @@ def job(self) -> None:
                         continue
                     body = resultReceive.data['body']
                     typeWebhook = body['typeWebhook']
-                    if typeWebhook == TypeWebhook.INCOMING_MESSAGE_RECEIVED:
+                    if typeWebhook == TypeWebhook.INCOMING_MESSAGE_RECEIVED.value:
                         self.onIncomingMessageReceived(body)      
-                    elif typeWebhook == TypeWebhook.DEVICE_INFO:   
+                    elif typeWebhook == TypeWebhook.DEVICE_INFO.value:   
                         self.onDeviceInfo(body)              
-                    elif typeWebhook == TypeWebhook.INCOMING_CALL:
+                    elif typeWebhook == TypeWebhook.INCOMING_CALL.value:
                         self.onIncomingCall(body)
-                    elif typeWebhook == TypeWebhook.INCOMING_MESSAGE_RECEIVED:
+                    elif typeWebhook == TypeWebhook.INCOMING_MESSAGE_RECEIVED.value:
                         self.onIncomingMessageReceived(body)
-                    elif typeWebhook == TypeWebhook.OUTGOING_API_MESSAGE_RECEIVED:
+                    elif typeWebhook == TypeWebhook.OUTGOING_API_MESSAGE_RECEIVED.value:
                         self.onOutgoingAPIMessageReceived(body)
-                    elif typeWebhook == TypeWebhook.OUTGOING_MESSAGE_RECEIVED:
+                    elif typeWebhook == TypeWebhook.OUTGOING_MESSAGE_RECEIVED.value:
                         self.onOutgoingMessageReceived(body)
-                    elif typeWebhook == TypeWebhook.OUTGOING_MESSAGE_STATUS:
+                    elif typeWebhook == TypeWebhook.OUTGOING_MESSAGE_STATUS.value:
                         self.onOutgoingMessageStatus(body)
-                    elif typeWebhook == TypeWebhook.STATE_INSTANCE_CHANGED:
+                    elif typeWebhook == TypeWebhook.STATE_INSTANCE_CHANGED.value:
                         self.onStateInstanceChanged(body)
-                    elif typeWebhook == TypeWebhook.STATUS_INSTANCE_CHANGED:
+                    elif typeWebhook == TypeWebhook.STATUS_INSTANCE_CHANGED.value:
                         self.onStatusInstanceChanged(body)    
                     self.restApi.receiving.deleteNotification(
                         resultReceive.data['receiptId'])
             print('End receiving')
         except KeyboardInterrupt:
             print('End receiving')
-            pass
+            pass