More tests for setting service

inspirum · Jul 21, 2022 · 23ae365 · 23ae365
1 parent d4730a5
commit 23ae365
Show file tree

Hide file tree

Showing 64 changed files with 1,500 additions and 2,890 deletions.
diff --git a/src/Definitions/Option.php b/src/Definitions/Option.php
@@ -164,7 +164,7 @@ final class Option
     public const REC_CITY = 'rec_city';
 
     /**
-     * Delivery address postcode
+     * Delivery address zipcode
      *
      * @var string
      */

diff --git a/src/Model/Attribute/DefaultAttributeFactory.php b/src/Model/Attribute/DefaultAttributeFactory.php
@@ -15,7 +15,7 @@ public function create(array $data): Attribute
         return new Attribute(
             $data['name'],
             $data['data_type'],
-            $data['max_length'],
+            (string) $data['max_length'],
         );
     }
 

diff --git a/src/Model/ManipulationUnit/DefaultManipulationUnitFactory.php b/src/Model/ManipulationUnit/DefaultManipulationUnitFactory.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Inspirum\Balikobot\Model\ManipulationUnit;
+
+use Inspirum\Balikobot\Client\Request\Carrier;
+use function array_map;
+
+final class DefaultManipulationUnitFactory implements ManipulationUnitFactory
+{
+    /** @inheritDoc */
+    public function create(array $data): ManipulationUnit
+    {
+        return new ManipulationUnit((string) $data['code'], $data['name']);
+    }
+
+    /** @inheritDoc */
+    public function createCollection(Carrier $carrierType, array $data): ManipulationUnitCollection
+    {
+        return new ManipulationUnitCollection(
+            $carrierType,
+            array_map(fn(array $unit): ManipulationUnit => $this->create($unit), $data['units'] ?? []),
+        );
+    }
+}
diff --git a/src/Model/Unit/Unit.php → ...del/ManipulationUnit/ManipulationUnit.php b/src/Model/Unit/Unit.php → ...del/ManipulationUnit/ManipulationUnit.php
@@ -2,14 +2,14 @@
 
 declare(strict_types=1);
 
-namespace Inspirum\Balikobot\Model\Unit;
+namespace Inspirum\Balikobot\Model\ManipulationUnit;
 
 use Inspirum\Arrayable\BaseModel;
 
 /**
  * @extends \Inspirum\Arrayable\BaseModel<string,mixed>
  */
