removed optional ignoreActive option

Author: Christian Braun

src/Repository/CustomerOptionValuePriceRepository.php

@@ -6,7 +6,6 @@
 
 use Brille24\SyliusCustomerOptionsPlugin\Entity\CustomerOptions\CustomerOptionValueInterface;
 use Brille24\SyliusCustomerOptionsPlugin\Entity\CustomerOptions\CustomerOptionValuePriceInterface;
-use DateTime;
 use Doctrine\ORM\NonUniqueResultException;
 use Sylius\Bundle\ResourceBundle\Doctrine\ORM\EntityRepository;
 use Sylius\Component\Channel\Model\ChannelInterface;
@@ -16,31 +15,25 @@
 class CustomerOptionValuePriceRepository extends EntityRepository implements CustomerOptionValuePriceRepositoryInterface
 {
     /**
-     * @throws NonUniqueResultException
-     *
      * @param ChannelInterface $channel
      * @param ProductInterface $product
      * @param CustomerOptionValueInterface $customerOptionValue
-     * @param bool $ignoreActive
+     *
+     * @throws NonUniqueResultException
      */
     public function getPriceForChannel(
         ChannelInterface $channel,
         ProductInterface $product,
-        CustomerOptionValueInterface $customerOptionValue,
-        bool $ignoreActive = false
+        CustomerOptionValueInterface $customerOptionValue
     ): ?CustomerOptionValuePriceInterface {
         $qb = $this->createQueryBuilder('price');
         $qb->where('price.channel = :channel');
         $qb->andWhere('price.customerOptionValue = :customerOptionValue');
 
-        if (!$ignoreActive) {
-            $qb->leftJoin('price.dateValid', 'dr');
-            $qb->andWhere('price.dateValid IS NULL OR (:now >= dr.start AND :now <= dr.end)');
-            $qb->setParameter('now', new DateTime());
-        }
-
         $qb->andWhere('(price.product IS NOT NULL AND price.product = :product) OR price.product IS NULL');
 
+        // If a product price overwrite exists the result could contain multiple entries. Therefore we order the
+        // overwritten price to the top to get it as the only result.
         $qb->orderBy('price.product', 'DESC');
         $qb->setMaxResults(1);
 
@@ -50,8 +43,6 @@ public function getPriceForChannel(
 
         $query = $qb->getQuery();
 
-        $sql = $query->getSQL();
-
         /** @var CustomerOptionValuePriceInterface|null $result */
         $result = $query->getOneOrNullResult();
         Assert::nullOrIsInstanceOf($result, CustomerOptionValuePriceInterface::class);

src/Repository/CustomerOptionValuePriceRepositoryInterface.php

@@ -15,7 +15,6 @@ interface CustomerOptionValuePriceRepositoryInterface extends RepositoryInterfac
     public function getPriceForChannel(
         ChannelInterface $channel,
         ProductInterface $product,
-        CustomerOptionValueInterface $customerOptionValue,
-        bool $ignoreActive = false
+        CustomerOptionValueInterface $customerOptionValue
     ): ?CustomerOptionValuePriceInterface;
 }

tests/PHPUnit/Factory/OrderItemOptionFactoryTest.php

@@ -14,6 +14,7 @@
 use Brille24\SyliusCustomerOptionsPlugin\Factory\OrderItemOptionFactory;
 use Brille24\SyliusCustomerOptionsPlugin\Factory\OrderItemOptionFactoryInterface;
 use Brille24\SyliusCustomerOptionsPlugin\Repository\CustomerOptionRepositoryInterface;
+use Brille24\SyliusCustomerOptionsPlugin\Repository\CustomerOptionValuePriceRepositoryInterface;
 use Brille24\SyliusCustomerOptionsPlugin\Services\CustomerOptionValueResolverInterface;
 use Doctrine\Common\Collections\ArrayCollection;
 use PHPUnit\Framework\TestCase;
@@ -64,7 +65,11 @@ function (CustomerOptionInterface $customerOption, $valueToMatch) {
 
         $baseFactory->method('createNew')->willReturn(self::createMock(OrderItemOptionInterface::class));
 
-        $this->orderItemOptionFactory = new OrderItemOptionFactory($baseFactory, $customerOptionRepo, $valueResolver);
+        $customerOptionValuePrice           = self::createMock(CustomerOptionValuePriceInterface::class);
+        $customerOptionValuePriceRepository = self::createMock(CustomerOptionValuePriceRepositoryInterface::class);
+        $customerOptionValuePriceRepository->method('getPriceForChannel')->willReturn($customerOptionValuePrice);
+
+        $this->orderItemOptionFactory = new OrderItemOptionFactory($baseFactory, $customerOptionRepo, $valueResolver, $customerOptionValuePriceRepository);
     }
 
     private function addCustomerOption(CustomerOptionInterface $customerOption)

tests/PHPUnit/Service/CustomerOptionValueRefresherTest.php

@@ -10,8 +10,10 @@
 use Brille24\SyliusCustomerOptionsPlugin\Entity\CustomerOptions\CustomerOptionValuePriceInterface;
 use Brille24\SyliusCustomerOptionsPlugin\Entity\OrderItemInterface as Brille24OrderItem;
 use Brille24\SyliusCustomerOptionsPlugin\Entity\OrderItemOptionInterface;
+use Brille24\SyliusCustomerOptionsPlugin\Repository\CustomerOptionValuePriceRepositoryInterface;
 use Brille24\SyliusCustomerOptionsPlugin\Services\CustomerOptionValueRefresher;
 use Doctrine\Common\Collections\ArrayCollection;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Sylius\Component\Core\Model\ChannelInterface;
 use Sylius\Component\Core\Model\OrderInterface;
@@ -32,15 +34,24 @@ class CustomerOptionValueRefresherTest extends TestCase
     /** @var int */
     private $priceUpdate;
 
-    /** @var ChannelInterface */
+    /** @var ChannelInterface|MockObject */
     private $channel;
 
     //<editor-fold desc="Helper function for setup">
+    /**
+     * @var CustomerOptionValuePriceRepositoryInterface|MockObject
+     */
+    private $customerOptionValuePriceRepository;
+
     public function setUp(): void
     {
         $this->channel = self::createMock(ChannelInterface::class);
 
-        $this->customerOptionValueRefresher = new CustomerOptionValueRefresher();
+        $this->customerOptionValuePriceRepository = $this->createMock(
+            CustomerOptionValuePriceRepositoryInterface::class
+        );
+
+        $this->customerOptionValueRefresher = new CustomerOptionValueRefresher($this->customerOptionValuePriceRepository);
     }
 
     private function createOrder(array $orderItems): OrderInterface
@@ -90,7 +101,7 @@ private function createCustomerOptionValue(array $config): CustomerOptionValueIn
         $customerOptionValue->method('getCode')->willReturn($config['code']);
         $customerOptionValue->method('getName')->willReturn($config['name'] ?? null);
 
-        $customerOptionValue->method('getPriceForChannel')->willReturnCallback(
+        $this->customerOptionValuePriceRepository->method('getPriceForChannel')->willReturnCallback(
             function (ChannelInterface $channel) use ($price) {
                 $customerOptionPrice = self::createMock(CustomerOptionValuePriceInterface::class);
                 $customerOptionPrice->method('getAmount')->willReturn($price);