Merge pull request #331 from mollie/330-identifier-regular-expression-syntax

Refactor regular expressions that extract identifiers from URLs

Author: geertjanvdenbosch

mollie/api/objects/chargeback.py

@@ -49,7 +49,7 @@ def settlement_id(self):
         if not url:
             return None
 
-        match = re.findall(r"/settlements/(stl_\w+)$", url)
+        match = re.findall(r"/settlements/(stl_[^/]+)/?$", url)
         if match:
             return match[0]
 

mollie/api/objects/subscription.py

@@ -120,7 +120,8 @@ def customer_id(self):
         option is to extract it from the link.
         """
         url = self._get_link("customer")
-        matches = re.findall(r"/customers/(cst_\w+)", url)
+
+        matches = re.findall(r"/customers/(cst_[^/]+)/?$", url)
         if matches:
             return matches[0]
 

mollie/api/resources/base.py

@@ -44,7 +44,6 @@ def perform_api_call(
         params: Optional[Dict[str, Any]] = None,
         idempotency_key: str = "",
     ) -> Dict[str, Any]:
-
         resp = self.client.perform_http_call(http_method, path, data, params, idempotency_key)
         if "application/hal+json" in resp.headers.get("Content-Type", ""):
             # set the content type according to the media type definition

tests/test_customer_subscriptions.py

@@ -35,6 +35,7 @@ def test_get_customer_subscription(client, response):
 
     customer = client.customers.get(CUSTOMER_ID)
     subscription = customer.subscriptions.get(SUBSCRIPTION_ID)
+    assert isinstance(subscription, Subscription)
     assert subscription.resource == "subscription"
     assert subscription.id == SUBSCRIPTION_ID
     assert subscription.mode == "live"
@@ -53,6 +54,7 @@ def test_get_customer_subscription(client, response):
     assert subscription.canceled_at is None
     assert subscription.metadata == {"order_id": 1337}
     assert subscription.application_fee is None
+    assert subscription.customer_id == CUSTOMER_ID
     assert subscription.is_active() is True
     assert subscription.is_suspended() is False
     assert subscription.is_pending() is False
@@ -84,6 +86,29 @@ def test_customer_subscription_get_related_customer(client, response):
     assert related_customer.id == CUSTOMER_ID == customer.id
 
 
+@pytest.mark.parametrize(
+    "url_customer_id, actual_customer_id",
+    [
+        (CUSTOMER_ID, CUSTOMER_ID),
+        ("cst_8.mqcHMN4U", "cst_8.mqcHMN4U"),
+        ("cst_8.mqcHMN4U/", "cst_8.mqcHMN4U"),  # trailing slah in URL
+    ],
+)
+def test_customer_subscription_get_related_customer_id_syntax(url_customer_id, actual_customer_id, client):
+    data = {
+        "resource": "subscription",
+        "id": "sub_rVKGtNd6s3",
+        "_links": {
+            "customer": {
+                "href": f"https://api.mollie.com/v2/customers/{url_customer_id}",
+                "type": "application/hal+json",
+            },
+        },
+    }
+    subscription = Subscription(data, client)
+    assert subscription.customer_id == actual_customer_id
+
+
 def test_customer_subscription_get_related_profile(client, response):
     response.get(f"https://api.mollie.com/v2/customers/{CUSTOMER_ID}", "customer_single")
     response.get(

tests/test_payment_chargebacks.py

@@ -37,6 +37,7 @@ def test_get_payment_chargeback(client, response):
     assert chargeback.reason is None
     assert chargeback.reversed_at == "2018-03-14T17:00:55.0Z"
     assert chargeback.payment_id == PAYMENT_ID
+    assert chargeback.settlement_id == SETTLEMENT_ID
 
 
 def test_get_payment_chargeback_invalid_id(client, response):
@@ -69,3 +70,27 @@ def test_payment_chargeback_get_related_settlement(client, response):
     related_settlement = chargeback.get_settlement()
     assert isinstance(related_settlement, Settlement)
     assert related_settlement.id == SETTLEMENT_ID
+
+
+@pytest.mark.parametrize(
+    "url_settlement_id, actual_settlement_id",
+    [
+        (SETTLEMENT_ID, SETTLEMENT_ID),
+        ("stl_j.k30akdN", "stl_j.k30akdN"),
+        ("stl_j.k30akdN/", "stl_j.k30akdN"),  # trailing slash in URL
+    ],
+)
+def test_payment_chargeback_get_related_settlement_id_syntax(url_settlement_id, actual_settlement_id, client):
+    """Identifiers may have unexpected syntax."""
+    data = {
+        "resource": "chargeback",
+        "id": "chb_n9z0tp",
+        "_links": {
+            "settlement": {
+                "href": f"https://api.mollie.com/v2/settlements/{url_settlement_id}",
+                "type": "application/hal+json",
+            },
+        },
+    }
+    chargeback = Chargeback(data, client)
+    assert chargeback.settlement_id == actual_settlement_id