ACP2E-649: Invalid data is exported when we apply created at filter for customer export

Author: dhorytskyi

app/code/Magento/ImportExport/Api/Data/ExtendedExportInfoInterface.php

@@ -17,30 +17,15 @@ interface ExtendedExportInfoInterface extends ExportInfoInterface
     /**
      * Returns skipped attributes
      *
-     * @return string[]|null
+     * @return mixed
      */
-    public function getSkipAttr(): ?array;
+    public function getSkipAttr();
 
     /**
      * Set skipped attributes
      *
-     * @param string[] $skipAttr
-     * @return void
+     * @param string $skipAttr
+     * @return mixed
      */
-    public function setSkipAttr(array $skipAttr): void;
-
-    /**
-     * Returns admin locale
-     *
-     * @return string|null
-     */
-    public function getLocale(): ?string;
-
-    /**
-     * Set admin locale
-     *
-     * @param string $locale
-     * @return void
-     */
-    public function setLocale(string $locale): void;
+    public function setSkipAttr($skipAttr);
 }

app/code/Magento/ImportExport/Api/Data/LocalizedExportInfoInterface.php

@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ImportExport\Api\Data;
+
+/**
+ * Localized export interface for correct parsing values (like date) provided in admin ui locale.
+ */
+interface LocalizedExportInfoInterface extends ExtendedExportInfoInterface
+{
+    /**
+     * Returns admin locale
+     *
+     * @return string|null
+     */
+    public function getLocale(): ?string;
+
+    /**
+     * Set admin locale
+     *
+     * @param string $locale
+     * @return void
+     */
+    public function setLocale(string $locale): void;
+}

app/code/Magento/ImportExport/Model/Export/Consumer.php

@@ -12,7 +12,7 @@
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Locale\ResolverInterface;
-use Magento\ImportExport\Api\Data\ExtendedExportInfoInterface;
+use Magento\ImportExport\Api\Data\LocalizedExportInfoInterface;
 use Magento\ImportExport\Api\ExportManagementInterface;
 use Magento\Framework\Notification\NotifierInterface;
 
@@ -71,10 +71,10 @@ public function __construct(
     /**
      * Consumer logic.
      *
-     * @param ExtendedExportInfoInterface $exportInfo
+     * @param LocalizedExportInfoInterface $exportInfo
      * @return void
      */
-    public function process(ExtendedExportInfoInterface $exportInfo)
+    public function process(LocalizedExportInfoInterface $exportInfo)
     {
         $currentLocale = $this->localeResolver->getLocale();
         if ($exportInfo->getLocale()) {

app/code/Magento/ImportExport/Model/Export/Entity/ExportInfo.php

@@ -7,12 +7,12 @@
 
 namespace Magento\ImportExport\Model\Export\Entity;
 
-use Magento\ImportExport\Api\Data\ExtendedExportInfoInterface;
+use Magento\ImportExport\Api\Data\LocalizedExportInfoInterface;
 
 /**
  * Class ExportInfo implementation for ExportInfoInterface.
  */
-class ExportInfo implements ExtendedExportInfoInterface
+class ExportInfo implements LocalizedExportInfoInterface
 {
     /**
      * @var string

app/code/Magento/ImportExport/Test/Unit/Model/Export/ConsumerTest.php

@@ -12,7 +12,7 @@
 use Magento\Framework\Filesystem\Directory\WriteInterface;
 use Magento\Framework\Locale\ResolverInterface;
 use Magento\Framework\Notification\NotifierInterface;
-use Magento\ImportExport\Api\Data\ExtendedExportInfoInterface;
+use Magento\ImportExport\Api\Data\LocalizedExportInfoInterface;
 use Magento\ImportExport\Api\ExportManagementInterface;
 use Magento\ImportExport\Model\Export\Consumer;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -70,7 +70,7 @@ protected function setUp(): void
     public function testProcess()
     {
         $adminLocale = 'de_DE';
-        $exportInfoMock = $this->createMock(ExtendedExportInfoInterface::class);
+        $exportInfoMock = $this->createMock(LocalizedExportInfoInterface::class);
         $exportInfoMock->expects($this->atLeastOnce())
             ->method('getLocale')
             ->willReturn($adminLocale);

app/code/Magento/ImportExport/etc/communication.xml

@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Communication/etc/communication.xsd">
-    <topic name="import_export.export" request="Magento\ImportExport\Api\Data\ExtendedExportInfoInterface">
+    <topic name="import_export.export" request="Magento\ImportExport\Api\Data\LocalizedExportInfoInterface">
         <handler name="exportProcessor" type="Magento\ImportExport\Model\Export\Consumer" method="process" />
     </topic>
 </config>

app/code/Magento/ImportExport/etc/di.xml

@@ -11,7 +11,7 @@
     <preference for="Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface" type="Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregator" />
     <preference for="Magento\ImportExport\Model\Report\ReportProcessorInterface" type="Magento\ImportExport\Model\Report\Csv" />
     <preference for="Magento\ImportExport\Api\Data\ExportInfoInterface" type="Magento\ImportExport\Model\Export\Entity\ExportInfo" />
-    <preference for="Magento\ImportExport\Api\Data\ExtendedExportInfoInterface" type="Magento\ImportExport\Model\Export\Entity\ExportInfo" />
+    <preference for="Magento\ImportExport\Api\Data\LocalizedExportInfoInterface" type="Magento\ImportExport\Model\Export\Entity\ExportInfo" />
     <preference for="Magento\ImportExport\Api\ExportManagementInterface" type="Magento\ImportExport\Model\Export\ExportManagement" />
     <type name="Magento\Framework\Module\Setup\Migration">
         <arguments>