Merge branch 'MC-39827' into 2.4-bugfixes-121520

Author: bubasuma

app/code/Magento/SalesRule/Model/ResourceModel/Report/Rule.php

@@ -90,8 +90,9 @@ public function aggregate($from = null, $to = null)
      */
     public function getUniqRulesNamesList()
     {
-        $connection = $this->getConnection();
-        $tableName = $this->getTable('salesrule_coupon_aggregated');
+        $resourceModel = $this->_createdatFactory->create();
+        $connection = $resourceModel->getConnection();
+        $tableName = $resourceModel->getMainTable();
         $select = $connection->select()->from(
             $tableName,
             new \Zend_Db_Expr('DISTINCT rule_name')

app/code/Magento/SalesRule/Test/Unit/Model/ResourceModel/Report/RuleTest.php

@@ -7,13 +7,13 @@
 
 namespace Magento\SalesRule\Test\Unit\Model\ResourceModel\Report;
 
-use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\Adapter\Pdo\Mysql;
 use Magento\Framework\DB\Select;
 use Magento\Framework\DB\Select\SelectRenderer;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Reports\Model\FlagFactory;
 use Magento\SalesRule\Model\ResourceModel\Report\Rule;
+use Magento\SalesRule\Model\ResourceModel\Report\Rule\Createdat;
 use Magento\SalesRule\Model\ResourceModel\Report\Rule\CreatedatFactory;
 use Magento\SalesRule\Model\ResourceModel\Report\Rule\UpdatedatFactory;
 use PHPUnit\Framework\TestCase;
@@ -84,14 +84,20 @@ function ($value) {
             [$this, 'fetchAllCallback']
         );
 
-        $resourceMock = $this->createMock(ResourceConnection::class);
-        $resourceMock->expects($this->any())->method('getConnection')->willReturn($connectionMock);
-        $resourceMock->expects($this->once())->method('getTableName')->willReturn(self::TABLE_NAME);
-
         $flagFactory = $this->createMock(FlagFactory::class);
-        $createdatFactoryMock = $this->createPartialMock(
+
+        $createdatResourceModel = $this->createConfiguredMock(
+            Createdat::class,
+            [
+                'getConnection' => $connectionMock,
+                'getMainTable' => self::TABLE_NAME,
+            ]
+        );
+        $createdatFactoryMock = $this->createConfiguredMock(
             CreatedatFactory::class,
-            ['create']
+            [
+                'create' => $createdatResourceModel
+            ]
         );
         $updatedatFactoryMock = $this->createPartialMock(
             UpdatedatFactory::class,
@@ -102,7 +108,6 @@ function ($value) {
         $model = $objectHelper->getObject(
             Rule::class,
             [
-                'resource' => $resourceMock,
                 'reportsFlagFactory' => $flagFactory,
                 'createdatFactory' => $createdatFactoryMock,
                 'updatedatFactory' => $updatedatFactoryMock

dev/tests/integration/testsuite/Magento/SalesRule/Model/ResourceModel/Report/RuleTest.php

@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\SalesRule\Model\ResourceModel\Report;
+
+use Magento\Sales\Model\Order;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test for salesrule report model
+ */
+class RuleTest extends TestCase
+{
+    /**
+     * @magentoDataFixture Magento/SalesRule/_files/order_with_coupon.php
+     */
+    public function testGetUniqRulesNamesList()
+    {
+        $ruleName = uniqid('cart_price_rule_');
+        $orderIncrementId = '100000001';
+        $objectManager = Bootstrap::getObjectManager();
+        /** @var Order $order */
+        $order = $objectManager->create(Order::class);
+        $order->loadByIncrementId($orderIncrementId)
+            ->setCouponRuleName($ruleName)
+            ->save();
+        /** @var Rule $reportResource */
+        $reportResource = $objectManager->create(Rule::class);
+        $reportResource->aggregate();
+        $this->assertContains($ruleName, $reportResource->getUniqRulesNamesList());
+    }
+}