From cf7bc65f1ab8745e6d0bef9ce014593a4ddc988d Mon Sep 17 00:00:00 2001
From: mandan2 <mantasda2@gmail.com>
Date: Tue, 26 Sep 2023 13:45:46 +0300
Subject: [PATCH] renamed some services and added additional conditions for
 carrier retrieve

---
 .../CouldNotProvideCarrierDeliveryPrice.php   |  62 -------
 .../Provider/CarrierDeliveryPriceProvider.php | 122 --------------
 .../CarrierDeliveryPriceProviderTest.php      | 159 ------------------
 3 files changed, 343 deletions(-)
 delete mode 100644 subscription/Exception/CouldNotProvideCarrierDeliveryPrice.php
 delete mode 100644 subscription/Provider/CarrierDeliveryPriceProvider.php
 delete mode 100644 tests/Integration/Subscription/Provider/CarrierDeliveryPriceProviderTest.php

diff --git a/subscription/Exception/CouldNotProvideCarrierDeliveryPrice.php b/subscription/Exception/CouldNotProvideCarrierDeliveryPrice.php
deleted file mode 100644
index c6f20a9e4..000000000
--- a/subscription/Exception/CouldNotProvideCarrierDeliveryPrice.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-namespace Mollie\Subscription\Exception;
-
-class CouldNotProvideCarrierDeliveryPrice extends MollieSubscriptionException
-{
-    public static function failedToFindSelectedCarrierForSubscriptionOrder(): CouldNotProvideCarrierDeliveryPrice
-    {
-        return new self(
-            'Failed to find selected carrier for subscription order',
-            ExceptionCode::ORDER_FAILED_TO_FIND_SELECTED_CARRIER_FOR_SUBSCRIPTION_ORDER
-        );
-    }
-
-    public static function failedToFindOrderCart(): CouldNotProvideCarrierDeliveryPrice
-    {
-        return new self(
-            'Failed to find order cart',
-            ExceptionCode::ORDER_FAILED_TO_FIND_ORDER_CART
-        );
-    }
-
-    public static function failedToFindOrderCustomer(): CouldNotProvideCarrierDeliveryPrice
-    {
-        return new self(
-            'Failed to find order customer',
-            ExceptionCode::ORDER_FAILED_TO_FIND_ORDER_CUSTOMER
-        );
-    }
-
-    public static function failedToApplySelectedCarrierForSubscriptionOrder(): CouldNotProvideCarrierDeliveryPrice
-    {
-        return new self(
-            'Failed to apply selected carrier for subscription order',
-            ExceptionCode::ORDER_FAILED_TO_APPLY_SELECTED_CARRIER_FOR_SUBSCRIPTION_ORDER
-        );
-    }
-
-    public static function failedToFindOrderDeliveryAddress(): CouldNotProvideCarrierDeliveryPrice
-    {
-        return new self(
-            'Failed to find order delivery address',
-            ExceptionCode::ORDER_FAILED_TO_FIND_ORDER_DELIVERY_ADDRESS
-        );
-    }
-
-    public static function failedToFindOrderDeliveryCountry(): CouldNotProvideCarrierDeliveryPrice
-    {
-        return new self(
-            'Failed to find order delivery country',
-            ExceptionCode::ORDER_FAILED_TO_FIND_ORDER_DELIVERY_COUNTRY
-        );
-    }
-
-    public static function failedToGetSelectedCarrierPriceForSubscriptionOrder(): CouldNotProvideCarrierDeliveryPrice
-    {
-        return new self(
-            'Failed to get selected carrier price for subscription order',
-            ExceptionCode::ORDER_FAILED_TO_GET_SELECTED_CARRIER_PRICE_FOR_SUBSCRIPTION_ORDER
-        );
-    }
-}
diff --git a/subscription/Provider/CarrierDeliveryPriceProvider.php b/subscription/Provider/CarrierDeliveryPriceProvider.php
deleted file mode 100644
index f22f794e8..000000000
--- a/subscription/Provider/CarrierDeliveryPriceProvider.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-
-namespace Mollie\Subscription\Provider;
-
-use Mollie\Adapter\ConfigurationAdapter;
-use Mollie\Config\Config;
-use Mollie\Repository\AddressRepositoryInterface;
-use Mollie\Repository\CarrierRepositoryInterface;
-use Mollie\Repository\CartRepositoryInterface;
-use Mollie\Repository\CountryRepositoryInterface;
-use Mollie\Repository\CustomerRepositoryInterface;
-use Mollie\Subscription\Exception\CouldNotProvideCarrierDeliveryPrice;
-
-class CarrierDeliveryPriceProvider
-{
-    /** @var ConfigurationAdapter */
-    private $configuration;
-    /** @var CarrierRepositoryInterface */
-    private $carrierRepository;
-    /** @var AddressRepositoryInterface */
-    private $addressRepository;
-    /** @var CustomerRepositoryInterface */
-    private $customerRepository;
-    /** @var CartRepositoryInterface */
-    private $cartRepository;
-    /** @var CountryRepositoryInterface */
-    private $countryRepository;
-
-    public function __construct(
-        ConfigurationAdapter $configuration,
-        CarrierRepositoryInterface $carrierRepository,
-        AddressRepositoryInterface $addressRepository,
-        CustomerRepositoryInterface $customerRepository,
-        CartRepositoryInterface $cartRepository,
-        CountryRepositoryInterface $countryRepository
-    ) {
-        $this->configuration = $configuration;
-        $this->carrierRepository = $carrierRepository;
-        $this->addressRepository = $addressRepository;
-        $this->customerRepository = $customerRepository;
-        $this->cartRepository = $cartRepository;
-        $this->countryRepository = $countryRepository;
-    }
-
-    /**
-     * @throws CouldNotProvideCarrierDeliveryPrice
-     */
-    public function getPrice(int $addressDeliveryId, int $cartId, int $customerId, array $subscriptionProduct): float
-    {
-        $subscriptionCarrierId = (int) $this->configuration->get(Config::MOLLIE_SUBSCRIPTION_ORDER_CARRIER_ID);
-
-        /** @var \Carrier|null $carrier */
-        $carrier = $this->carrierRepository->findOneBy([
-            'id_carrier' => $subscriptionCarrierId,
-        ]);
-
-        if (!$carrier) {
-            throw CouldNotProvideCarrierDeliveryPrice::failedToFindSelectedCarrierForSubscriptionOrder();
-        }
-
-        /** @var \Cart|null $cart */
-        $cart = $this->cartRepository->findOneBy([
-            'id_cart' => $cartId,
-        ]);
-
-        if (!$cart) {
-            throw CouldNotProvideCarrierDeliveryPrice::failedToFindOrderCart();
-        }
-
-        /** @var \Customer|null $customer */
-        $customer = $this->customerRepository->findOneBy([
-            'id_customer' => $customerId,
-        ]);
-
-        if (!$customer) {
-            throw CouldNotProvideCarrierDeliveryPrice::failedToFindOrderCustomer();
-        }
-
-        $getAvailableOrderCarriers = $this->carrierRepository->getCarriersForOrder(
-            $this->addressRepository->getZoneById($addressDeliveryId),
-            $customer->getGroups(),
-            $cart
-        );
-
-        if (!in_array($subscriptionCarrierId, array_column($getAvailableOrderCarriers, 'id_carrier'), false)) {
-            throw CouldNotProvideCarrierDeliveryPrice::failedToApplySelectedCarrierForSubscriptionOrder();
-        }
-
-        /** @var \Address|bool $address */
-        $address = $this->addressRepository->findOneBy([
-            'id_address' => $addressDeliveryId,
-        ]);
-
-        if (!$address) {
-            throw CouldNotProvideCarrierDeliveryPrice::failedToFindOrderDeliveryAddress();
-        }
-
-        /** @var \Country|bool $country */
-        $country = $this->countryRepository->findOneBy([
-            'id_country' => $address->id_country,
-        ]);
-
-        if (!$country) {
-            throw CouldNotProvideCarrierDeliveryPrice::failedToFindOrderDeliveryCountry();
-        }
-
-        /** @var float|bool $deliveryPrice */
-        $deliveryPrice = $cart->getPackageShippingCost(
-            $subscriptionCarrierId,
-            true,
-            $country,
-            [$subscriptionProduct],
-            $this->addressRepository->getZoneById($addressDeliveryId)
-        );
-
-        if (is_bool($deliveryPrice) && !$deliveryPrice) {
-            throw CouldNotProvideCarrierDeliveryPrice::failedToGetSelectedCarrierPriceForSubscriptionOrder();
-        }
-
-        return (float) $deliveryPrice;
-    }
-}
diff --git a/tests/Integration/Subscription/Provider/CarrierDeliveryPriceProviderTest.php b/tests/Integration/Subscription/Provider/CarrierDeliveryPriceProviderTest.php
deleted file mode 100644
index bf8e5416c..000000000
--- a/tests/Integration/Subscription/Provider/CarrierDeliveryPriceProviderTest.php
+++ /dev/null
@@ -1,159 +0,0 @@
-<?php
-
-namespace Mollie\Tests\Integration\Subscription\Provider;
-
-use Mollie\Adapter\ConfigurationAdapter;
-use Mollie\Config\Config;
-use Mollie\Subscription\Exception\CouldNotProvideCarrierDeliveryPrice;
-use Mollie\Subscription\Exception\ExceptionCode;
-use Mollie\Subscription\Provider\CarrierDeliveryPriceProvider;
-use Mollie\Tests\Integration\BaseTestCase;
-use Mollie\Tests\Integration\Factory\AddressFactory;
-use Mollie\Tests\Integration\Factory\CarrierFactory;
-use Mollie\Tests\Integration\Factory\CartFactory;
-use Mollie\Tests\Integration\Factory\ProductFactory;
-
-class CarrierDeliveryPriceProviderTest extends BaseTestCase
-{
-    public function setUp(): void
-    {
-        /** @var ConfigurationAdapter $configuration */
-        $configuration = $this->getService(ConfigurationAdapter::class);
-
-        $this->subscriptionOrderCarrierId = $configuration->get(Config::MOLLIE_SUBSCRIPTION_ORDER_CARRIER_ID);
-
-        parent::setUp();
-    }
-
-    public function tearDown(): void
-    {
-        /** @var ConfigurationAdapter $configuration */
-        $configuration = $this->getService(ConfigurationAdapter::class);
-
-        $configuration->updateValue(Config::MOLLIE_SUBSCRIPTION_ORDER_CARRIER_ID, $this->subscriptionOrderCarrierId);
-
-        parent::tearDown();
-    }
-
-    public function testItSuccessfullyProvidesCarrierDeliveryPrice(): void
-    {
-        $address = AddressFactory::create();
-        $carrier = CarrierFactory::create([
-            'price' => 999.00,
-        ]);
-        $cart = CartFactory::create([
-            'id_carrier' => $carrier->id,
-        ]);
-
-        /** @var ConfigurationAdapter $configuration */
-        $configuration = $this->getService(ConfigurationAdapter::class);
-
-        $configuration->updateValue(Config::MOLLIE_SUBSCRIPTION_ORDER_CARRIER_ID, $carrier->id);
-
-        $targetProduct = ProductFactory::create([
-            'quantity' => 10,
-        ]);
-        $product1 = ProductFactory::create([
-            'quantity' => 10,
-        ]);
-        $product2 = ProductFactory::create([
-            'quantity' => 10,
-        ]);
-
-        $cart->updateQty(2, $targetProduct->id);
-
-        $targetProductArray = $cart->getProducts()[0];
-
-        $cart->updateQty(2, $product1->id);
-        $cart->updateQty(3, $product2->id);
-
-        /** @var CarrierDeliveryPriceProvider $carrierDeliveryPriceProvider */
-        $carrierDeliveryPriceProvider = $this->getService(CarrierDeliveryPriceProvider::class);
-
-        $result = $carrierDeliveryPriceProvider->getPrice(
-            $address->id,
-            $cart->id,
-            $cart->id_customer,
-            $targetProductArray
-        );
-
-        $this->assertEquals(999.00, $result);
-
-        $this->removeFactories([
-            $carrier,
-            $address,
-            $cart,
-            $targetProduct,
-            $product1,
-            $product2,
-        ]);
-    }
-
-    public function testItUnsuccessfullyProvidesCarrierDeliveryPriceCarrierIsOutOfZone(): void
-    {
-        $address = AddressFactory::create();
-        $carrier = CarrierFactory::create([
-            'price' => 999.00,
-            'id_zones_to_delete' => [
-                $address::getZoneById($address->id),
-            ],
-        ]);
-        $cart = CartFactory::create([
-            'id_carrier' => $carrier->id,
-        ]);
-
-        /** @var ConfigurationAdapter $configuration */
-        $configuration = $this->getService(ConfigurationAdapter::class);
-
-        $configuration->updateValue(Config::MOLLIE_SUBSCRIPTION_ORDER_CARRIER_ID, $carrier->id);
-
-        $targetProduct = ProductFactory::create([
-            'quantity' => 10,
-        ]);
-        $product1 = ProductFactory::create([
-            'quantity' => 10,
-        ]);
-        $product2 = ProductFactory::create([
-            'quantity' => 10,
-        ]);
-
-        $cart->updateQty(2, $targetProduct->id);
-
-        $targetProductArray = $cart->getProducts()[0];
-
-        $cart->updateQty(2, $product1->id);
-        $cart->updateQty(3, $product2->id);
-
-        $this->expectException(CouldNotProvideCarrierDeliveryPrice::class);
-        $this->expectExceptionCode(ExceptionCode::ORDER_FAILED_TO_APPLY_SELECTED_CARRIER_FOR_SUBSCRIPTION_ORDER);
-
-        /** @var CarrierDeliveryPriceProvider $carrierDeliveryPriceProvider */
-        $carrierDeliveryPriceProvider = $this->getService(CarrierDeliveryPriceProvider::class);
-
-        $carrierDeliveryPriceProvider->getPrice(
-            $address->id,
-            $cart->id,
-            $cart->id_customer,
-            $targetProductArray
-        );
-
-        $this->removeFactories([
-            $carrier,
-            $address,
-            $cart,
-            $targetProduct,
-            $product1,
-            $product2,
-        ]);
-    }
-
-    /**
-     * @param \ObjectModel[] $objects
-     */
-    private function removeFactories(array $objects): void
-    {
-        foreach ($objects as $object) {
-            $object->delete();
-        }
-    }
-}