[CC-2016] Identify customer version based on ID.

Author: Ryouzanpaku

src/Interfaces/ResourceServiceInterface.php

@@ -30,7 +30,7 @@
 interface ResourceServiceInterface
 {
     /**
-     * Retrieves an Payout resource via the API using the corresponding Payment or paymentId.
+     * Retrieves a Payout resource via the API using the corresponding Payment or paymentId.
      * The Payout resource can not be fetched using its id since they are unique only within the Payment.
      * A Payment can have zero or one Payouts.
      *
@@ -162,7 +162,7 @@ public function createBasket(Basket $basket): Basket;
     public function fetchBasket($basket): Basket;
 
     /**
-     * Update the a basket resource with the given basket object (id must be set).
+     * Update a basket resource with the given basket object (id must be set).
      *
      * @param Basket $basket
      *
@@ -195,12 +195,12 @@ public function createPaymentType(BasePaymentType $paymentType): BasePaymentType
      * @return BasePaymentType|AbstractUnzerResource The updated PaymentType object.
      *
      * @throws UnzerApiException An UnzerApiException is thrown if there is an error returned on API-request.
-     * @throws RuntimeException  A RuntimeException is thrown when there is a error while using the SDK.
+     * @throws RuntimeException  A RuntimeException is thrown when there is an error while using the SDK.
      */
     public function updatePaymentType(BasePaymentType $paymentType): BasePaymentType;
 
     /**
-     * Fetch the payment type with the given Id from the API.
+     * Fetch the payment type with the given ID from the API.
      *
      * @param string $typeId
      *
@@ -257,7 +257,7 @@ public function fetchCustomer($customer): Customer;
      * @throws UnzerApiException An UnzerApiException is thrown if there is an error returned on API-request.
      * @throws RuntimeException  A RuntimeException is thrown when there is an error while using the SDK.
      */
-    public function fetchCustomerByExtCustomerId(string $customerId): Customer;
+    public function fetchCustomerByExtCustomerId(string $customerId, int $version): Customer;
 
     /**
      * Update and return a Customer object via API.
@@ -325,8 +325,8 @@ public function fetchCharge(Charge $charge): Charge;
      * Fetch a chargeback object by combination of payment id, chargeback id and charge id.
      * Chargeback ids are not unique to a merchant but to the payment.
      *
-     * @param Payment|string $payment      The payment object or payment id to fetch the authorization from.
-     * @param string         $chargebackId The id of the chargeback to fetch.
+     * @param string $paymentId The payment object or payment id to fetch the authorization from.
+     * @param string $chargebackId The id of the chargeback to fetch.
      *
      * @return Chargeback|AbstractUnzerResource The fetched chargeback.
      *

src/Services/IdService.php

@@ -3,7 +3,6 @@
 namespace UnzerSDK\Services;
 
 use RuntimeException;
-
 use function count;
 
 /**
@@ -22,7 +21,7 @@ class IdService
      *
      * @param string $url
      * @param string $idString
-     * @param bool   $onlyLast
+     * @param bool $onlyLast
      *
      * @return string
      *
@@ -31,7 +30,7 @@ class IdService
     public static function getResourceIdFromUrl(string $url, string $idString, bool $onlyLast = false): string
     {
         $matches = [];
-        $pattern = '/\/([s|p]{1}-' . $idString . '-[a-z\d]+)\/?' . ($onlyLast ? '$' : '') . '/';
+        $pattern = '/\/([s|p]{1}-' . $idString . '-[a-z\d-]+)\/?' . ($onlyLast ? '$' : '') . '/';
         preg_match($pattern, $url, $matches);
 
         if (count($matches) < 2) {
@@ -76,7 +75,7 @@ public static function isPaymentChargeback(string $url): string
      *
      * @param string $url
      * @param string $idString
-     * @param bool   $onlyLast
+     * @param bool $onlyLast
      *
      * @return string|null
      */
@@ -117,4 +116,10 @@ public static function getResourceTypeFromIdString(string $typeId): ?string
 
         return $typeIdString;
     }
+
+    public static function isUUDIResource(string $id): bool
+    {
+        preg_match('/^[sp]-([a-z]{3}|p24)-[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/', $id, $matches);
+        return count($matches) > 0;
+    }
 }

src/Services/ResourceService.php

