feat: add carrier ups

src/Helper/MyParcelCollection.php

@@ -23,6 +23,7 @@
 use MyParcelNL\Sdk\src\Exception\MissingFieldException;
 use MyParcelNL\Sdk\src\Factory\ConsignmentFactory;
 use MyParcelNL\Sdk\src\Model\Carrier\CarrierInstabox;
+use MyParcelNL\Sdk\src\Model\Carrier\CarrierUPS;
 use MyParcelNL\Sdk\src\Model\Consignment\AbstractConsignment;
 use MyParcelNL\Sdk\src\Model\Consignment\BaseConsignment;
 use MyParcelNL\Sdk\src\Model\MyParcelRequest;
@@ -829,7 +830,7 @@ private function getNewCollectionFromResult($result): self
             $consignment = ConsignmentFactory::createByCarrierId($shipment['carrier_id'])->setApiKey($apiKey);
 
             //TODO: MY-32524 Make AbstractConsignmentAdapter for carrier specific exceptions
-            if (CarrierInstabox::ID === $shipment['carrier_id']) {
+            if (CarrierInstabox::ID === $shipment['carrier_id'] || CarrierUPS::ID === $shipment['carrier_id']) {
                 $shipment['barcode'] = $shipment['barcode'] ?: $shipment['external_identifier'];
             }
 

src/Model/Carrier/CarrierFactory.php

@@ -18,7 +18,8 @@ class CarrierFactory
         CarrierPostNL::class,
         CarrierDHLForYou::class,
         CarrierDHLParcelConnect::class,
-        CarrierDHLEuroplus::class
+        CarrierDHLEuroplus::class,
+        CarrierUPS::class
     ];
 
     /**

src/Model/Carrier/CarrierUPS.php

@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+namespace MyParcelNL\Sdk\src\Model\Carrier;
+
+use MyParcelNL\Sdk\src\Model\Consignment\UPSConsignment;
+
+class CarrierUPS extends AbstractCarrier
+{
+    public const CONSIGNMENT = UPSConsignment::class;
+    public const HUMAN       = 'UPS';
+    public const ID          = 8;
+    public const NAME        = 'ups';
+
+    /**
+     * @var class-string
+     */
+    protected $consignmentClass = self::CONSIGNMENT;
+
+    /**
+     * @var string
+     */
+    protected $human = self::HUMAN;
+
+    /**
+     * @var int
+     */
+    protected $id = self::ID;
+
+    /**
+     * @var string
+     */
+    protected $name = self::NAME;
+}

src/Model/Consignment/UPSConsignment.php

@@ -0,0 +1,57 @@
+<?php
+
+declare(strict_types=1);
+
+namespace MyParcelNL\Sdk\src\Model\Consignment;
+
+use MyParcelNL\Sdk\src\Model\Carrier\CarrierUPS;
+use MyParcelNL\Sdk\src\Validator\Consignment\UPSConsignmentValidator;
+
+class UPSConsignment extends AbstractConsignment
+{
+    public const DEFAULT_WEIGHT = 3000;
+
+    /**
+     * @internal
+     * @var int
+     */
+    public $physical_properties = ['weight' => self::DEFAULT_WEIGHT];
+
+    /**
+     * @var string
+     */
+    protected $carrierClass = CarrierUPS::class;
+
+    /**
+     * @var string
+     */
+    protected $validatorClass = UPSConsignmentValidator::class;
+
+    /**
+     * @return string
+     */
+    public function getLocalCountryCode(): string
+    {
+        return self::CC_NL;
+    }
+
+    /**
+     * @return array|string[]
+     */
+    public function getAllowedPackageTypes(): array
+    {
+        return [
+            self::PACKAGE_TYPE_PACKAGE_NAME,
+        ];
+    }
+
+    /**
+     * @return array|string[]
+     */
+    public function getAllowedDeliveryTypes(): array
+    {
+        return [
+            self::DELIVERY_TYPE_STANDARD,
+        ];
+    }
+}

src/Validator/Consignment/UPSConsignmentValidator.php

@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+namespace MyParcelNL\Sdk\src\Validator\Consignment;
+
+use MyParcelNL\Sdk\src\Rule\Consignment\DeliveryDateRule;
+use MyParcelNL\Sdk\src\Rule\Consignment\MinimumWeightRule;
+use MyParcelNL\Sdk\src\Rule\Consignment\ShipmentOptionsRule;
+use MyParcelNL\Sdk\src\Validator\AbstractValidator;
+
+class UPSConsignmentValidator extends AbstractValidator
+{
+    /**
+     * @return \MyParcelNL\Sdk\src\Rule\Rule[]
+     */
+    protected function getRules(): array
+    {
+        return [
+            new DeliveryDateRule(),
+            new MinimumWeightRule(),
+            new ShipmentOptionsRule(),
+        ];
+    }
+}

test/Model/Consignment/DHLForYouConsignmentTest.php

@@ -33,9 +33,9 @@ public function provideDHLForYouConsignmentsData(): array
                 self::expected(self::RETURN) => false,
                 self::SAME_DAY_DELIVERY      => true,
             ],
-            'Age check' => [
-                self::AGE_CHECK => true,
-                self::ONLY_RECIPIENT => true,
+            'Age check'         => [
+                self::AGE_CHECK                      => true,
+                self::ONLY_RECIPIENT                 => true,
                 self::expected(self::ONLY_RECIPIENT) => false,
             ],
         ]);

test/Model/Consignment/UPSConsignmentTest.php

@@ -0,0 +1,55 @@
+<?php
+
+declare(strict_types=1);
+
+namespace MyParcelNL\Sdk\Test\Model\Consignment;
+
+use MyParcelNL\Sdk\src\Model\Carrier\CarrierUPS;
+use MyParcelNL\Sdk\src\Model\Consignment\AbstractConsignment;
+use MyParcelNL\Sdk\Test\Bootstrap\ConsignmentTestCase;
+
+class UPSConsignmentTest extends ConsignmentTestCase
+{
+    /**
+     * @return array
+     * @throws \Exception
+     */
+    public function provideUPSConsignmentsData(): array
+    {
+        return $this->createConsignmentProviderDataset([
+            'NL -> EU' => [],
+        ]);
+    }
+
+    /**
+     * @param  array $testData
+     *
+     * @throws \Exception
+     * @throws \Exception
+     * @dataProvider provideUPSConsignmentsData
+     */
+    public function testUPSForYouConsignments(array $testData): void
+    {
+        $this->doConsignmentTest($testData);
+    }
+
+    /**
+     * @return array|string[]
+     * @throws \Exception
+     */
+    protected function getDefaultConsignmentData(): array
+    {
+        return array_replace(
+            parent::getDefaultConsignmentData(),
+            [
+                self::CARRIER_ID   => CarrierUPS::ID,
+                self::PACKAGE_TYPE => AbstractConsignment::PACKAGE_TYPE_PACKAGE,
+                self::FULL_STREET  => 'Feldstrasse 17',
+                self::POSTAL_CODE  => '39394',
+                self::CITY         => 'Schwanebeck',
+                self::COUNTRY      => 'DE',
+                self::PHONE        => '123456',
+            ]
+        );
+    }
+}