Merge branch 'fix_supperfouls_fields_error_bunq/sdk_python#77' into fix_monetary_account_joint_retrieval_bunq/sdk_python#52

# Conflicts:
#	bunq/sdk/model/generated/object_.py

Author: Kevin Hellemun

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):
     """

tests/bunq_test.py

@@ -37,7 +37,7 @@ class BunqSdkTestCase(unittest.TestCase):
 
     __SPENDING_MONEY_AMOUNT = '500'
     __CURRENCY_EUR = 'EUR'
-    __POINTER_EMAIL = 'EMAIL'
+    _POINTER_EMAIL = 'EMAIL'
     __SPENDING_MONEY_RECIPIENT = '[email protected]'
     __REQUEST_SPENDING_DESCRIPTION = 'sdk  python test, thanks daddy <3'
 
@@ -46,7 +46,7 @@ class BunqSdkTestCase(unittest.TestCase):
 
     __SECOND_MONETARY_ACCOUNT_DESCRIPTION = 'test account python'
 
-    __EMAIL_BRAVO = '[email protected]'
+    _EMAIL_BRAVO = '[email protected]'
 
     __TIME_OUT_AUTO_ACCEPT_SPENDING_MONEY = 0.5
 
@@ -77,7 +77,7 @@ def __request_spending_money(self):
         endpoint.RequestInquiry.create(
             object_.Amount(self.__SPENDING_MONEY_AMOUNT, self.__CURRENCY_EUR),
             object_.Pointer(
-                self.__POINTER_EMAIL,
+                self._POINTER_EMAIL,
                 self.__SPENDING_MONEY_RECIPIENT
             ),
             self.__REQUEST_SPENDING_DESCRIPTION,
@@ -86,7 +86,7 @@ def __request_spending_money(self):
         endpoint.RequestInquiry.create(
             object_.Amount(self.__SPENDING_MONEY_AMOUNT, self.__CURRENCY_EUR),
             object_.Pointer(
-                self.__POINTER_EMAIL,
+                self._POINTER_EMAIL,
                 self.__SPENDING_MONEY_RECIPIENT
             ),
             self.__REQUEST_SPENDING_DESCRIPTION,
@@ -113,7 +113,7 @@ def _get_pointer_bravo(self):
         :rtype: object_.Pointer
         """
 
-        return object_.Pointer(self.__POINTER_EMAIL, self.__EMAIL_BRAVO)
+        return object_.Pointer(self._POINTER_EMAIL, self._EMAIL_BRAVO)
 
     def _get_alias_second_account(self):
         """

tests/model/generated/endpoint/test_payment.py

@@ -1,9 +1,8 @@
-from bunq.sdk.model.generated.endpoint import ChatMessageText
-from bunq.sdk.model.generated.endpoint import Payment
-from bunq.sdk.model.generated.endpoint import PaymentChat
-from bunq.sdk.model.generated.object_ import Amount
+from typing import List
+
+from bunq.sdk.model.generated import endpoint
+from bunq.sdk.model.generated import object_
 from tests.bunq_test import BunqSdkTestCase
-from tests.config import Config
 
 
 class TestPayment(BunqSdkTestCase):
@@ -18,7 +17,8 @@ class TestPayment(BunqSdkTestCase):
     _PAYMENT_CURRENCY = 'EUR'
     _PAYMENT_DESCRIPTION = 'Python unit test'
     _PAYMENT_CHAT_TEXT_MESSAGE = 'send from python test'
-    _USER_ID = Config.get_user_id()
+
+    _MAXIMUM_PAYMENT_IN_BATCH = 10
 
     def test_payment_to_other_user(self):
         """
@@ -28,8 +28,8 @@ def test_payment_to_other_user(self):
         without errors
         """
 
-        Payment.create(
-            Amount(self._PAYMENT_AMOUNT_EUR, self._PAYMENT_CURRENCY),
+        endpoint.Payment.create(
+            object_.Amount(self._PAYMENT_AMOUNT_EUR, self._PAYMENT_CURRENCY),
             self._get_pointer_bravo(),
             self._PAYMENT_DESCRIPTION
         )
@@ -42,8 +42,8 @@ def test_payment_to_other_account(self):
         without errors
         """
 
-        Payment.create(
-            Amount(self._PAYMENT_AMOUNT_EUR, self._PAYMENT_CURRENCY),
+        endpoint.Payment.create(
+            object_.Amount(self._PAYMENT_AMOUNT_EUR, self._PAYMENT_CURRENCY),
             self._get_alias_second_account(),
             self._PAYMENT_DESCRIPTION
         )
@@ -56,12 +56,53 @@ def test_payment_chat(self):
         without errors
         """
 
-        payment_id = Payment.create(
-            Amount(self._PAYMENT_AMOUNT_EUR, self._PAYMENT_CURRENCY),
+        payment_id = endpoint.Payment.create(
+            object_.Amount(self._PAYMENT_AMOUNT_EUR, self._PAYMENT_CURRENCY),
             self._get_pointer_bravo(),
             self._PAYMENT_DESCRIPTION
         ).value
 
-        chat_id = PaymentChat.create(payment_id).value
+        chat_id = endpoint.PaymentChat.create(payment_id).value
+
+        endpoint.ChatMessageText.create(
+            chat_id,
+            self._PAYMENT_CHAT_TEXT_MESSAGE
+        )
+
+    def test_payment_batch(self):
+        """
+        """
+
+        response_create: endpoint.BunqResponseInt = \
+            endpoint.PaymentBatch.create(
+                self.__create_payment_list()
+            )
+
+        self.assertIsNotNone(response_create)
+
+        response_get: endpoint.BunqResponsePaymentBatch = \
+            endpoint.PaymentBatch.get(response_create.value)
+
+        self.assertIsNotNone(response_get)
+        self.assertFalse(response_get.value.is_all_field_none())
+
+    def __create_payment_list(self) -> List[endpoint.Payment]:
+        """
+        :rtype: List[Payment]
+        """
+
+        all_payment: List[endpoint.Payment] = []
+
+        while len(all_payment) < self._MAXIMUM_PAYMENT_IN_BATCH:
+            all_payment.append(
+                endpoint.Payment(
+                    object_.Amount(
+                        self._PAYMENT_AMOUNT_EUR,
+                        self._PAYMENT_CURRENCY
+                    ),
+                    object_.Pointer(self._POINTER_EMAIL, self._EMAIL_BRAVO),
+                    self._PAYMENT_DESCRIPTION
+                )
+            )
 
-        ChatMessageText.create(chat_id, self._PAYMENT_CHAT_TEXT_MESSAGE)
+        return all_payment

tests/model/generated/object/test_notification_url.py

@@ -61,6 +61,13 @@ class TestNotificationUrl(bunq_test.BunqSdkTestCase):
         endpoint,
     ]
 
+    @classmethod
+    def setUpClass(cls):
+        pass
+
+    def setUp(self):
+        pass
+
     # File mode constants.
     _FILE_MODE_READ = 'r'