Merge pull request #56 from bunq/feature/improve-decoder_bunq/sdk_python#42

Feature/improve decoder bunq/sdk python#42

Author: andrederoos

bunq/__init__.py

@@ -7,13 +7,15 @@ def initialize_converter():
     """
 
     import datetime
+    import inspect
 
     from bunq.sdk import client
     from bunq.sdk import context
     from bunq.sdk.model import core
     from bunq.sdk.json import adapters
     from bunq.sdk.json import converter
     from bunq.sdk.model.generated import object_
+    from bunq.sdk.model.generated import endpoint
 
     converter.register_adapter(core.Installation, adapters.InstallationAdapter)
     converter.register_adapter(
@@ -38,5 +40,27 @@ def initialize_converter():
     converter.register_adapter(datetime.datetime, adapters.DateTimeAdapter)
     converter.register_adapter(client.Pagination, adapters.PaginationAdapter)
 
+    def register_anchor_adapter(class_to_regsiter):
+        if issubclass(class_to_regsiter, core.AnchoredObjectInterface):
+            converter.register_adapter(
+                class_to_regsiter,
+                adapters.AnchoredObjectModelAdapter
+            )
+
+    def get_class(class_string_to_get):
+        if hasattr(object_, class_string_to_get):
+            return getattr(object_, class_string_to_get)
+
+        if hasattr(endpoint, class_string_to_get):
+            return getattr(endpoint, class_string_to_get)
+
+    for class_string in list(dir(object_) + dir(endpoint)):
+        class_ = get_class(class_string)
+
+        if not inspect.isclass(class_):
+            continue
+
+        register_anchor_adapter(class_)
+
 
 converter.set_initializer_function(initialize_converter)

bunq/sdk/json/adapters.py

@@ -8,6 +8,71 @@
 from bunq.sdk.model import core
 from bunq.sdk.model.generated import endpoint
 from bunq.sdk.model.generated import object_
+from bunq.sdk.exception import BunqException
+
+
+class AnchoredObjectModelAdapter(converter.JsonAdapter):
+
+    _ERROR_MODEL_NOT_FOUND = '{} is not in endpoint nor object.'
+
+    _override_field_map = {
+        'ScheduledPayment': 'SchedulePayment',
+        'ScheduledInstance': 'ScheduleInstance',
+        }
+
+    @classmethod
+    def deserialize(cls, cls_target, obj_raw):
+        """
+        :type cls_target: core.BunqModel
+        :type obj_raw: int|str|bool|float|list|dict|None
+
+        :rtype: T
+        """
+
+        model_ = super()._deserialize_default(cls_target, obj_raw)
+
+        if isinstance(model_, core.AnchoredObjectInterface) and model_.is_all_field_none():
+            for field in model_.__dict__:
+                field_ = None
+                if field in cls._override_field_map:
+                    field_ = cls._override_field_map[field]
+
+                if field_ is None:
+                    object_class = cls._get_object_class(field)
+                else:
+                    object_class = cls._get_object_class(field_)
+
+                contents = super()._deserialize_default(object_class, obj_raw)
+
+                if contents.is_all_field_none():
+                    setattr(model_, field, None)
+                else:
+                    setattr(model_, field, contents)
+
+        return model_
+
+    @classmethod
+    def can_serialize(cls):
+        return False
+
+    @classmethod
+    def _get_object_class(cls, class_name):
+        """
+        :type class_name: str
+        :rtype: core.BunqModel
+        """
+
+        try:
+            return getattr(endpoint, class_name)
+        except AttributeError:
+            pass
+
+        try:
+            return getattr(object_, class_name)
+        except AttributeError:
+            pass
+
+        raise BunqException(cls._ERROR_MODEL_NOT_FOUND.format(class_name))
 
 
 class InstallationAdapter(converter.JsonAdapter):

bunq/sdk/model/core.py

@@ -2,6 +2,10 @@
 from bunq.sdk.json import converter
 
 
+class AnchoredObjectInterface:
+    pass
+
+
 class BunqModel(object):
     # Field constants
     _FIELD_RESPONSE = 'Response'
@@ -12,13 +16,20 @@ class BunqModel(object):
     # The very first index of an array
     _INDEX_FIRST = 0
 
+    def is_all_field_none(self):
+        raise NotImplementedError
+
     def to_json(self):
         """
         :rtype: str
         """
 
         return converter.class_to_json(self)
 
+    @staticmethod
+    def from_json(json_str):
+        raise NotImplementedError
+
     @classmethod
     def _from_json_array_nested(cls, response_raw):
         """
@@ -141,6 +152,13 @@ def id_(self):
 
         return self._id_
 
+    def is_all_field_none(self):
+        if self.id_ is not None:
+            return False
+
+        return True
+
+
 
 class Uuid(BunqModel):
     """
@@ -158,6 +176,11 @@ def uuid(self):
 
         return self._uuid
 
+    def is_all_field_none(self):
+        if self.uuid is not None:
+            return False
+
+        return True
 
 class SessionToken(BunqModel):
     """
@@ -205,6 +228,21 @@ def token(self):
 
         return self._token
 
+    def is_all_field_none(self):
+        if self.id_ is not None:
+            return False
+
+        if self.created is not None:
+            return False
+
+        if self.updated is not None:
+            return False
+
+        if self.token is not None:
+            return False
+
+        return True
+
 
 class PublicKeyServer(BunqModel):
     """
@@ -222,6 +260,12 @@ def server_public_key(self):
 
         return self._server_public_key
 
+    def is_all_field_none(self):
+        if self.server_public_key is not None:
+            return False
+
+        return True
+
 
 class Installation(BunqModel):
     """
@@ -296,6 +340,17 @@ def generate_request_body_bytes(cls, public_key_string):
             }
         ).encode()
 
+    def is_all_field_none(self):
+        if self.id_ is not None:
+            return False
+
+        if self.token is not None:
+            return False
+
+        if self.server_public_key is not None:
+            return False
+
+        return True
 
 class SessionServer(BunqModel):
     """
@@ -373,4 +428,17 @@ def generate_request_body_bytes(cls, secret):
 
         return converter.class_to_json({cls.FIELD_SECRET: secret}).encode()
 
+    def is_all_field_none(self):
+        if self.id_ is not None:
+            return False
+
+        if self.token is not None:
+            return False
+
+        if self.user_person is not None:
+            return False
+
+        if self.user_company is not None:
+            return False
 
+        return True