Changes based on review.

Author: Kevin Hellemun

bunq/sdk/client.py

@@ -6,7 +6,7 @@
 
 from bunq.sdk import context
 from bunq.sdk import exception
-from bunq.sdk.exception_hanlder import ExceptionHandler
+from bunq.sdk.exception_factory import ExceptionFactory
 from bunq.sdk import security
 from bunq.sdk.json import converter
 
@@ -202,7 +202,7 @@ def _assert_response_success(self, response):
         """
 
         if response.status_code != self._STATUS_CODE_OK:
-            raise ExceptionHandler.create_exception_for_response(
+            raise ExceptionFactory.create_exception_for_response(
                 response.status_code,
                 self._fetch_error_messages(response)
             )

bunq/sdk/exception.py

@@ -1,4 +1,4 @@
-class BunqError(Exception):
+class ApiException(Exception):
     def __init__(self, message, response_code):
         """
         :type message: str
@@ -8,7 +8,7 @@ def __init__(self, message, response_code):
         self._response_code = response_code
         self._message = message
 
-        super(BunqError, self).__init__(message)
+        super(ApiException, self).__init__(message)
 
     @property
     def message(self):
@@ -32,34 +32,33 @@ def __init__(self, message):
         super(BunqException, self).__init__(message)
 
 
-class ApiException(BunqError):
+class UnknownApiErrorException(ApiException):
     pass
 
 
-class BadRequestException(BunqError):
+class BadRequestException(ApiException):
     pass
 
 
-class UnauthorizedException(BunqError):
+class UnauthorizedException(ApiException):
     pass
 
 
-class ForbiddenException(BunqError):
+class ForbiddenException(ApiException):
     pass
 
 
-class NotFoundException(BunqError):
+class NotFoundException(ApiException):
     pass
 
 
-class MethodNotAllowedException(BunqError):
+class MethodNotAllowedException(ApiException):
     pass
 
 
-class ToManyRequestsException(BunqError):
+class ToManyRequestsException(ApiException):
     pass
 
 
-class PleaseContactBunqException(BunqError):
+class PleaseContactBunqException(ApiException):
     pass
-

bunq/sdk/exception_hanlder.py renamed to bunq/sdk/exception_factory.py

@@ -5,11 +5,11 @@
 from bunq.sdk.exception import MethodNotAllowedException
 from bunq.sdk.exception import ToManyRequestsException
 from bunq.sdk.exception import PleaseContactBunqException
+from bunq.sdk.exception import UnknownApiErrorException
 from bunq.sdk.exception import ApiException
-from bunq.sdk.exception import BunqError
 
 
-class ExceptionHandler(Exception):
+class ExceptionFactory:
     # Error response code constants
     _HTTP_RESPONSE_CODE_BAD_REQUEST = 400
     _HTTP_RESPONSE_CODE_UNAUTHORIZED = 401
@@ -30,7 +30,7 @@ def create_exception_for_response(cls, response_code, messages):
         :type messages: list[str]
 
         :return: The exception according to the status code.
-        :rtype:  BunqError
+        :rtype:  ApiException
         """
 
         error_message = cls._generate_message_error(response_code, messages)
@@ -50,7 +50,7 @@ def create_exception_for_response(cls, response_code, messages):
         if response_code == cls._HTTP_RESPONSE_CODE_INTERNAL_SERVER_ERROR:
             return PleaseContactBunqException(error_message, response_code)
 
-        return ApiException(error_message, response_code)
+        return UnknownApiErrorException(error_message, response_code)
 
     @classmethod
     def _generate_message_error(cls, response_code, messages):

tests/bunq_test.py

@@ -4,8 +4,6 @@
 from tests.config import Config
 from bunq.sdk.context import ApiContext
 from bunq.sdk.context import ApiEnvironmentType
-from bunq.sdk.model.generated import endpoint
-from bunq.sdk.exception import ApiException
 
 
 class BunqSdkTestCase(unittest.TestCase):
@@ -35,10 +33,11 @@ def _get_api_context(cls):
 
         try:
             api_context = ApiContext.restore(filename_bunq_config_full)
-            endpoint.User.list(api_context)
-        except (ApiException, FileNotFoundError):
+        except FileNotFoundError:
             api_context = ApiContext(ApiEnvironmentType.SANDBOX, cls._API_KEY,
                                      cls._DEVICE_DESCRIPTION, [])
+        else:
+            api_context.ensure_session_active()
 
         api_context.save(filename_bunq_config_full)