Merge remote-tracking branch 'l3/ACP2E-2495' into Tier4-PR-Delivery-11-18-23

veloraven · veloraven · commit d7690e866207 · 2023-11-27T11:01:44.000-06:00
diff --git a/app/code/Magento/SalesRule/Model/Coupon/Quote/UpdateCouponUsages.php b/app/code/Magento/SalesRule/Model/Coupon/Quote/UpdateCouponUsages.php
@@ -8,6 +8,7 @@
 namespace Magento\SalesRule\Model\Coupon\Quote;
 
 use Magento\Quote\Api\Data\CartInterface;
+use Magento\SalesRule\Model\Coupon\Usage\Processor as CouponUsageProcessor;
 use Magento\SalesRule\Model\Coupon\Usage\UpdateInfo;
 use Magento\SalesRule\Model\Coupon\Usage\UpdateInfoFactory;
 use Magento\SalesRule\Model\Service\CouponUsagePublisher;
@@ -27,16 +28,24 @@ class UpdateCouponUsages
      */
     private $couponUsagePublisher;
 
+    /**
+     * @var CouponUsageProcessor
+     */
+    private $processor;
+
     /**
      * @param CouponUsagePublisher $couponUsagePublisher
      * @param UpdateInfoFactory $updateInfoFactory
+     * @param CouponUsageProcessor $processor
      */
     public function __construct(
         CouponUsagePublisher $couponUsagePublisher,
-        UpdateInfoFactory $updateInfoFactory
+        UpdateInfoFactory $updateInfoFactory,
+        CouponUsageProcessor $processor
     ) {
         $this->couponUsagePublisher = $couponUsagePublisher;
         $this->updateInfoFactory = $updateInfoFactory;
+        $this->processor = $processor;
     }
 
     /**
@@ -54,11 +63,14 @@ public function execute(CartInterface $quote, bool $increment): void
 
         /** @var UpdateInfo $updateInfo */
         $updateInfo = $this->updateInfoFactory->create();
-        $updateInfo->setAppliedRuleIds(explode(',', $quote->getAppliedRuleIds()));
+        $appliedRuleIds = explode(',', $quote->getAppliedRuleIds());
+        $appliedRuleIds = array_filter(array_map('intval', array_unique($appliedRuleIds)));
+        $updateInfo->setAppliedRuleIds($appliedRuleIds);
         $updateInfo->setCouponCode((string)$quote->getCouponCode());
         $updateInfo->setCustomerId((int)$quote->getCustomerId());
         $updateInfo->setIsIncrement($increment);
 
         $this->couponUsagePublisher->publish($updateInfo);
+        $this->processor->updateCustomerRulesUsages($updateInfo);
     }
 }
diff --git a/app/code/Magento/SalesRule/Model/Coupon/UpdateCouponUsages.php b/app/code/Magento/SalesRule/Model/Coupon/UpdateCouponUsages.php
@@ -55,7 +55,9 @@ public function execute(OrderInterface $subject, bool $increment): OrderInterfac
 
         /** @var UpdateInfo $updateInfo */
         $updateInfo = $this->updateInfoFactory->create();
-        $updateInfo->setAppliedRuleIds(explode(',', $subject->getAppliedRuleIds()));
+        $appliedRuleIds = explode(',', $subject->getAppliedRuleIds());
+        $appliedRuleIds = array_filter(array_map('intval', array_unique($appliedRuleIds)));
+        $updateInfo->setAppliedRuleIds($appliedRuleIds);
         $updateInfo->setCouponCode((string)$subject->getCouponCode());
         $updateInfo->setCustomerId((int)$subject->getCustomerId());
         $updateInfo->setIsIncrement($increment);
diff --git a/app/code/Magento/SalesRule/Model/Coupon/Usage/Processor.php b/app/code/Magento/SalesRule/Model/Coupon/Usage/Processor.php
@@ -8,6 +8,7 @@
 namespace Magento\SalesRule\Model\Coupon\Usage;
 
 use Magento\SalesRule\Model\Coupon;
+use Magento\SalesRule\Model\CouponFactory;
 use Magento\SalesRule\Model\ResourceModel\Coupon\Usage;
 use Magento\SalesRule\Model\Rule\CustomerFactory;
 use Magento\SalesRule\Model\RuleFactory;
