updated client, model and unit tests

vasildakov · Dec 27, 2023 · 5ab65be · 5ab65be
1 parent a8b0f98
commit 5ab65be
Show file tree

Hide file tree

Showing 18 changed files with 413 additions and 51 deletions.
diff --git a/data/City.json b/data/City.json
@@ -0,0 +1,19 @@
+{
+  "id": 603409,
+  "country": {
+    "id": null,
+    "code2": "LU",
+    "code3": "LUX",
+    "name": "Люксембург",
+    "nameEn": "Luxembourg",
+    "isEU": true
+  },
+  "postCode": "0",
+  "name": "Alscheid",
+  "nameEn": "Alscheid",
+  "regionName": "",
+  "regionNameEn": "",
+  "phoneCode": "0",
+  "location": null,
+  "expressCityDeliveries": false
+}
diff --git a/public/index.php b/public/index.php
@@ -9,7 +9,9 @@
 use VasilDakov\Econt\Configuration;
 use VasilDakov\Econt\Econt;
 use VasilDakov\Econt\Request\GetCitiesRequest;
+use VasilDakov\Econt\Request\GetOfficesRequest;
 use VasilDakov\Econt\Response\GetCitiesResponseFactory;
+use VasilDakov\Econt\Response\GetOfficesResponseFactory;
 
 chdir(dirname(__DIR__));
 
@@ -36,9 +38,15 @@
 
 $econt = new Econt($configuration, $client, $factory);
 
-
+/*
 $json = $econt->getCities(new GetCitiesRequest(countryCode: 'BGR'));
 $object = (new GetCitiesResponseFactory())($json);
-
-dump($object->findById(39));
-dump($object->findByName('Бургас'));
+dump($object->findById(41));
+dump($object->findByName('София'));
+*/
+
+$json = $econt->getOffices(new GetOfficesRequest(countryCode: 'BGR', cityId: '41'));
+$object = (new GetOfficesResponseFactory())($json);
+foreach ($object->offices as $office) {
+    dump($office);
+}
diff --git a/src/Econt.php b/src/Econt.php
@@ -75,15 +75,29 @@ public function getCities(Request\GetCitiesRequest $object): string
         return $response->getBody()->getContents();
     }
 
-    public function getOffices(array $data): string
+    /**
+     * @throws ClientExceptionInterface
+     */
+    public function getOffices(Request\GetOfficesRequest $object): string
     {
         $request = $this->createRequest(
             RequestMethodInterface::METHOD_POST,
             self::API_URL . '/ee/services/Nomenclatures/NomenclaturesService.getOffices.json',
-            [
-                Constants::COUNTRY_CODE => $data['countryCode'],
-                Constants::CITY_ID => $data['cityId'],
-            ]
+            $object->toArray()
+        );
+
+        $response = $this->client->sendRequest($request);
+
+        return $response->getBody()->getContents();
+    }
+
+
+    public function getStreets(Request\GetStreetsRequest $object): string
+    {
+        $request = $this->createRequest(
+            RequestMethodInterface::METHOD_POST,
+            self::API_URL . '/ee/services/Nomenclatures/NomenclaturesService.getStreets.json',
+            $object->toArray()
         );
 
         $response = $this->client->sendRequest($request);
@@ -92,6 +106,13 @@ public function getOffices(array $data): string
     }
 
 