-final class Unit extends BaseModel
+final class ManipulationUnit extends BaseModel
 {
     public function __construct(
         public readonly string $code,

diff --git a/src/Model/Unit/UnitCollection.php → ...lationUnit/ManipulationUnitCollection.php b/src/Model/Unit/UnitCollection.php → ...lationUnit/ManipulationUnitCollection.php
@@ -2,18 +2,18 @@
 
 declare(strict_types=1);
 
-namespace Inspirum\Balikobot\Model\Unit;
+namespace Inspirum\Balikobot\Model\ManipulationUnit;
 
 use Inspirum\Arrayable\BaseCollection;
 use Inspirum\Balikobot\Client\Request\Carrier;
 
 /**
- * @extends \Inspirum\Arrayable\BaseCollection<string,mixed,int,\Inspirum\Balikobot\Model\Unit\Unit>
+ * @extends \Inspirum\Arrayable\BaseCollection<string,mixed,int,\Inspirum\Balikobot\Model\ManipulationUnit\ManipulationUnit>
  */
-final class UnitCollection extends BaseCollection
+final class ManipulationUnitCollection extends BaseCollection
 {
     /**
-     * @param array<int,\Inspirum\Balikobot\Model\Unit\Unit> $items
+     * @param array<int,\Inspirum\Balikobot\Model\ManipulationUnit\ManipulationUnit> $items
      */
     public function __construct(
         private Carrier $carrier,

diff --git a/src/Model/Unit/UnitFactory.php → ...ipulationUnit/ManipulationUnitFactory.php b/src/Model/Unit/UnitFactory.php → ...ipulationUnit/ManipulationUnitFactory.php
@@ -2,19 +2,19 @@
 
 declare(strict_types=1);
 
-namespace Inspirum\Balikobot\Model\Unit;
+namespace Inspirum\Balikobot\Model\ManipulationUnit;
 
 use Inspirum\Balikobot\Client\Request\Carrier;
 
-interface UnitFactory
+interface ManipulationUnitFactory
 {
     /**
      * @param array<string,mixed> $data
      */
-    public function create(array $data): Unit;
+    public function create(array $data): ManipulationUnit;
 
     /**
      * @param array<string,mixed> $data
      */
-    public function createCollection(Carrier $carrierType, array $data): UnitCollection;
+    public function createCollection(Carrier $carrierType, array $data): ManipulationUnitCollection;
 }
diff --git a/src/Model/Service/DefaultServiceFactory.php b/src/Model/Service/DefaultServiceFactory.php
@@ -20,15 +20,11 @@ public function __construct(
     public function create(Carrier $carrier, array $data): Service
     {
         return new Service(
-            $data['service_type'],
+            (string) $data['service_type'],
             $data['service_type_name'] ?? ($data['name'] ?? null),
-            $this->createOptionCollection($carrier, $data),
-            array_key_exists('countries', $data)
-                ? $this->countryFactory->createCodeCollection($data)
-                : null,
-            array_key_exists('cod_countries', $data)
-                ? $this->countryFactory->createCodCountryCollection($data)
-                : null,
+            array_key_exists('services', $data) ? $this->createOptionCollection($carrier, $data) : null,
+            array_key_exists('countries', $data) ? $this->countryFactory->createCodeCollection($data) : null,
+            array_key_exists('cod_countries', $data) ? $this->countryFactory->createCodCountryCollection($data) : null,
         );
     }
 

diff --git a/src/Model/Service/Service.php b/src/Model/Service/Service.php
@@ -5,12 +5,14 @@
 namespace Inspirum\Balikobot\Model\Service;
 
 use Inspirum\Arrayable\BaseModel;
-use Inspirum\Balikobot\Client\Request\Service;
+use Inspirum\Balikobot\Client\Request\Service as RequestService;
+use Inspirum\Balikobot\Model\Country\CodCountry;
+use function array_map;
 
 /**
  * @extends \Inspirum\Arrayable\BaseModel<string,mixed>
  */
-final class Service extends BaseModel implements Service
+final class Service extends BaseModel implements RequestService
 {
     /**
      * @param array<string>|null                                       $countries
@@ -41,9 +43,9 @@ public function __toArray(): array
         return [
             'type'         => $this->type,
             'name'         => $this->name,
-            'options'      => $this->options?->toArray(),
+            'options'      => $this->options?->__toArray(),
             'countries'    => $this->countries,
-            'codCountries' => $this->codCountries,
+            'codCountries' => $this->codCountries !== null ? array_map(static fn(CodCountry $country): array => $country->__toArray(), $this->codCountries) : null,
         ];
     }
 }
diff --git a/src/Model/Service/ServiceCollection.php b/src/Model/Service/ServiceCollection.php
@@ -6,8 +6,6 @@
 
 use Inspirum\Arrayable\BaseCollection;
 use Inspirum\Balikobot\Client\Request\Carrier;
-use Inspirum\Balikobot\Client\Request\Service;
-use function array_map;
 
 /**
  * @extends \Inspirum\Arrayable\BaseCollection<string,mixed,int,\Inspirum\Balikobot\Model\Service\Service>
@@ -19,7 +17,7 @@ final class ServiceCollection extends BaseCollection
      */
     public function __construct(
         private readonly Carrier $carrier,
-        private readonly array $services,
+        readonly array $services,
         private readonly ?bool $parcel = null,
         private readonly ?bool $cargo = null,
     ) {
@@ -31,14 +29,6 @@ public function getCarrier(): Carrier
         return $this->carrier;
     }
 
-    /**
-     * @return array<\Inspirum\Balikobot\Client\Request\Service>
-     */
-    public function getServiceTypes(): array
-    {
-        return array_map(static fn(Service $service): Service => $service, $this->services);
-    }
-
     public function supportsParcel(): ?bool
     {
         return $this->parcel;

diff --git a/...el/Status/DefaultPackageStatusFactory.php → src/Model/Status/DefaultStatusFactory.php b/...el/Status/DefaultPackageStatusFactory.php → src/Model/Status/DefaultStatusFactory.php
@@ -16,7 +16,7 @@
 use function is_array;
 use function is_string;
 
-final class DefaultPackageStatusFactory implements PackageStatusFactory
+final class DefaultStatusFactory implements StatusFactory
 {
     public function __construct(
         private Validator $validator,

diff --git a/src/Model/Status/PackageStatusFactory.php → src/Model/Status/StatusFactory.php b/src/Model/Status/PackageStatusFactory.php → src/Model/Status/StatusFactory.php
@@ -6,7 +6,7 @@
 
 use Inspirum\Balikobot\Client\Request\Carrier;
 
-interface PackageStatusFactory
+interface StatusFactory
 {
     /**
      * @param array<string,string|int|float> $data

diff --git a/src/Model/Unit/DefaultUnitFactory.php b/src/Model/Unit/DefaultUnitFactory.php
diff --git a/...Model/PostCode/DefaultPostCodeFactory.php → src/Model/ZipCode/DefaultZipCodeFactory.php b/...Model/PostCode/DefaultPostCodeFactory.php → src/Model/ZipCode/DefaultZipCodeFactory.php
@@ -2,29 +2,30 @@
 
 declare(strict_types=1);
 
-namespace Inspirum\Balikobot\Model\PostCode;
+namespace Inspirum\Balikobot\Model\ZipCode;
 
 use Inspirum\Balikobot\Client\Request\Carrier;
 use Inspirum\Balikobot\Client\Request\Service;
+use Iterator;
 
-final class DefaultPostCodeFactory implements PostCodeFactory
+final class DefaultZipCodeFactory implements ZipCodeFactory
 {
     /** @inheritDoc */
-    public function create(Carrier $carrier, ?Service $service, array $data): PostCode
+    public function create(Carrier $carrier, ?Service $service, array $data): ZipCode
     {
-        return new PostCode(
+        return new ZipCode(
             $carrier,
             $service,
-            $data['postcode'],
-            $data['postcode_end'] ?? null,
+            $data['zip'] ?? ($data['zip_start'] ?? null),
+            $data['zip_end'] ?? null,
             $data['city'] ?? null,
             $data['country'] ?? null,
             (bool) ($data['1B'] ?? false),
         );
     }
 
     /** @inheritDoc */
-    public function createIterator(Carrier $carrier, ?Service $service, ?string $country, array $data): iterable
+    public function createIterator(Carrier $carrier, ?Service $service, ?string $country, array $data): Iterator
     {
         $country = $data['country'] ?? $country;
 

diff --git a/src/Model/PostCode/PostCode.php → src/Model/ZipCode/ZipCode.php b/src/Model/PostCode/PostCode.php → src/Model/ZipCode/ZipCode.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Inspirum\Balikobot\Model\PostCode;
+namespace Inspirum\Balikobot\Model\ZipCode;
 
 use Inspirum\Arrayable\BaseModel;
 use Inspirum\Balikobot\Client\Request\Carrier;
@@ -11,13 +11,13 @@
 /**
  * @extends \Inspirum\Arrayable\BaseModel<string,mixed>
  */
-class PostCode extends BaseModel
+class ZipCode extends BaseModel
 {
     public function __construct(
         public readonly Carrier $carrier,
         public readonly ?Service $service,
-        public readonly string $postcode,
-        public readonly ?string $postcodeEnd,
+        public readonly ?string $zipCode,
+        public readonly ?string $zipCodeEnd,
         public readonly ?string $city,
         public readonly ?string $country,
         public readonly bool $morningDelivery
@@ -29,9 +29,9 @@ public function __toArray(): array
     {
         return [
             'carrier'         => $this->carrier->getValue(),
-            'service'         => $this->service,
-            'postcode'        => $this->postcode,
-            'postcodeEnd'     => $this->postcodeEnd,
+            'service'         => $this->service?->getValue(),
+            'zipCode'         => $this->zipCode,
+            'zipCodeEnt'      => $this->zipCodeEnd,
             'city'            => $this->city,
             'country'         => $this->country,
             'morningDelivery' => $this->morningDelivery,

diff --git a/src/Model/PostCode/PostCodeFactory.php → src/Model/ZipCode/ZipCodeFactory.php b/src/Model/PostCode/PostCodeFactory.php → src/Model/ZipCode/ZipCodeFactory.php
@@ -2,22 +2,23 @@
 
 declare(strict_types=1);
 
-namespace Inspirum\Balikobot\Model\PostCode;
+namespace Inspirum\Balikobot\Model\ZipCode;
 
 use Inspirum\Balikobot\Client\Request\Carrier;
 use Inspirum\Balikobot\Client\Request\Service;
+use Iterator;
 
-interface PostCodeFactory
+interface ZipCodeFactory
 {
     /**
      * @param array<string,string> $data
      */
-    public function create(Carrier $carrier, ?Service $service, array $data): PostCode;
+    public function create(Carrier $carrier, ?Service $service, array $data): ZipCode;
 
     /**
      * @param array<string,mixed> $data
      *
-     * @return iterable<\Inspirum\Balikobot\Model\PostCode\PostCode>
+     * @return \Iterator<\Inspirum\Balikobot\Model\ZipCode\ZipCode>
      */
-    public function createIterator(Carrier $carrier, ?Service $service, ?string $country, array $data): iterable;
+    public function createIterator(Carrier $carrier, ?Service $service, ?string $country, array $data): Iterator;
 }
diff --git a/src/Service/BranchService.php b/src/Service/BranchService.php
@@ -80,7 +80,7 @@ public function getBranchesForLocation(
         Carrier $carrier,
         string $country,
         string $city,
-        ?string $postcode = null,
+        ?string $zipCode = null,
         ?string $street = null,
         ?int $maxResults = null,
         ?float $radius = null,