Removed magic values. (#78)

Author: Kevin Hellemun

bunq/sdk/util.py

@@ -3,10 +3,17 @@
 
 import requests
 
+from bunq.sdk.client import ApiClient
 from bunq.sdk.context import ApiContext, ApiEnvironmentType
 from bunq.sdk.exception import BunqException
 from bunq.sdk.model.generated import endpoint
 
+__UNIQUE_REQUEST_ID = "uniqueness-is-required"
+__FIELD_API_KEY = "ApiKey"
+__INDEX_FIRST = 0
+__FIELD_RESPONSE = "Response"
+__ENDPOINT_SANDBOX_USER = "sandbox-user"
+
 _ERROR_COULD_NOT_CREATE_NEW_SANDBOX_USER = "Could not create new sandbox" \
                                            " user."
 
@@ -29,21 +36,22 @@ def __generate_new_sandbox_user():
     :rtype: endpoint.SandboxUser
     """
 
-    url = "https://sandbox.public.api.bunq.com/v1/sandbox-user"
+    url = ApiEnvironmentType.SANDBOX.uri_base + __ENDPOINT_SANDBOX_USER
 
     headers = {
-        'x-bunq-client-request-id': "uniqueness-is-required",
-        'cache-control': "no-cache",
-        'x-bunq-geolocation': "0 0 0 0 NL",
-        'x-bunq-language': "en_US",
-        'x-bunq-region': "en_US",
+        ApiClient.HEADER_REQUEST_ID: __UNIQUE_REQUEST_ID,
+        ApiClient.HEADER_CACHE_CONTROL: ApiClient._CACHE_CONTROL_NONE,
+        ApiClient.HEADER_GEOLOCATION: ApiClient._GEOLOCATION_ZERO,
+        ApiClient.HEADER_LANGUAGE: ApiClient._LANGUAGE_EN_US,
+        ApiClient.HEADER_REGION: ApiClient._REGION_NL_NL,
     }
 
-    response = requests.request("POST", url, headers=headers)
+    response = requests.request(ApiClient._METHOD_POST, url, headers=headers)
 
-    if response.status_code is 200:
+    if response.status_code is ApiClient._STATUS_CODE_OK:
         response_json = json.loads(response.text)
         return endpoint.SandboxUser.from_json(
-            json.dumps(response_json["Response"][0]["ApiKey"]))
+            json.dumps(response_json[__FIELD_RESPONSE][__INDEX_FIRST][
+                           __FIELD_API_KEY]))
 
     raise BunqException(_ERROR_COULD_NOT_CREATE_NEW_SANDBOX_USER)

tests/bunq_test.py

@@ -16,6 +16,8 @@ class BunqSdkTestCase(unittest.TestCase):
     :type _cash_register: endpoint.CashRegister
     """
 
+    __ERROR_COULD_NOT_DETERMINE_USER = 'Could not determine user alias.'
+
     # Config values
     _API_KEY = config.Config.get_api_key()
 
@@ -32,6 +34,19 @@ class BunqSdkTestCase(unittest.TestCase):
     _ATTACHMENT_DESCRIPTION = 'SDK python test'
     _FIRST_INDEX = 0
 
+    __SPENDING_MONEY_AMOUNT = '500'
+    __CURRENCY_EUR = 'EUR'
+    __POINTER_EMAIL = 'EMAIL'
+    __SPENDING_MONEY_RECIPIENT = 'sugardaddy@bunq.com'
+    __REQUEST_SPENDING_DESCRIPTION = 'sdk  python test, thanks daddy <3'
+
+    __CASH_REGISTER_STATUS = 'PENDING_APPROVAL'
+    __CASH_REGISTER_DESCRIPTION = 'python test cash register'
+
+    __SECOND_MONETARY_ACCOUNT_DESCRIPTION = 'test account python'
+
+    __EMAIL_BRAVO = 'bravo@bunq.com'
+
     _second_monetary_account = None
     _cash_register = None
 
@@ -47,8 +62,8 @@ def setUp(self):
 
     def __set_second_monetary_account(self):
         response = endpoint.MonetaryAccountBank.create(
-            'EUR',
-            'test account python'
+            self.__CURRENCY_EUR,
+            self.__SECOND_MONETARY_ACCOUNT_DESCRIPTION
         )
 
         self._second_monetary_account = endpoint.MonetaryAccountBank.get(
@@ -57,15 +72,21 @@ def __set_second_monetary_account(self):
 
     def __request_spending_money(self):
         endpoint.RequestInquiry.create(
-            object_.Amount('500', 'EUR'),
-            object_.Pointer('EMAIL', 'sugardaddy@bunq.com'),
-            'sdk  python test, thanks daddy <3 - OG',
+            object_.Amount(self.__SPENDING_MONEY_AMOUNT, self.__CURRENCY_EUR),
+            object_.Pointer(
+                self.__POINTER_EMAIL,
+                self.__SPENDING_MONEY_RECIPIENT
+            ),
+            self.__REQUEST_SPENDING_DESCRIPTION,
             False
         )
         endpoint.RequestInquiry.create(
-            object_.Amount('500', 'EUR'),
-            object_.Pointer('EMAIL', 'sugardaddy@bunq.com'),
-            'sdk  python test, thanks daddy <3 - OG',
+            object_.Amount(self.__SPENDING_MONEY_AMOUNT, self.__CURRENCY_EUR),
+            object_.Pointer(
+                self.__POINTER_EMAIL,
+                self.__SPENDING_MONEY_RECIPIENT
+            ),
+            self.__REQUEST_SPENDING_DESCRIPTION,
             False,
             self._second_monetary_account.id_
         )
@@ -86,20 +107,19 @@ def _get_api_context(cls):
 
         return context.ApiContext.restore('bunq-test.conf')
 
-    @staticmethod
-    def _get_pointer_bravo():
+    def _get_pointer_bravo(self):
         """
         :rtype: object_.Pointer
         """
 
-        return object_.Pointer('EMAIL', 'bravo@bunq.com')
+        return object_.Pointer(self.__POINTER_EMAIL, self.__EMAIL_BRAVO)
 
     def _get_alias_second_account(self):
         """
         :rtype: object_.Pointer
         """
 
-        return self._second_monetary_account.alias[0]
+        return self._second_monetary_account.alias[self._FIRST_INDEX]
 
     @staticmethod
     def _get_directory_test_root():
@@ -116,8 +136,8 @@ def _set_cash_register(self):
         )
         avatar_uuid = endpoint.Avatar.create(attachment_uuid.value)
         cash_register_id = endpoint.CashRegister.create(
-            'python test cash register',
-            'PENDING_APPROVAL',
+            self.__CASH_REGISTER_DESCRIPTION,
+            self.__CASH_REGISTER_STATUS,
             avatar_uuid.value
         )
 
@@ -151,4 +171,4 @@ def alias_first(self):
             return BunqContext.user_context().user_person.alias[
                 self._FIRST_INDEX]
 
-        raise BunqException('Could not determine user alias.')
+        raise BunqException(self.__ERROR_COULD_NOT_DETERMINE_USER)