+    public function getQuarters(array $data): string
+    {
+        return '';
+    }
+
+
+
     public function getShipmentStatuses(array $data): string
     {
         $request = $this->createRequest(
@@ -129,15 +150,7 @@ private function createRequest(string $method, string $uri, array $data): Reques
         return $request;
     }
 
-    public function getStreets(array $data): string
-    {
-        return '';
-    }
 
-    public function getQuarters(array $data): string
-    {
-        return '';
-    }
 
     public function createLabel(array $data): string
     {

diff --git a/src/EcontInterface.php b/src/EcontInterface.php
@@ -1,9 +1,16 @@
 <?php
 
+declare(strict_types=1);
+
 namespace VasilDakov\Econt;
 
 use VasilDakov\Econt\Request;
 
+/**
+ * EcontInterface
+ *
+ * @author Vasil Dakov <[email protected]>
+ */
 interface EcontInterface
 {
     public function getClientProfiles(): string;
@@ -12,9 +19,9 @@ public function getCountries(): string;
 
     public function getCities(Request\GetCitiesRequest $object): string;
 
-    public function getOffices(array $data): string;
+    public function getOffices(Request\GetOfficesRequest $object): string;
 
-    public function getStreets(array $data): string;
+    public function getStreets(Request\GetStreetsRequest $object): string;
 
     public function getQuarters(array $data): string;
 

diff --git a/src/Model/Address.php b/src/Model/Address.php
@@ -0,0 +1,46 @@
+<?php
+
+declare(strict_types=1);
+
+namespace VasilDakov\Econt\Model;
+
+use JMS\Serializer\Annotation as Serializer;
+
+final readonly class Address
+{
+    public function __construct(
+        #[Serializer\Type('int')]
+        public ?int $id = null,
+
+        #[Serializer\Type(City::class)]
+        public ?City $city = null,
+
+        #[Serializer\Type('string')]
+        public ?string $fullAddress = null,
+
+        #[Serializer\Type('string')]
+        public ?string $fullAddressEn = null,
+
+        #[Serializer\Type('string')]
+        public ?string $quarter = null,
+
+        #[Serializer\Type('string')]
+        public ?string $street = null,
+
+        #[Serializer\Type('string')]
+        public ?string $num = null,
+
+        #[Serializer\Type('string')]
+        public ?string $other = null,
+
+        #[Serializer\Type(GeoLocation::class)]
+        public ?GeoLocation $location = null,
+
+        #[Serializer\Type('string')]
+        public ?string $zip = null,
+
+        #[Serializer\Type('string')]
+        public ?string $hezid = null,
+    ) {
+    }
+}
diff --git a/src/Model/City.php b/src/Model/City.php
@@ -6,29 +6,35 @@
 
 use JMS\Serializer\Annotation as Serializer;
 
-readonly class City
+final readonly class City
 {
     public function __construct(
         #[Serializer\Type('int')]
-        public ?int $id,
+        public ?int $id = null,
 
         #[Serializer\Type('string')]
-        public ?string $name,
+        public ?string $name = null,
 
         #[Serializer\Type('string')]
-        public ?string $nameEn,
+        public ?string $nameEn = null,
 
         #[Serializer\Type('string')]
-        public ?string $regionName,
+        public ?string $regionName = null,
 
         #[Serializer\Type('string')]
-        public ?string $regionNameEn,
+        public ?string $regionNameEn = null,
 
         #[Serializer\Type('string')]
-        public ?string $phoneCode,
+        public ?string $phoneCode = null,
+
+        #[Serializer\Type(Country::class)]
+        public ?Country $country = null,
+
+        #[Serializer\Type(GeoLocation::class)]
+        public ?GeoLocation $location = null,
 
         #[Serializer\Type('string',)]
-        public ?string $postCode
+        public ?string $postCode = null
     ) {
     }
 }
diff --git a/src/Model/Country.php b/src/Model/Country.php
@@ -10,22 +10,22 @@
 {
     public function __construct(
         #[Serializer\Type('int')]
-        public ?int $id,
+        public ?int $id = null,
 
         #[Serializer\Type('string')]
-        public ?string $code2,
+        public ?string $code2 = null,
 
         #[Serializer\Type('string')]
-        public ?string $code3,
+        public ?string $code3 = null,
 
         #[Serializer\Type('string')]
-        public ?string $name,
+        public ?string $name = null,
 
         #[Serializer\Type('string')]
-        public ?string $nameEn,
+        public ?string $nameEn = null,
 
         #[Serializer\Type('bool')]
-        public ?bool $isEU
+        public ?bool $isEU = null
     ) {
     }
 }
diff --git a/src/Model/GeoLocation.php b/src/Model/GeoLocation.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace VasilDakov\Econt\Model;
+
+use JMS\Serializer\Annotation as Serializer;
+
+readonly class GeoLocation
+{
+    public function __construct(
+        #[Serializer\Type('float')]
+        public ?float $latitude = null,
+
+        #[Serializer\Type('float')]
+        public ?float $longitude = null,
+
+        #[Serializer\Type('int')]
+        public ?int $confidence = null,
+    ) {
+    }
+}
diff --git a/src/Model/Office.php b/src/Model/Office.php
@@ -1,8 +1,40 @@
 <?php
 
+declare(strict_types=1);
+
 namespace VasilDakov\Econt\Model;
 
-class Office
+use JMS\Serializer\Annotation as Serializer;
+
+readonly class Office
 {
+    public function __construct(
+        #[Serializer\Type('int')]
+        public ?int $id = null,
+
+        #[Serializer\Type('string')]
+        public ?string $code = null,
+
+        #[Serializer\Type('string')]
+        public ?string $name = null,
+
+        #[Serializer\Type('string')]
+        public ?string $nameEn = null,
+
+        #[Serializer\Type('bool')]
+        public ?bool $isMPS = null,
+
+        #[Serializer\Type('bool')]
+        public ?bool $isAPS = null,
+
+        #[Serializer\Type('array')]
+        public ?array $phones = null,
+
+        #[Serializer\Type('array')]
+        public ?array $emails = null,
 
-}
+        #[Serializer\Type(Address::class)]
+        public ?Address $address = null,
+    ){
+    }
+}
diff --git a/src/Request/GetOfficesRequest.php b/src/Request/GetOfficesRequest.php
@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace VasilDakov\Econt\Request;
+
+use VasilDakov\Econt\Constants;
+
+/**
+ * EcontInterface
+ *
+ * @author Vasil Dakov <[email protected]>
+ */
+final readonly class GetOfficesRequest
+{
+    public function __construct(
+        public string $countryCode,
+        public string $cityId
+    ) {
+    }
+
+    public function toArray(): array
+    {
+        return [
+            Constants::COUNTRY_CODE => $this->countryCode,
+            Constants::CITY_ID => $this->cityId,
+        ];
+    }
+}
diff --git a/src/Request/GetStreetsRequest.php b/src/Request/GetStreetsRequest.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace VasilDakov\Econt\Request;
+
+use VasilDakov\Econt\Constants;
+
+final readonly class GetStreetsRequest
+{
+    public function __construct(public string $cityId)
+    {
+    }
+
+    public function toArray(): array
+    {
+        return [
+            Constants::CITY_ID => $this->cityId
+        ];
+    }
+}
diff --git a/src/Response/GetOfficesResponse.php b/src/Response/GetOfficesResponse.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace VasilDakov\Econt\Response;
+
+use Doctrine\Common\Collections\ArrayCollection;
+use JMS\Serializer\Annotation as Serializer;
+use VasilDakov\Econt\Model;
+
+final class GetOfficesResponse
+{
+    #[Serializer\Type("ArrayCollection<VasilDakov\Econt\Model\Office>")]
+    public ArrayCollection $offices;
+
+    public function __construct()
+    {
+        $this->offices = new ArrayCollection();
+    }
+}