Rename pn_message_type string mapping

Author: Sebastian Molenda

pubnub/models/consumer/history.py

@@ -73,29 +73,7 @@ def from_json(cls, json_input, include_message_actions=False, include_message_ty
         for key, entry in json_input['channels'].items():
             channels[key] = []
             for item in entry:
-                message = PNFetchMessageItem(item['message'], item['timetoken'])
-                if 'uuid' in item:
-                    message.uuid = item['uuid']
-                if 'message_type' in item:
-                    message.message_type = item['message_type']
-
-                if 'meta' in item:
-                    message.meta = item['meta']
-
-                if include_message_actions:
-                    if 'actions' in item:
-                        message.actions = item['actions']
-                    else:
-                        message.actions = {}
-
-                if include_message_type:
-                    message.message_type = PNMessageType.from_response(
-                        message_type=item['type'] if 'type' in item.keys() else None,
-                        pn_message_type=item['message_type'])
-
-                if include_space_id:
-                    message.space_id = item['space_id']
-
+                message = PNFetchMessageItem(item, include_message_actions, include_message_type, include_space_id)
                 channels[key].append(message)
 
         return PNFetchMessagesResult(
@@ -106,11 +84,34 @@ def from_json(cls, json_input, include_message_actions=False, include_message_ty
 
 
 class PNFetchMessageItem(object):
-    def __init__(self, message, timetoken, meta=None, actions=None):
-        self.message = message
-        self.meta = meta
-        self.timetoken = timetoken
-        self.actions = actions
+    message = None
+    meta = None
+    timetoken = None
+    actions = None
+
+    def __init__(self, item, include_message_actions, include_message_type, include_space_id):
+        self.message = item['message']
+        self.timetoken = item['timetoken']
+
+        if 'uuid' in item:
+            self.uuid = item['uuid']
+
+        if 'meta' in item:
+            self.meta = item['meta']
+
+        if include_message_actions:
+            if 'actions' in item:
+                self.actions = item['actions']
+            else:
+                self.actions = {}
+
+        if include_message_type:
+            self.message_type = PNMessageType.from_response(
+                message_type=item['type'] if 'type' in item.keys() else None,
+                pn_message_type=item['message_type'])
+
+        if include_space_id:
+            self.space_id = item['space_id']
 
     def __str__(self):
         return "Fetch message item with tt: %s and content: %s" % (self.timetoken, self.message)

pubnub/models/consumer/message_type.py

@@ -2,12 +2,12 @@ class PNMessageType:
     pn_message_type: str = None
     message_type: str = None
     _type_mapping = {
-        'None': 'message',
-        '0': 'message',
-        '1': 'signal',
-        '2': 'object',
-        '3': 'message_action',
-        '4': 'file',
+        'None': 'pn_message',
+        '0': 'pn_message',
+        '1': 'pn_signal',
+        '2': 'pn_object',
+        '3': 'pn_message_action',
+        '4': 'pn_file',
     }
 
     def __init__(self, message_type: str = None) -> None:

tests/integrational/asyncio/test_heartbeat.py

@@ -77,6 +77,3 @@ async def test_timeout_event_on_broken_heartbeat(event_loop):
 
     await pubnub.stop()
     await pubnub_listener.stop()
-
-
-