Merge pull request #91 from bunq/fix_supperfouls_fields_error_bunq/sdk_python#77

Fix supperfouls fields error #77

Author: OGKevin

bunq/sdk/json/adapters.py

@@ -4,21 +4,22 @@
 from bunq.sdk import client
 from bunq.sdk import context
 from bunq.sdk import security
+from bunq.sdk.exception import BunqException
 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_
-from bunq.sdk.exception import BunqException
 
 
 class AnchoredObjectModelAdapter(converter.JsonAdapter):
-
     _ERROR_MODEL_NOT_FOUND = '{} is not in endpoint nor object.'
 
+    __STRING_FORMAT_UNDERSCORE = '_'
+
     _override_field_map = {
         'ScheduledPayment': 'SchedulePayment',
         'ScheduledInstance': 'ScheduleInstance',
-        }
+    }
 
     @classmethod
     def deserialize(cls, cls_target, obj_raw):
@@ -31,17 +32,12 @@ def deserialize(cls, cls_target, obj_raw):
 
         model_ = super()._deserialize_default(cls_target, obj_raw)
 
-        if isinstance(model_, core.AnchoredObjectInterface) and model_.is_all_field_none():
+        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_)
-
+                object_class = cls._get_object_class(field)
                 contents = super()._deserialize_default(object_class, obj_raw)
 
                 if contents.is_all_field_none():
@@ -62,6 +58,11 @@ def _get_object_class(cls, class_name):
         :rtype: core.BunqModel
         """
 
+        class_name = class_name.lstrip(cls.__STRING_FORMAT_UNDERSCORE)
+
+        if class_name in cls._override_field_map:
+            class_name = cls._override_field_map[class_name]
+
         try:
             return getattr(endpoint, class_name)
         except AttributeError:
@@ -486,10 +487,12 @@ def serialize(cls, share_detail):
         """
 
         return {
-            cls._FIELD_PAYMENT: converter.serialize(share_detail.payment),
-            cls._FIELD_READ_ONLY: converter.serialize(share_detail.read_only),
+            cls._FIELD_PAYMENT: converter.serialize(
+                share_detail._payment_field_for_request),
+            cls._FIELD_READ_ONLY: converter.serialize(
+                share_detail._read_only_field_for_request),
             cls._FIELD_DRAFT_PAYMENT: converter.serialize(
-                share_detail.draft_payment
+                share_detail._draft_payment
             ),
         }
 
@@ -621,4 +624,4 @@ def serialize(cls, pagination):
 
         _ = pagination
 
-        raise NotImplementedError()
+        raise NotImplementedError()

bunq/sdk/json/converter.py

@@ -184,7 +184,7 @@ def _deserialize_dict(cls, cls_target, dict_):
         :rtype: T
         """
 
-        instance = cls_target.__new__(cls_target, cls_target)
+        instance = cls_target.__new__(cls_target)
         dict_deserialized = cls._deserialize_dict_attributes(cls_target, dict_)
         instance.__dict__ = cls._fill_default_values(cls_target,
                                                      dict_deserialized)

bunq/sdk/model/core.py

@@ -18,6 +18,10 @@ class BunqModel(object):
     # The very first index of an array
     _INDEX_FIRST = 0
 
+    __STRING_FORMAT_EMPTY = ''
+    __STRING_FORMAT_FIELD_FOR_REQUEST_ONE_UNDERSCORE = '_field_for_request'
+    __STRING_FORMAT_FIELD_FOR_REQUEST_TWO_UNDERSCORE = '__field_for_request'
+
     def is_all_field_none(self):
         raise NotImplementedError
 
@@ -166,6 +170,16 @@ def _determine_monetary_account_id(cls, monetary_account_id=None):
 
         return monetary_account_id
 
+    @classmethod
+    def _remove_field_for_request(cls, json_str: str):
+        return json_str.replace(
+            cls.__STRING_FORMAT_FIELD_FOR_REQUEST_TWO_UNDERSCORE,
+            cls.__STRING_FORMAT_EMPTY
+        ).replace(
+            cls.__STRING_FORMAT_FIELD_FOR_REQUEST_ONE_UNDERSCORE,
+            cls.__STRING_FORMAT_EMPTY
+        )
+
 
 class Id(BunqModel):
     """