Don't treat event types as an instance of the model that was changed in the event in deserializer - add data attribute to event model so that event data is properly returned along with metadata

Author: chdastolfo

clever/api_client.py

@@ -258,10 +258,6 @@ def __deserialize(self, data, klass):
                 return {k: self.__deserialize(v, sub_kls)
                         for k, v in iteritems(data)}
 
-            if klass == 'Event':
-                klass = eval('models.'+''.join(data['type'].title().split('.')))
-                return self.__deserialize(data,klass)
-
             # convert str to class
             if klass in self.NATIVE_TYPES_MAPPING:
                 klass = self.NATIVE_TYPES_MAPPING[klass]

clever/models/event.py

@@ -33,28 +33,33 @@ class Event(object):
     swagger_types = {
         'created': 'str',
         'id': 'str',
-        'type': 'str'
+        'type': 'str',
+        'data': 'object'
     }
 
     attribute_map = {
         'created': 'created',
         'id': 'id',
-        'type': 'type'
+        'type': 'type',
+        'data': 'data'
     }
 
-    def __init__(self, created=None, id=None, type=None):
+    def __init__(self, created=None, id=None, type=None, data=None):
         """
         Event - a model defined in Swagger
         """
 
         self._created = None
         self._id = None
         self._type = None
+        self._data = None
 
         if created is not None:
           self.created = created
         if id is not None:
           self.id = id
+        if data is not None:
+          self.data = data
         self.type = type
 
     @property
@@ -122,6 +127,29 @@ def type(self, type):
 
         self._type = type
 
+    @property
+    def data(self):
+        """
+        Gets the data comprising of this Event.
+
+        :return: The data of this Event.
+        :rtype: object
+        """
+        return self._data
+
+    @data.setter
+    def data(self, data):
+        """
+        Sets the data of this Event.
+
+        :param data: The data of this Event.
+        :type: object
+        """
+        if data is None:
+            raise ValueError("Invalid value for `type`, must not be `None`")
+
+        self._data = data
+
     def to_dict(self):
         """
         Returns the model properties as a dict