Merge remote-tracking branch 'adobe-commerce-tier-4/ACP2E-2990' into Tier4-Kings-PR-05-17-2024

Author: glanujnehra

app/code/Magento/CustomerImportExport/Model/Export/Customer.php

@@ -21,21 +21,25 @@ class Customer extends \Magento\ImportExport\Model\Export\Entity\AbstractEav
      * Names that begins with underscore is not an attribute. This name convention is for
      * to avoid interference with same attribute name.
      */
-    const COLUMN_EMAIL = 'email';
+    public const COLUMN_EMAIL = 'email';
 
-    const COLUMN_WEBSITE = '_website';
+    public const COLUMN_WEBSITE = '_website';
 
-    const COLUMN_STORE = '_store';
+    public const COLUMN_STORE = '_store';
+
+    private const COLUMN_CREATED_AT = 'created_at';
+
+    private const COLUMN_UPDATED_AT = 'updated_at';
 
     /**
-     * Attribute collection name
+     * A constant declaration for attribute collection name
      */
-    const ATTRIBUTE_COLLECTION_NAME = \Magento\Customer\Model\ResourceModel\Attribute\Collection::class;
+    public const ATTRIBUTE_COLLECTION_NAME = \Magento\Customer\Model\ResourceModel\Attribute\Collection::class;
 
     /**
      * XML path to page size parameter
      */
-    const XML_PATH_PAGE_SIZE = 'export/customer_page_size/customer';
+    public const XML_PATH_PAGE_SIZE = 'export/customer_page_size/customer';
 
     /**
      * @var array
@@ -139,7 +143,7 @@ protected function _getEntityCollection()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function _getHeaderColumns()
     {
@@ -159,6 +163,18 @@ public function exportItem($item)
         $row[self::COLUMN_WEBSITE] = $this->_websiteIdToCode[$item->getWebsiteId()];
         $row[self::COLUMN_STORE] = $this->_storeIdToCode[$item->getStoreId()];
 
+        if (isset($row[self::COLUMN_CREATED_AT])) {
+            $row[self::COLUMN_CREATED_AT] = $this->_localeDate
+                ->scopeDate(null, $item->getCreatedAt(), true)
+                ->format('Y-m-d H:i:s');
+        }
+
+        if (isset($row[self::COLUMN_UPDATED_AT])) {
+            $row[self::COLUMN_UPDATED_AT] = $this->_localeDate
+                ->scopeDate(null, $item->getUpdatedAt(), true)
+                ->format('Y-m-d H:i:s');
+        }
+
         $this->getWriter()->writeRow($row);
     }
 

dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Export/CustomerTest.php

@@ -17,11 +17,13 @@
 use Magento\Customer\Model\Customer as CustomerModel;
 use Magento\Customer\Model\ResourceModel\Attribute\Collection;
 use Magento\Customer\Model\ResourceModel\Customer\Collection as CustomerCollection;
+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 
 /**
  * Tests for customer export model.
  *
  * @magentoAppArea adminhtml
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class CustomerTest extends \PHPUnit\Framework\TestCase
 {
@@ -50,6 +52,11 @@ class CustomerTest extends \PHPUnit\Framework\TestCase
      */
     private $attributeCollection;
 
+    /**
+     * @var TimezoneInterface
+     */
+    private $localeDate;
+
     /**
      * @inheritdoc
      */
@@ -58,6 +65,7 @@ protected function setUp(): void
         $this->objectManager = Bootstrap::getObjectManager();
         $this->_model = $this->objectManager->create(Customer::class);
         $this->attributeCollection = $this->objectManager->create(Collection::class);
+        $this->localeDate = $this->objectManager->create(TimezoneInterface::class);
     }
 
     /**
@@ -153,6 +161,15 @@ private function checkExportData(array $lines, array $expectedAttributes): void
         $customers = $this->objectManager->create(CustomerCollection::class);
         foreach ($customers as $customer) {
             $data = $this->processCustomerData($customer, $expectedAttributes);
+
+            $data['created_at'] = $this->localeDate
+                ->scopeDate(null, $data['created_at'], true)
+                ->format('Y-m-d H:i:s');
+
+            $data['updated_at'] = $this->localeDate
+                ->scopeDate(null, $data['updated_at'], true)
+                ->format('Y-m-d H:i:s');
+
             $exportData = $lines['data'][$data['email']];
             $exportData = $this->unsetDuplicateData($exportData);