updated office request and response

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

Hide file tree

Showing 8 changed files with 50 additions and 10 deletions.
diff --git a/data/GetShipmentStatusesResponse.json b/data/GetShipmentStatusesResponse.json
@@ -1,6 +1,3 @@
-// 20231226233953
-// https://ee.econt.com/doc_templates/srv/GetShipmentStatusesResponse.json
-
 {
   "shipmentStatuses": [
     {

diff --git a/data/ShipmentType.json b/data/ShipmentType.json
diff --git a/public/index.php b/public/index.php
@@ -45,8 +45,7 @@
 dump($object->findByName('София'));
 */
 
-$json = $econt->getOffices(new GetOfficesRequest(countryCode: 'BGR', cityId: '41'));
-$object = (new GetOfficesResponseFactory())($json);
-foreach ($object->offices as $office) {
-    dump($office);
-}
+$json = $econt->getOffices(new GetOfficesRequest(countryCode: 'BGR', cityId: '39'));
+$response = (new GetOfficesResponseFactory())($json);
+
+dump($response);
diff --git a/src/Model/Office.php b/src/Model/Office.php
@@ -35,6 +35,39 @@ public function __construct(
 
         #[Serializer\Type(Address::class)]
         public ?Address $address = null,
+
+        #[Serializer\Type('string')]
+        public ?string $info = null,
+
+        #[Serializer\Type('string')]
+        public ?string $currency = null,
+
+        #[Serializer\Type('string')]
+        public ?string $language = null,
+
+        #[Serializer\Type('int')]
+        public ?int $normalBusinessHoursFrom = null,
+
+        #[Serializer\Type('int')]
+        public ?int $normalBusinessHoursTo = null,
+
+        #[Serializer\Type('array')]
+        public ?array $shipmentTypes = null,
+
+        #[Serializer\Type('string')]
+        public ?string $partnerCode = null,
+
+        #[Serializer\Type('string')]
+        public ?string $hubCode = null,
+
+        #[Serializer\Type('string')]
+        public ?string $hubName = null,
+
+        #[Serializer\Type('string')]
+        public ?string $hubNameEn = null,
+
+        #[Serializer\Type('bool')]
+        public ?bool $isDrive = null,
     ){
     }
 }
diff --git a/src/Response/GetCitiesResponseFactory.php b/src/Response/GetCitiesResponseFactory.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace VasilDakov\Econt\Response;
 
 use VasilDakov\Econt\Exception\InvalidArgumentException;

diff --git a/src/Response/GetOfficesResponse.php b/src/Response/GetOfficesResponse.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace VasilDakov\Econt\Response;
 
 use Doctrine\Common\Collections\ArrayCollection;

diff --git a/src/Response/GetOfficesResponseFactory.php b/src/Response/GetOfficesResponseFactory.php
@@ -1,11 +1,16 @@
 <?php
 
+declare(strict_types=1);
+
 namespace VasilDakov\Econt\Response;
 
 use VasilDakov\Econt\Exception\InvalidArgumentException;
 use VasilDakov\Econt\Serializer\SerializerFactory;
 
-class GetOfficesResponseFactory
+use function json_decode;
+use function json_last_error;
+
+final class GetOfficesResponseFactory
 {
     public function __invoke(string $json): GetOfficesResponse
     {

diff --git a/src/Serializer/SerializerFactory.php b/src/Serializer/SerializerFactory.php
@@ -1,13 +1,15 @@
 <?php
 
+declare(strict_types=1);
+
 namespace VasilDakov\Econt\Serializer;
 
 use JMS\Serializer;
 use JMS\Serializer\SerializationContext;
 use JMS\Serializer\SerializerInterface;
 use VasilDakov\Econt\Exception\ServiceNotCreatedException;
 
-class SerializerFactory
+final class SerializerFactory
 {
     /**
      * @return SerializerInterface