Create BaseURLSession (#12)

* ignore .venv

* Create BaseURLSession

* Remove unused import

* Add test

Author: walison17

.gitignore

@@ -4,4 +4,5 @@ __pycache__/
 *.egg-info
 
 # Virtual environments
-venv
+venv
+.venv/

santander_sdk/api_client/base.py

@@ -0,0 +1,13 @@
+from urllib.parse import urljoin
+
+from requests import Session
+
+
+class BaseURLSession(Session):
+    def __init__(self, base_url):
+        self.base_url = base_url
+        super().__init__()
+
+    def prepare_request(self, request):
+        request.url = urljoin(self.base_url, request.url)
+        return super().prepare_request(request)

santander_sdk/api_client/client.py

@@ -1,19 +1,19 @@
-from datetime import datetime, timedelta
 import logging
-from urllib.parse import urljoin
+from datetime import datetime, timedelta
+
 import requests
 
+from santander_sdk.api_client.base import BaseURLSession
 from santander_sdk.api_client.workspaces import get_first_workspace_id_of_type
 
-from .helpers import get_status_code_description, try_parse_response_to_json
-
 from .abstract_client import SantanderAbstractApiClient
 from .client_configuration import SantanderClientConfiguration
 from .exceptions import (
-    SantanderRequestException,
     SantanderClientException,
+    SantanderRequestException,
     SantanderWorkspaceException,
 )
+from .helpers import get_status_code_description, try_parse_response_to_json
 
 BEFORE_EXPIRE_TOKEN_SECONDS = timedelta(seconds=60)
 TOKEN_ENDPOINT = "/auth/oauth/v2/token"
@@ -44,9 +44,8 @@ class SantanderApiClient(SantanderAbstractApiClient):
     """
 
     def __init__(self, config: SantanderClientConfiguration):
-        self.base_url = config.base_url.rstrip("/")
         self.config = config
-        self.session = requests.Session()
+        self.session = BaseURLSession(base_url=config.base_url)
         self.token = None
         self.token_expires_at = datetime.now()
 
@@ -108,7 +107,6 @@ def _authenticate(self) -> None:
         self.session.cert = self.config.cert  # pyright: ignore
 
     def _request_token(self) -> dict:
-        url = urljoin(self.base_url, TOKEN_ENDPOINT)
         headers = {"Content-Type": "application/x-www-form-urlencoded"}
         data = {
             "client_id": self.config.client_id,
@@ -117,7 +115,7 @@ def _request_token(self) -> dict:
         }
         try:
             response = self.session.post(
-                url,
+                TOKEN_ENDPOINT,
                 data=data,
                 headers=headers,
                 verify=True,
@@ -135,13 +133,13 @@ def _request_token(self) -> dict:
         return token_data
 
     def _prepare_url(self, endpoint: str) -> str:
-        url = urljoin(self.base_url, endpoint).lower()
-
-        if ":workspaceid" in url:
+        endpoint = endpoint.lower()
+        if ":workspaceid" in endpoint:
             if not self.config.workspace_id:
                 raise SantanderClientException("ID da workspace não configurado")
-            url = url.replace(":workspaceid", self.config.workspace_id)
-        return url
+            endpoint = endpoint.replace(":workspaceid", self.config.workspace_id)
+
+        return endpoint
 
     def _request(
         self,

tests/test_client.py

@@ -1,21 +1,21 @@
-from datetime import datetime, timedelta
 import unittest
+from datetime import datetime, timedelta
+from decimal import Decimal as D
 from unittest.mock import patch
-from urllib.parse import urljoin
 
-from santander_sdk.api_client.client import TOKEN_ENDPOINT, SantanderApiClient
-from santander_sdk.api_client.client_configuration import (
-    SantanderClientConfiguration,
-)
-from santander_sdk.api_client.exceptions import SantanderClientException
-from decimal import Decimal as D
 from mock.santander_mocker import (
     SANTANDER_URL,
-    get_dict_token_response,
-    get_dict_token_request,
     get_dict_payment_pix_request,
     get_dict_payment_pix_response,
+    get_dict_token_request,
+    get_dict_token_response,
 )
+
+from santander_sdk.api_client.client import TOKEN_ENDPOINT, SantanderApiClient
+from santander_sdk.api_client.client_configuration import (
+    SantanderClientConfiguration,
+)
+from santander_sdk.api_client.exceptions import SantanderClientException
 from santander_sdk.types import OrderStatus
 
 
@@ -93,7 +93,7 @@ def test_request_token(self, mock_post):
 
         token_data = self.client._request_token()
         mock_post.assert_called_once_with(
-            urljoin(SANTANDER_URL, TOKEN_ENDPOINT),
+            TOKEN_ENDPOINT,
             data=self.token_request_mock,
             verify=True,
             timeout=60,
@@ -119,42 +119,35 @@ def test_request(self, mock_ensure_requirements, mock_request):
         mock_request.return_value.json.return_value = response_dict
 
         # GET (Não precisa de data)
-        response_data = self.client._request("GET", "test_endpoint")
+        response_data = self.client._request("GET", "/test_endpoint")
         assert response_data == response_dict, (
             "Deveria ter retornado o dict de resposta"
         )
         mock_request.assert_called_once_with(
-            "GET", f"{SANTANDER_URL}/test_endpoint", json=None, params=None, timeout=60
+            "GET", "/test_endpoint", json=None, params=None, timeout=60
         )
 
         # Post (Precisa de data)
         mock_request.reset_mock()
-        response_data = self.client._request("POST", "test_endpoint", data=request_dict)
+        response_data = self.client._request(
+            "POST", "/test_endpoint", data=request_dict
+        )
         assert response_data == response_dict, (
             "Deveria ter retornado o dict de resposta"
         )
         mock_request.assert_called_once_with(
             "POST",
-            f"{SANTANDER_URL}/test_endpoint",
+            "/test_endpoint",
             json=request_dict,
             params=None,
             timeout=60,
         )
 
     def test_prepare_url(self):
         self.client.config.workspace_id = "d6c7b8a9e"
-        assert (
-            self.client._prepare_url("test_endpoint/qr")
-            == f"{SANTANDER_URL}/test_endpoint/qr"
-        )
-        assert (
-            self.client._prepare_url("test/:WORKSPACEID")
-            == f"{SANTANDER_URL}/test/d6c7b8a9e"
-        )
-        assert (
-            self.client._prepare_url(":workspaceid/pix")
-            == f"{SANTANDER_URL}/d6c7b8a9e/pix"
-        )
+        assert self.client._prepare_url("test_endpoint/qr") == "test_endpoint/qr"
+        assert self.client._prepare_url("test/:WORKSPACEID") == "test/d6c7b8a9e"
+        assert self.client._prepare_url(":workspaceid/pix") == "d6c7b8a9e/pix"
         self.client.config.workspace_id = ""
         with self.assertRaises(SantanderClientException):
             self.client._prepare_url("test_endpoint/:workspaceid")

tests/test_session.py

@@ -0,0 +1,12 @@
+from requests import Request
+
+from santander_sdk.api_client.base import BaseURLSession
+
+
+def test_base_url_session_prepare_request():
+    session = BaseURLSession("https://api.santander.com.br")
+
+    req = Request("GET", "/orders")
+    req = session.prepare_request(req)
+
+    assert req.url == "https://api.santander.com.br/orders"