Merge pull request #43 from bunq/feature/callback_models_bunq/sdk_python#40

Feature/callback models bunq/sdk python#40

Author: dnl-blkv

bunq/sdk/json/adapters.py

@@ -3,9 +3,9 @@
 
 from bunq.sdk import client
 from bunq.sdk import context
-from bunq.sdk.model import core
 from bunq.sdk import security
 from bunq.sdk.json import converter
+from bunq.sdk.model import core
 from bunq.sdk.model.generated import endpoint
 from bunq.sdk.model.generated import object_
 
@@ -387,20 +387,31 @@ def deserialize(cls, target_class, obj):
         share_detail.__dict__ = {
             cls._ATTRIBUTE_PAYMENT: converter.deserialize(
                 object_.ShareDetailPayment,
-                obj[cls._FIELD_PAYMENT]
+                cls._get_field_or_none(cls._FIELD_DRAFT_PAYMENT, obj)
             ),
             cls._ATTRIBUTE_READ_ONLY: converter.deserialize(
                 object_.ShareDetailReadOnly,
-                obj[cls._FIELD_READ_ONLY]
+                cls._get_field_or_none(cls._FIELD_READ_ONLY, obj)
             ),
             cls._ATTRIBUTE_DRAFT_PAYMENT: converter.deserialize(
                 object_.ShareDetailDraftPayment,
-                obj[cls._FIELD_DRAFT_PAYMENT]
+                cls._get_field_or_none(cls._FIELD_DRAFT_PAYMENT, obj)
             ),
         }
 
         return share_detail
 
+    @staticmethod
+    def _get_field_or_none(field, obj):
+        """
+        :type field: str
+        :type obj: dict
+
+        :return: dict|None
+        """
+
+        return obj[field] if field in obj else None
+
     @classmethod
     def serialize(cls, share_detail):
         """

bunq/sdk/json/converter.py

@@ -25,7 +25,7 @@ class JsonAdapter(object):
     _WARNING_KEY_UNKNOWN = '[bunq SDK beta] Key "{}" in "{}" is unknown.'
 
     # Overlapping key names to be suffixed by and underscore
-    _KEYS_OVERLAPPING = {'id', 'type'}
+    _KEYS_OVERLAPPING = {'id', 'type', 'object'}
 
     # Suffix to strip from the keys during serialization
     _SUFFIX_KEY_OVERLAPPING = '_'

bunq/sdk/model/core.py

@@ -1,5 +1,4 @@
 from bunq.sdk import client
-from bunq.sdk import context
 from bunq.sdk.json import converter
 
 
@@ -269,7 +268,7 @@ def server_public_key(self):
     @classmethod
     def create(cls, api_context, public_key_string):
         """
-        :type api_context: context.ApiContext
+        :type api_context: bunq.sdk.context.ApiContext
         :type public_key_string: str
 
         :rtype: client.BunqResponse[Installation]
@@ -353,7 +352,7 @@ def user_company(self):
     @classmethod
     def create(cls, api_context):
         """
-        :type api_context: context.ApiContext
+        :type api_context: bunq.sdk.context.ApiContext
 
         :rtype: client.BunqResponse[SessionServer]
         """