merge magento/2.3.6-develop into magento-borg/MC-32796

Author: magento-mts-svc

CHANGELOG.md

@@ -27,7 +27,7 @@ class Show extends Action implements HttpGetActionInterface
     /**
      * @inheritdoc
      */
-    const ADMIN_RESOURCE = 'Magento_Analytics::analytics_settings';
+    const ADMIN_RESOURCE = 'Magento_Analytics::advanced_reporting';
 
     /**
      * @param Context $context

app/code/Magento/Analytics/Controller/Adminhtml/Reports/Show.php

@@ -10,7 +10,6 @@
 
 /**
  * Writes reports in files in csv format
- * @inheritdoc
  */
 class ReportWriter implements ReportWriterInterface
 {
@@ -54,7 +53,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function write(WriteInterface $directory, $path)
     {
@@ -81,7 +80,7 @@ public function write(WriteInterface $directory, $path)
                     $headers = array_keys($row);
                     $stream->writeCsv($headers);
                 }
-                $stream->writeCsv($row);
+                $stream->writeCsv($this->prepareRow($row));
             }
             $stream->unlock();
             $stream->close();
@@ -98,4 +97,18 @@ public function write(WriteInterface $directory, $path)
 
         return true;
     }
+
+    /**
+     * Replace wrong symbols in row
+     *
+     * @param array $row
+     * @return array
+     */
+    private function prepareRow(array $row): array
+    {
+        $row = preg_replace('/(?<!\\\\)"/', '\\"', $row);
+        $row = preg_replace('/[\\\\]+/', '\\', $row);
+
+        return $row;
+    }
 }

app/code/Magento/Analytics/Model/ReportWriter.php

@@ -3,38 +3,43 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Analytics\Test\Unit\Model;
 
 use Magento\Analytics\Model\ConfigInterface;
 use Magento\Analytics\Model\ProviderFactory;
 use Magento\Analytics\Model\ReportWriter;
 use Magento\Analytics\ReportXml\DB\ReportValidator;
 use Magento\Analytics\ReportXml\ReportProvider;
