Removed magic values. (#77)

Author: Kevin Hellemun

bunq/sdk/json/adapters.py

@@ -14,6 +14,8 @@
 class AnchoredObjectModelAdapter(converter.JsonAdapter):
     _ERROR_MODEL_NOT_FOUND = '{} is not in endpoint nor object.'
 
+    __STRING_FORMAT_UNDERSCORE = '_'
+
     _override_field_map = {
         'ScheduledPayment': 'SchedulePayment',
         'ScheduledInstance': 'ScheduleInstance',
@@ -56,7 +58,7 @@ def _get_object_class(cls, class_name):
         :rtype: core.BunqModel
         """
 
-        class_name = class_name.lstrip('_')
+        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]

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
 
@@ -168,7 +172,13 @@ def _determine_monetary_account_id(cls, monetary_account_id=None):
 
     @classmethod
     def _remove_field_for_request(cls, json_str: str):
-        return json_str.replace('__field_for_request', '').replace('_field_for_request', '')
+        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 = 'sugardaddy@bunq.com'
     __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 = 'bravo@bunq.com'
+    _EMAIL_BRAVO = 'bravo@bunq.com'
 
     __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

@@ -21,7 +21,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):
         """
@@ -31,8 +32,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
         )
@@ -45,8 +46,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
         )
@@ -59,43 +60,46 @@ 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
 
-        ChatMessageText.create(chat_id, self._PAYMENT_CHAT_TEXT_MESSAGE)
+        endpoint.ChatMessageText.create(chat_id, self._PAYMENT_CHAT_TEXT_MESSAGE)
 
     def test_payment_batch(self):
-        response_create: BunqResponseInt = PaymentBatch.create(
-            self.__create_payment_list()
-        )
+        response_create: endpoint.BunqResponseInt =\
+            endpoint.PaymentBatch.create(
+                self.__create_payment_list()
+            )
 
         self.assertIsNotNone(response_create)
 
-        response_get: BunqResponsePaymentBatch =\
-            PaymentBatch.get(response_create.value)
+        response_get: endpoint.BunqResponsePaymentBatch =\
+            endpoint.PaymentBatch.get(response_create.value)
 
         self.assertIsNotNone(response_get)
         self.assertFalse(response_get.value.is_all_field_none())
 
-    @staticmethod
-    def __create_payment_list() -> List[Payment]:
+    def __create_payment_list(self) -> List[endpoint.Payment]:
         """
         :rtype: List[Payment]
         """
 
-        all_payment: List[Payment] = []
+        all_payment: List[endpoint.Payment] = []
 
-        while len(all_payment) < 10:
+        while len(all_payment) < self._MAXIMUM_PAYMENT_IN_BATCH:
             all_payment.append(
-                Payment(
-                    Amount('0.01', 'EUR'),
-                    Pointer('EMAIL', 'bravo@bunq.com'),
-                    'Python sdk payment batch test.'
+                endpoint.Payment(
+                    object_.Amount(
+                        self._PAYMENT_AMOUNT_EUR,
+                        self._PAYMENT_CURRENCY
+                    ),
+                    object_.Pointer(self._POINTER_EMAIL, self._EMAIL_BRAVO),
+                    self._PAYMENT_DESCRIPTION
                 )
             )