@@ -58,6 +58,7 @@
 use UnzerSDK\Resources\TransactionTypes\Chargeback;
 use UnzerSDK\Resources\TransactionTypes\Payout;
 use UnzerSDK\Resources\TransactionTypes\Shipment;
+use UnzerSDK\Resources\V2\Customer as CustomerV2;
 use UnzerSDK\Resources\V2\Paypage as PaypageV2;
 use UnzerSDK\Traits\CanRecur;
 use UnzerSDK\Unzer;
@@ -119,8 +120,8 @@ public function send(
         string                $httpMethod = HttpAdapterInterface::REQUEST_GET,
         string                $apiVersion = Unzer::API_VERSION
     ): stdClass {
-        $configClass = $resource->getApiConfig();
-        if (!$resource instanceof Token && $configClass::getAuthorizationMethod() === AuthorizationMethods::BEARER) {
+        $apiConfig = $resource->getApiConfig();
+        if (!$resource instanceof Token && $apiConfig::getAuthorizationMethod() === AuthorizationMethods::BEARER) {
             $this->unzer->prepareJwtToken();
         }
 
@@ -648,7 +649,9 @@ public function fetchCustomer($customer): Customer
         $customerObject = $customer;
 
         if (is_string($customer)) {
-            $customerObject = (new Customer())->setId($customer);
+            $isUUID = IdService::isUUDIResource($customer);
+            $customerObject = $isUUID ? new CustomerV2() : new Customer();
+            $customerObject->setId($customer);
         }
 
         $this->fetchResource($customerObject->setParentResource($this->unzer));
@@ -658,7 +661,7 @@ public function fetchCustomer($customer): Customer
     /**
      * {@inheritDoc}
      */
-    public function fetchCustomerByExtCustomerId(string $customerId): Customer
+    public function fetchCustomerByExtCustomerId(string $customerId, int $version = 1): Customer
     {
         $customerObject = (new Customer())->setCustomerId($customerId);
         $this->fetchResource($customerObject->setParentResource($this->unzer));

src/Unzer.php

@@ -485,9 +485,9 @@ public function fetchCustomer($customer): Customer
     /**
      * {@inheritDoc}
      */
-    public function fetchCustomerByExtCustomerId(string $customerId): Customer
+    public function fetchCustomerByExtCustomerId(string $customerId, int $version = 1): Customer
     {
-        return $this->resourceService->fetchCustomerByExtCustomerId($customerId);
+        return $this->resourceService->fetchCustomerByExtCustomerId($customerId, $version);
     }
 
     /**

test/Fixtures/CustomerFixtureTrait.php

@@ -57,7 +57,7 @@ public function getMaximumCustomer(): Customer
      */
     public function getMaximumCustomerInclShippingAddress(): Customer
     {
-        return $this->getMaximumCustomer($version)->setShippingAddress($this->getShippingAddress());
+        return $this->getMaximumCustomer()->setShippingAddress($this->getShippingAddress());
     }
 
     /**
@@ -74,8 +74,7 @@ public function getMinimalNotRegisteredB2bCustomer(): Customer
             $this->getBillingAddress(),
             '[email protected]',
             'Unzer GmbH',
-            CompanyCommercialSectorItems::WAREHOUSING_AND_SUPPORT_ACTIVITIES_FOR_TRANSPORTATION,
-            $version
+            CompanyCommercialSectorItems::WAREHOUSING_AND_SUPPORT_ACTIVITIES_FOR_TRANSPORTATION
         );
     }
 
@@ -86,7 +85,7 @@ public function getMinimalNotRegisteredB2bCustomer(): Customer
      */
     public function getMaximalNotRegisteredB2bCustomer(): Customer
     {
-        $customer = $this->getMinimalNotRegisteredB2bCustomer($version)
+        $customer = $this->getMinimalNotRegisteredB2bCustomer()
             ->setShippingAddress($this->getShippingAddress())
             ->setSalutation(Salutations::MR)
             ->setMobile('+49172123456')
@@ -112,7 +111,7 @@ public function getMaximalNotRegisteredB2bCustomer(): Customer
      */
     public function getMinimalRegisteredB2bCustomer(): Customer
     {
-        return CustomerFactory::createRegisteredB2bCustomer($this->getBillingAddress(), '123456789', 'Unzer GmbH', CompanyCommercialSectorItems::OTHER, $version);
+        return CustomerFactory::createRegisteredB2bCustomer($this->getBillingAddress(), '123456789', 'Unzer GmbH');
     }
 
     /**