Remove duplicate code and replace it with a generic method and a constant

Author: Tom Hendrikx

mollie/api/resources/base.py

@@ -4,6 +4,7 @@
 
 from ..error import IdentifierError, ResponseError, ResponseHandlingError
 from ..objects.list import ObjectList, ResultListIterator
+from ..utils import get_class_from_dotted_path
 
 if TYPE_CHECKING:
     from ..client import Client
@@ -26,14 +27,11 @@ class ResourceBase:
     def __init__(self, client: "Client") -> None:
         self.client = client
 
-    def get_resource_object(self, result: dict) -> Any:
-        """
-        Return an instantiated result class for this resource. Should be overriden by a subclass.
+    def get_resource_object(self, result: Dict[str, Any]) -> Any:
+        """Return an instantiated result class for this resource."""
+        result_class = get_class_from_dotted_path(self.RESULT_CLASS_PATH)
 
-        :param result: The API response that the object should hold.
-        :type result: dict
-        """
-        raise NotImplementedError()  # pragma: no cover
+        return result_class(result, self.client)
 
     def get_resource_path(self) -> str:
         """Return the base URL path in the API for this resource."""

mollie/api/resources/captures.py

@@ -16,9 +16,7 @@
 
 class CapturesBase(ResourceBase):
     RESOURCE_ID_PREFIX: str = "cpt_"
-
-    def get_resource_object(self, result: dict) -> Capture:
-        return Capture(result, self.client)
+    RESULT_CLASS_PATH: str = "mollie.api.objects.capture.Capture"
 
 
 class PaymentCaptures(CapturesBase, ResourceGetMixin, ResourceListMixin):

mollie/api/resources/chargebacks.py

@@ -20,9 +20,7 @@
 
 class ChargebacksBase(ResourceBase):
     RESOURCE_ID_PREFIX: str = "chb_"
-
-    def get_resource_object(self, result: dict) -> Chargeback:
-        return Chargeback(result, self.client)
+    RESULT_CLASS_PATH: str = "mollie.api.objects.chargeback.Chargeback"
 
 
 class Chargebacks(ChargebacksBase, ResourceListMixin):

mollie/api/resources/clients.py

@@ -16,9 +16,7 @@ class Clients(ResourceListMixin, ResourceGetMixin):
     """
 
     RESOURCE_ID_PREFIX: str = "org_"
-
-    def get_resource_object(self, result: dict) -> Client:
-        return Client(result, self.client)
+    RESULT_CLASS_PATH: str = "mollie.api.objects.client.Client"
 
     def get(self, resource_id: str, **params: Any) -> Client:
         """Retrieve a single client, linked to your partner account, by its ID."""

mollie/api/resources/customers.py

@@ -8,9 +8,7 @@ class Customers(ResourceCreateMixin, ResourceDeleteMixin, ResourceGetMixin, Reso
     """Resource handler for the `/customers` endpoint."""
 
     RESOURCE_ID_PREFIX: str = "cst_"
-
-    def get_resource_object(self, result: dict) -> Customer:
-        return Customer(result, self.client)
+    RESULT_CLASS_PATH: str = "mollie.api.objects.customer.Customer"
 
     def get(self, resource_id: str, **params: Any) -> Customer:
         self.validate_resource_id(resource_id, "customer ID")

mollie/api/resources/invoices.py

@@ -12,9 +12,7 @@ class Invoices(ResourceGetMixin, ResourceListMixin):
     """Resource handler for the `/invoices` endpoint."""
 
     RESOURCE_ID_PREFIX: str = "inv_"
-
-    def get_resource_object(self, result: dict) -> Invoice:
-        return Invoice(result, self.client)
+    RESULT_CLASS_PATH: str = "mollie.api.objects.invoice.Invoice"
 
     def get(self, resource_id: str, **params: Any) -> Invoice:
         self.validate_resource_id(resource_id, "invoice ID")

mollie/api/resources/mandates.py

@@ -17,6 +17,7 @@ class CustomerMandates(ResourceCreateMixin, ResourceDeleteMixin, ResourceGetMixi
     """Resource handler for the `/customers/:customer_id:/mandates` endpoint."""
 
     RESOURCE_ID_PREFIX = "mdt_"
+    RESULT_CLASS_PATH: str = "mollie.api.objects.mandate.Mandate"
 
     _customer: Customer
 
@@ -27,9 +28,6 @@ def __init__(self, client: "Client", customer: Customer) -> None:
     def get_resource_path(self) -> str:
         return f"customers/{self._customer.id}/mandates"
 
-    def get_resource_object(self, result: dict) -> Mandate:
-        return Mandate(result, self.client)
-
     def get(self, resource_id: str, **params: Any) -> Mandate:
         self.validate_resource_id(resource_id, "mandate ID")
         return super().get(resource_id, **params)

mollie/api/resources/methods.py

@@ -18,8 +18,8 @@
 
 
 class MethodsBase(ResourceBase):
-    def get_resource_object(self, result: dict) -> Method:
-        return Method(result, self.client)
+
+    RESULT_CLASS_PATH: str = "mollie.api.objects.method.Method"
 
 
 class Methods(MethodsBase, ResourceGetMixin, ResourceListMixin):

mollie/api/resources/onboarding.py

@@ -13,8 +13,7 @@
 class Onboarding(ResourceGetMixin):
     """Resource handler for the `/onboarding` endpoint."""
 
-    def get_resource_object(self, result: dict) -> OnboardingObject:
-        return OnboardingObject(result, self.client)
+    RESULT_CLASS_PATH: str = "mollie.api.objects.onboarding.Onboarding"
 
     def get(self, resource_id: str, **params: Any) -> OnboardingObject:
         if resource_id != "me":

mollie/api/resources/order_lines.py

@@ -25,6 +25,7 @@ class OrderLines(ResourceBase):
     """
 
     RESOURCE_ID_PREFIX: str = "odl_"
+    RESULT_CLASS_PATH: str = "mollie.api.objects.order_line.OrderLine"
 
     _order: "Order"
 
@@ -35,9 +36,6 @@ def __init__(self, client: "Client", order: "Order") -> None:
     def get_resource_path(self) -> str:
         return f"orders/{self._order.id}/lines"
 
-    def get_resource_object(self, result: dict) -> OrderLine:
-        return OrderLine(result, self.client)
-
     def delete_lines(self, data: Optional[Dict[str, Any]] = None, **params: Any) -> dict:
         """
         Cancel multiple orderlines.