-use Magento\Framework\Filesystem\Directory\WriteInterface;
+use Magento\Framework\Filesystem\Directory\WriteInterface as DirectoryWriteInterface;
+use Magento\Framework\Filesystem\File\WriteInterface as FileWriteInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class ReportWriterTest extends \PHPUnit\Framework\TestCase
+class ReportWriterTest extends TestCase
 {
     /**
-     * @var ConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var ConfigInterface|MockObject
      */
     private $configInterfaceMock;
 
     /**
-     * @var ReportValidator|\PHPUnit_Framework_MockObject_MockObject
+     * @var ReportValidator|MockObject
      */
     private $reportValidatorMock;
 
     /**
-     * @var ProviderFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var ProviderFactory|MockObject
      */
     private $providerFactoryMock;
 
     /**
-     * @var ReportProvider|\PHPUnit_Framework_MockObject_MockObject
+     * @var ReportProvider|MockObject
      */
     private $reportProviderMock;
 
@@ -44,7 +49,7 @@ class ReportWriterTest extends \PHPUnit\Framework\TestCase
     private $objectManagerHelper;
 
     /**
-     * @var WriteInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var DirectoryWriteInterface|MockObject
      */
     private $directoryMock;
 
@@ -80,7 +85,7 @@ protected function setUp()
             ->disableOriginalConstructor()->getMock();
         $this->reportProviderMock = $this->getMockBuilder(ReportProvider::class)
             ->disableOriginalConstructor()->getMock();
-        $this->directoryMock = $this->getMockBuilder(WriteInterface::class)->getMockForAbstractClass();
+        $this->directoryMock = $this->getMockBuilder(DirectoryWriteInterface::class)->getMockForAbstractClass();
         $this->objectManagerHelper = new ObjectManagerHelper($this);
 
         $this->reportWriter = $this->objectManagerHelper->getObject(
@@ -95,16 +100,15 @@ protected function setUp()
 
     /**
      * @param array $configData
+     * @param array $fileData
+     * @param array $expectedFileData
      * @return void
      *
      * @dataProvider configDataProvider
      */
-    public function testWrite(array $configData)
+    public function testWrite(array $configData, array $fileData, array $expectedFileData)
     {
         $errors = [];
-        $fileData = [
-            ['number' => 1, 'type' => 'Shoes Usual']
-        ];
         $this->configInterfaceMock
             ->expects($this->once())
             ->method('get')
@@ -123,7 +127,7 @@ public function testWrite(array $configData)
             ->with($parameterName ?: null)
             ->willReturn($fileData);
         $errorStreamMock = $this->getMockBuilder(
-            \Magento\Framework\Filesystem\File\WriteInterface::class
+            FileWriteInterface::class
         )->getMockForAbstractClass();
         $errorStreamMock
             ->expects($this->once())
@@ -133,8 +137,8 @@ public function testWrite(array $configData)
             ->expects($this->exactly(2))
             ->method('writeCsv')
             ->withConsecutive(
-                [array_keys($fileData[0])],
-                [$fileData[0]]
+                [array_keys($expectedFileData[0])],
+                [$expectedFileData[0]]
             );
         $errorStreamMock->expects($this->once())->method('unlock');
         $errorStreamMock->expects($this->once())->method('close');
@@ -166,7 +170,7 @@ public function testWriteErrorFile($configData)
         $errors = ['orders', 'SQL Error: test'];
         $this->configInterfaceMock->expects($this->once())->method('get')->willReturn([$configData]);
         $errorStreamMock = $this->getMockBuilder(
-            \Magento\Framework\Filesystem\File\WriteInterface::class
+            FileWriteInterface::class
         )->getMockForAbstractClass();
         $errorStreamMock->expects($this->once())->method('lock');
         $errorStreamMock->expects($this->once())->method('writeCsv')->with($errors);
@@ -196,7 +200,7 @@ public function configDataProvider()
     {
         return [
             'reportProvider' => [
-                [
+                'configData' => [
                     'providers' => [
                         [
                             'name' => $this->providerName,
@@ -206,6 +210,12 @@ public function configDataProvider()
                             ],
                         ]
                     ]
+                ],
+                'fileData' => [
+                    ['number' => 1, 'type' => 'Shoes\"" Usual\\\\"']
+                ],
+                'expectedFileData' => [
+                    ['number' => 1, 'type' => 'Shoes\"\" Usual\\"']
                 ]
             ],
         ];

app/code/Magento/Analytics/Test/Unit/Model/ReportWriterTest.php

@@ -8,16 +8,17 @@
 
 namespace Magento\AsynchronousOperations\Model;
 
-use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Framework\EntityManager\EntityManager;
+use Magento\AsynchronousOperations\Api\BulkStatusInterface;
+use Magento\AsynchronousOperations\Api\Data\BulkOperationsStatusInterface;
 use Magento\AsynchronousOperations\Api\Data\BulkOperationsStatusInterfaceFactory as BulkStatusShortFactory;
+use Magento\AsynchronousOperations\Api\Data\DetailedBulkOperationsStatusInterface;
 use Magento\AsynchronousOperations\Api\Data\DetailedBulkOperationsStatusInterfaceFactory as BulkStatusDetailedFactory;
-use Magento\AsynchronousOperations\Api\Data\OperationDetailsInterfaceFactory;
-use Magento\AsynchronousOperations\Api\BulkStatusInterface;
-use Magento\AsynchronousOperations\Model\ResourceModel\Operation\CollectionFactory;
+use Magento\AsynchronousOperations\Model\ResourceModel\Operation\CollectionFactory as OperationCollectionFactory;
+use Magento\Framework\EntityManager\EntityManager;
+use Magento\Framework\Exception\NoSuchEntityException;
 
 /**
- * Class BulkStatus
+ * Process bulk operations status.
  */
 class BulkOperationsStatus implements BulkStatusInterface
 {
@@ -42,28 +43,26 @@ class BulkOperationsStatus implements BulkStatusInterface
     private $bulkStatus;
 
     /**
-     * @var CollectionFactory
+     * @var OperationCollectionFactory
      */
     private $operationCollectionFactory;
 
     /**
-     * Init dependencies.
-     *
      * @param BulkStatus $bulkStatus
-     * @param CollectionFactory $operationCollection
+     * @param OperationCollectionFactory $operationCollection
      * @param BulkStatusDetailedFactory $bulkDetailedFactory
      * @param BulkStatusShortFactory $bulkShortFactory
-     * @param \Magento\Framework\EntityManager\EntityManager $entityManager
+     * @param EntityManager $entityManager
      */
     public function __construct(
         BulkStatus $bulkStatus,
-        CollectionFactory $operationCollection,
+        OperationCollectionFactory $operationCollection,
         BulkStatusDetailedFactory $bulkDetailedFactory,
         BulkStatusShortFactory $bulkShortFactory,
         EntityManager $entityManager
     ) {
-        $this->operationCollectionFactory = $operationCollection;
         $this->bulkStatus = $bulkStatus;
+        $this->operationCollectionFactory = $operationCollection;
         $this->bulkDetailedFactory = $bulkDetailedFactory;
         $this->bulkShortFactory = $bulkShortFactory;
         $this->entityManager = $entityManager;
@@ -82,7 +81,10 @@ public function getFailedOperationsByBulkId($bulkUuid, $failureType = null)
      */
     public function getOperationsCountByBulkIdAndStatus($bulkUuid, $status)
     {
-        return $this->bulkStatus->getOperationsCountByBulkIdAndStatus($bulkUuid, $status);
+        return $this->operationCollectionFactory->create()
+            ->addFieldToFilter('bulk_uuid', $bulkUuid)
+            ->addFieldToFilter('status', $status)
+            ->getSize();
     }
 
     /**
@@ -108,7 +110,7 @@ public function getBulkDetailedStatus($bulkUuid)
     {
         $bulkSummary = $this->bulkDetailedFactory->create();
 
-        /** @var \Magento\AsynchronousOperations\Api\Data\DetailedBulkOperationsStatusInterface $bulk */
+        /** @var DetailedBulkOperationsStatusInterface $bulk */
         $bulk = $this->entityManager->load($bulkSummary, $bulkUuid);
 
         if ($bulk->getBulkId() === null) {
@@ -119,7 +121,9 @@ public function getBulkDetailedStatus($bulkUuid)
                 )
             );
         }
-        $operations = $this->operationCollectionFactory->create()->addFieldToFilter('bulk_uuid', $bulkUuid)->getItems();
+        $operations = $this->operationCollectionFactory->create()
+            ->addFieldToFilter('bulk_uuid', $bulkUuid)
+            ->getItems();
         $bulk->setOperationsList($operations);
 
         return $bulk;
@@ -132,7 +136,7 @@ public function getBulkShortStatus($bulkUuid)
     {
         $bulkSummary = $this->bulkShortFactory->create();
 
-        /** @var \Magento\AsynchronousOperations\Api\Data\BulkOperationsStatusInterface $bulk */
+        /** @var BulkOperationsStatusInterface $bulk */
         $bulk = $this->entityManager->load($bulkSummary, $bulkUuid);
         if ($bulk->getBulkId() === null) {
             throw new NoSuchEntityException(
@@ -142,7 +146,9 @@ public function getBulkShortStatus($bulkUuid)
                 )
             );
         }
-        $operations = $this->operationCollectionFactory->create()->addFieldToFilter('bulk_uuid', $bulkUuid)->getItems();
+        $operations = $this->operationCollectionFactory->create()
+            ->addFieldToFilter('bulk_uuid', $bulkUuid)
+            ->getItems();
         $bulk->setOperationsList($operations);
 
         return $bulk;

app/code/Magento/AsynchronousOperations/Model/BulkOperationsStatus.php

@@ -6,24 +6,28 @@
 
 namespace Magento\AsynchronousOperations\Model;
 
-use Magento\AsynchronousOperations\Api\Data\OperationInterface;
 use Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface;
-use Magento\Framework\App\ResourceConnection;
+use Magento\AsynchronousOperations\Api\Data\BulkSummaryInterfaceFactory;
+use Magento\AsynchronousOperations\Api\Data\OperationInterface;
+use Magento\AsynchronousOperations\Api\Data\OperationInterfaceFactory;
 use Magento\AsynchronousOperations\Model\BulkStatus\CalculatedStatusSql;
+use Magento\AsynchronousOperations\Model\ResourceModel\Operation\Collection as OperationCollection;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Bulk\BulkStatusInterface;
 use Magento\Framework\EntityManager\MetadataPool;
 
 /**
- * Class BulkStatus
+ * Process bulk operations status.
  */
-class BulkStatus implements \Magento\Framework\Bulk\BulkStatusInterface
+class BulkStatus implements BulkStatusInterface
 {
     /**
-     * @var \Magento\AsynchronousOperations\Api\Data\BulkSummaryInterfaceFactory
+     * @var BulkSummaryInterfaceFactory
      */
     private $bulkCollectionFactory;
 
     /**
-     * @var \Magento\AsynchronousOperations\Api\Data\OperationInterfaceFactory
+     * @var OperationInterfaceFactory
      */
     private $operationCollectionFactory;
 
@@ -43,22 +47,21 @@ class BulkStatus implements \Magento\Framework\Bulk\BulkStatusInterface
     private $metadataPool;
 
     /**
-     * BulkStatus constructor.
      * @param ResourceModel\Bulk\CollectionFactory $bulkCollection
      * @param ResourceModel\Operation\CollectionFactory $operationCollection
      * @param ResourceConnection $resourceConnection
      * @param CalculatedStatusSql $calculatedStatusSql
      * @param MetadataPool $metadataPool
      */
     public function __construct(
-        \Magento\AsynchronousOperations\Model\ResourceModel\Bulk\CollectionFactory $bulkCollection,
-        \Magento\AsynchronousOperations\Model\ResourceModel\Operation\CollectionFactory $operationCollection,
+        ResourceModel\Bulk\CollectionFactory $bulkCollection,
+        ResourceModel\Operation\CollectionFactory $operationCollection,
         ResourceConnection $resourceConnection,
         CalculatedStatusSql $calculatedStatusSql,
         MetadataPool $metadataPool
     ) {
-        $this->operationCollectionFactory = $operationCollection;
         $this->bulkCollectionFactory = $bulkCollection;
+        $this->operationCollectionFactory = $operationCollection;
         $this->resourceConnection = $resourceConnection;
         $this->calculatedStatusSql = $calculatedStatusSql;
         $this->metadataPool = $metadataPool;
@@ -87,9 +90,22 @@ public function getFailedOperationsByBulkId($bulkUuid, $failureType = null)
      */
     public function getOperationsCountByBulkIdAndStatus($bulkUuid, $status)
     {
-        /** @var \Magento\AsynchronousOperations\Model\ResourceModel\Operation\Collection $collection */
-        $collection = $this->operationCollectionFactory->create();
-        return $collection->addFieldToFilter('bulk_uuid', $bulkUuid)
+        /** @var OperationCollection $operationCollection */
+        $operationCollection = $this->operationCollectionFactory->create();
+        if ($status === OperationInterface::STATUS_TYPE_OPEN) {
+            $allProcessedOperationsQty = $operationCollection
+                ->addFieldToFilter('bulk_uuid', $bulkUuid)
+                ->getSize();
+
+            if (empty($allProcessedOperationsQty)) {
+                return $this->getOperationCount($bulkUuid);
+            }
+
+            $operationCollection->clear();
+        }
+
+        return $operationCollection
+            ->addFieldToFilter('bulk_uuid', $bulkUuid)
             ->addFieldToFilter('status', $status)
             ->getSize();
     }