@@ -28,9 +29,9 @@ class Processor
     private $ruleCustomerFactory;
 
     /**
-     * @var Coupon
+     * @var CouponFactory
      */
-    private $coupon;
+    private $couponFactory;
 
     /**
      * @var Usage
@@ -40,18 +41,18 @@ class Processor
     /**
      * @param RuleFactory $ruleFactory
      * @param CustomerFactory $ruleCustomerFactory
-     * @param Coupon $coupon
+     * @param CouponFactory $couponFactory
      * @param Usage $couponUsage
      */
     public function __construct(
         RuleFactory $ruleFactory,
         CustomerFactory $ruleCustomerFactory,
-        Coupon $coupon,
+        CouponFactory $couponFactory,
         Usage $couponUsage
     ) {
         $this->ruleFactory = $ruleFactory;
         $this->ruleCustomerFactory = $ruleCustomerFactory;
-        $this->coupon = $coupon;
+        $this->couponFactory = $couponFactory;
         $this->couponUsage = $couponUsage;
     }
 
@@ -66,59 +67,46 @@ public function process(UpdateInfo $updateInfo): void
             return;
         }
 
-        if (!empty($updateInfo->getCouponCode())) {
-            $this->updateCouponUsages($updateInfo);
-        }
-        $isIncrement = $updateInfo->isIncrement();
-        $customerId = $updateInfo->getCustomerId();
-        // use each rule (and apply to customer, if applicable)
-        foreach (array_unique($updateInfo->getAppliedRuleIds()) as $ruleId) {
-            if (!(int)$ruleId) {
-                continue;
-            }
-            $this->updateRuleUsages($isIncrement, (int)$ruleId);
-            if ($customerId) {
-                $this->updateCustomerRuleUsages($isIncrement, (int)$ruleId, $customerId);
-            }
-        }
+        $this->updateCouponUsages($updateInfo);
+        $this->updateRuleUsages($updateInfo);
+        $this->updateCustomerRulesUsages($updateInfo);
     }
 
     /**
      * Update the number of coupon usages
      *
      * @param UpdateInfo $updateInfo
      */
-    private function updateCouponUsages(UpdateInfo $updateInfo): void
+    public function updateCouponUsages(UpdateInfo $updateInfo): void
     {
+        $coupon = $this->retrieveCoupon($updateInfo);
+        if (!$coupon) {
+            return;
+        }
+
         $isIncrement = $updateInfo->isIncrement();
-        $this->coupon->load($updateInfo->getCouponCode(), 'code');
-        if ($this->coupon->getId()) {
-            if (!$updateInfo->isCouponAlreadyApplied()
-                && ($updateInfo->isIncrement() || $this->coupon->getTimesUsed() > 0)) {
-                $this->coupon->setTimesUsed($this->coupon->getTimesUsed() + ($isIncrement ? 1 : -1));
-                $this->coupon->save();
-            }
-            if ($updateInfo->getCustomerId()) {
-                $this->couponUsage->updateCustomerCouponTimesUsed(
-                    $updateInfo->getCustomerId(),
-                    $this->coupon->getId(),
-                    $isIncrement
-                );
-            }
+        if (!$updateInfo->isCouponAlreadyApplied()
+            && ($updateInfo->isIncrement() || $coupon->getTimesUsed() > 0)) {
+            $coupon->setTimesUsed($coupon->getTimesUsed() + ($isIncrement ? 1 : -1));
+            $coupon->save();
         }
     }
 
     /**
      * Update the number of rule usages
      *
-     * @param bool $isIncrement
-     * @param int $ruleId
+     * @param UpdateInfo $updateInfo
      */
-    private function updateRuleUsages(bool $isIncrement, int $ruleId): void
+    public function updateRuleUsages(UpdateInfo $updateInfo): void
     {
-        $rule = $this->ruleFactory->create();
-        $rule->load($ruleId);
-        if ($rule->getId()) {
+        $isIncrement = $updateInfo->isIncrement();
+        foreach ($updateInfo->getAppliedRuleIds() as $ruleId) {
+            $rule = $this->ruleFactory->create();
+            $rule->load($ruleId);
+            if (!$rule->getId()) {
+                continue;
+            }
+
             $rule->loadCouponCode();
             if ($isIncrement || $rule->getTimesUsed() > 0) {
                 $rule->setTimesUsed($rule->getTimesUsed() + ($isIncrement ? 1 : -1));
@@ -127,6 +115,29 @@ private function updateRuleUsages(bool $isIncrement, int $ruleId): void
         }
     }
 
+    /**
+     * Update the number of rules usages per customer
+     *
+     * @param UpdateInfo $updateInfo
+     */
+    public function updateCustomerRulesUsages(UpdateInfo $updateInfo): void
+    {
+        $customerId = $updateInfo->getCustomerId();
+        if (!$customerId) {
+            return;
+        }
+
+        $isIncrement = $updateInfo->isIncrement();
+        foreach ($updateInfo->getAppliedRuleIds() as $ruleId) {
+            $this->updateCustomerRuleUsages($isIncrement, $ruleId, $customerId);
+        }
+
+        $coupon = $this->retrieveCoupon($updateInfo);
+        if ($coupon) {
+            $this->couponUsage->updateCustomerCouponTimesUsed($customerId, $coupon->getId(), $isIncrement);
+        }
+    }
+
     /**
      * Update the number of rule usages per customer
      *
@@ -151,4 +162,22 @@ private function updateCustomerRuleUsages(bool $isIncrement, int $ruleId, int $c
             $ruleCustomer->save();
         }
     }
+
+    /**
+     * Retrieve coupon from update info
+     *
+     * @param UpdateInfo $updateInfo
+     * @return Coupon|null
+     */
+    private function retrieveCoupon(UpdateInfo $updateInfo): ?Coupon
+    {
+        if (!$updateInfo->getCouponCode()) {
+            return null;
+        }
+
+        $coupon = $this->couponFactory->create();
+        $coupon->loadByCode($updateInfo->getCouponCode());
+
+        return $coupon->getId() ? $coupon : null;
+    }
 }
diff --git a/app/code/Magento/SalesRule/Model/CouponUsageConsumer.php b/app/code/Magento/SalesRule/Model/CouponUsageConsumer.php
@@ -80,7 +80,8 @@ public function process(OperationInterface $operation): void
             $data = $this->serializer->unserialize($serializedData);
             $updateInfo = $this->updateInfoFactory->create();
             $updateInfo->setData($data);
-            $this->processor->process($updateInfo);
+            $this->processor->updateCouponUsages($updateInfo);
+            $this->processor->updateRuleUsages($updateInfo);
         } catch (NotFoundException $e) {
             $this->logger->critical($e->getMessage());
             $status = OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED;
diff --git a/app/code/Magento/SalesRule/Test/Unit/Model/Coupon/Usage/ProcessorTest.php b/app/code/Magento/SalesRule/Test/Unit/Model/Coupon/Usage/ProcessorTest.php
@@ -7,15 +7,16 @@
 
 namespace Magento\SalesRule\Test\Unit\Model\Coupon\Usage;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\SalesRule\Model\Coupon;
+use Magento\SalesRule\Model\CouponFactory;
 use Magento\SalesRule\Model\Coupon\Usage\Processor;
 use Magento\SalesRule\Model\Coupon\Usage\UpdateInfo;
 use Magento\SalesRule\Model\ResourceModel\Coupon\Usage;
 use Magento\SalesRule\Model\Rule;
 use Magento\SalesRule\Model\Rule\Customer;
 use Magento\SalesRule\Model\Rule\CustomerFactory;
 use Magento\SalesRule\Model\RuleFactory;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 class ProcessorTest extends TestCase
@@ -26,27 +27,27 @@ class ProcessorTest extends TestCase
     private $processor;
 
     /**
-     * @var RuleFactory
+     * @var RuleFactory|MockObject
      */
     private $ruleFactoryMock;
 
     /**
-     * @var CustomerFactory
+     * @var CustomerFactory|MockObject
      */
     private $ruleCustomerFactoryMock;
 
     /**
-     * @var Coupon
+     * @var CouponFactory|MockObject
      */
-    private $couponMock;
+    private $couponFactoryMock;
 
     /**
-     * @var Usage
+     * @var Usage|MockObject
      */
     private $couponUsageMock;
 
     /**
-     * @var UpdateInfo
+     * @var UpdateInfo|MockObject
      */
     private $updateInfoMock;
 
@@ -55,34 +56,17 @@ class ProcessorTest extends TestCase
      */
     protected function setUp(): void
     {
-        $this->ruleFactoryMock = $this->getMockBuilder(RuleFactory::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->ruleCustomerFactoryMock = $this->getMockBuilder(CustomerFactory::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->couponMock = $this->getMockBuilder(Coupon::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->couponUsageMock = $this->getMockBuilder(Usage::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->updateInfoMock = $this->getMockBuilder(UpdateInfo::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->processor = (new ObjectManager($this))->getObject(
-            Processor::class,
-            [
-                'ruleFactory' => $this->ruleFactoryMock,
-                'ruleCustomerFactory' => $this->ruleCustomerFactoryMock,
-                'coupon' => $this->couponMock,
-                'couponUsage' => $this->couponUsageMock
-            ]
+        $this->ruleFactoryMock = $this->createMock(RuleFactory::class);
+        $this->ruleCustomerFactoryMock = $this->createMock(CustomerFactory::class);
+        $this->couponFactoryMock = $this->createMock(CouponFactory::class);
+        $this->couponUsageMock = $this->createMock(Usage::class);
+        $this->updateInfoMock = $this->createMock(UpdateInfo::class);
+
+        $this->processor = new Processor(
+            $this->ruleFactoryMock,
+            $this->ruleCustomerFactoryMock,
+            $this->couponFactoryMock,
+            $this->couponUsageMock
         );
     }
 
@@ -91,7 +75,6 @@ protected function setUp(): void
      *
      * @param $isIncrement
      * @param $timesUsed
-     *
      * @return void
      * @dataProvider dataProvider
      */
@@ -104,18 +87,19 @@ public function testProcess($isIncrement, $timesUsed): void
         $setTimesUsed = $timesUsed + ($isIncrement ? 1 : -1);
         $ruleCustomerId = 13;
 
-        $this->updateInfoMock->expects($this->exactly(2))->method('getAppliedRuleIds')->willReturn([$couponId]);
-        $this->updateInfoMock->expects($this->exactly(2))->method('getCouponCode')->willReturn($couponCode);
-        $this->updateInfoMock->expects($this->exactly(3))->method('isIncrement')->willReturn($isIncrement);
+        $this->updateInfoMock->expects($this->atLeastOnce())->method('getAppliedRuleIds')->willReturn([$couponId]);
+        $this->updateInfoMock->expects($this->atLeastOnce())->method('getCouponCode')->willReturn($couponCode);
+        $this->updateInfoMock->expects($this->atLeastOnce())->method('isIncrement')->willReturn($isIncrement);
 
-        $this->couponMock->expects($this->once())->method('load')->with($couponCode, 'code')
-            ->willReturnSelf();
-        $this->couponMock->expects($this->exactly(2))->method('getId')->willReturn($couponId);
-        $this->couponMock->expects($this->atLeastOnce())->method('getTimesUsed')->willReturn($timesUsed);
-        $this->couponMock->expects($this->any())->method('setTimesUsed')->with($setTimesUsed)->willReturnSelf();
-        $this->couponMock->expects($this->any())->method('save')->willReturnSelf();
+        $couponMock = $this->createMock(Coupon::class);
+        $this->couponFactoryMock->expects($this->exactly(2))->method('create')->willReturn($couponMock);
+        $couponMock->expects($this->exactly(2))->method('loadByCode')->with($couponCode)->willReturnSelf();
+        $couponMock->expects($this->atLeastOnce())->method('getId')->willReturn($couponId);
+        $couponMock->expects($this->atLeastOnce())->method('getTimesUsed')->willReturn($timesUsed);
+        $couponMock->expects($this->any())->method('setTimesUsed')->with($setTimesUsed)->willReturnSelf();
+        $couponMock->expects($this->any())->method('save')->willReturnSelf();
 
-        $this->updateInfoMock->expects($this->exactly(3))->method('getCustomerId')->willReturn($customerId);
+        $this->updateInfoMock->expects($this->atLeastOnce())->method('getCustomerId')->willReturn($customerId);
 
         $this->couponUsageMock->expects($this->once())
             ->method('updateCustomerCouponTimesUsed')
diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/Model/Coupon/UpdateCouponUsagesTest.php b/dev/tests/integration/testsuite/Magento/SalesRule/Model/Coupon/UpdateCouponUsagesTest.php
