Merge remote-tracking branch 'mainline/2.4-develop' into ACP2E-1044

Author: o-dubovyk

.github/ISSUE_TEMPLATE/developer-experience-issue.md

@@ -0,0 +1,45 @@
+name: Developer experience issue
+description: Issues related to customization, extensibility, modularity
+labels: ['Triage: Dev.Experience']
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Please read [our guidelines](https://developer.adobe.com/commerce/contributor/guides/code-contributions/#report-an-issue) before submitting the issue.
+  - type: textarea
+    attributes:
+      label: Summary
+      description: |
+        Describe the issue you are experiencing.
+        Include general information, error messages, environments, and so on.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Examples
+      description: |
+        Provide code examples or a patch with a test (recommended) to clearly indicate the problem.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Proposed solution
+      description: |
+        Suggest your potential solutions for this issue.
+  - type: textarea
+    attributes:
+      label: Release note
+      description: |
+        Help us to provide meaningful release notes to the community.
+  - type: checkboxes
+    attributes:
+      label: Triage and priority
+      description: |
+        Provide [Severity](https://developer.adobe.com/commerce/contributor/guides/code-contributions/#community-backlog-priority) assessment for the Issue as a Reporter.
+        This information helps us during the Confirmation and Issue triage processes.
+      options:
+        - label: 'Severity: **S0** _- Affects critical data or functionality and leaves users without workaround._'
+        - label: 'Severity: **S1** _- Affects critical data or functionality and forces users to employ a workaround._'
+        - label: 'Severity: **S2** _- Affects non-critical data or functionality and forces users to employ a workaround._'
+        - label: 'Severity: **S3** _- Affects non-critical data or functionality and does not force users to employ a workaround._'
+        - label: 'Severity: **S4** _- Affects aesthetics, professional look and feel, “quality” or “usability”._'

.github/ISSUE_TEMPLATE/developer_experience_issue.yaml

@@ -0,0 +1,41 @@
+name: Feature request
+description: Report to https://github.com/magento/community-features
+labels: ['feature request']
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Important: This repository is intended only for Magento 2 Technical Issues.
+        Enter Feature Requests at https://github.com/magento/community-features.
+        Project stakeholders monitor and manage requests.
+        Feature requests entered using this form may be moved to the forum.
+  - type: textarea
+    attributes:
+      label: Description
+      description: |
+        Describe the feature you would like to add.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Expected behavior
+      description: |
+        What is the expected behavior of this feature?
+        How is it going to work?
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Benefits
+      description: |
+        How do you think this feature would improve Magento?
+  - type: textarea
+    attributes:
+      label: Additional information
+      description: |
+        What other information can you provide about the desired feature?
+  - type: textarea
+    attributes:
+      label: Release note
+      description: |
+        Help us to provide meaningful release notes to the community.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -14,14 +14,13 @@
 /**
  * Export Advanced Pricing
  *
- * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class AdvancedPricing extends \Magento\CatalogImportExport\Model\Export\Product
 {
-    const ENTITY_ADVANCED_PRICING = 'advanced_pricing';
+    public const ENTITY_ADVANCED_PRICING = 'advanced_pricing';
 
     /**
      * @var \Magento\CatalogImportExport\Model\Import\Product\StoreResolver
@@ -568,10 +567,10 @@ protected function getTierPrices(array $listSku, $table)
                 if (isset($price[0]) && !empty($price[0]) || isset($price[1]) && !empty($price[1])) {
                     $select->orWhere('ap.percentage_value IS NOT NULL');
                 }
-                if (isset($updatedAtFrom) && !empty($updatedAtFrom)) {
+                if (isset($updatedAtFrom)) {
                     $select->where('cpe.updated_at >= ?', $updatedAtFrom);
                 }
-                if (isset($updatedAtTo) && !empty($updatedAtTo)) {
+                if (isset($updatedAtTo)) {
                     $select->where('cpe.updated_at <= ?', $updatedAtTo);
                 }
                 $exportData = $this->_connection->fetchAll($select);

.github/ISSUE_TEMPLATE/feature_request.yaml

@@ -316,7 +316,6 @@ protected function _importData()
         } elseif (\Magento\ImportExport\Model\Import::BEHAVIOR_APPEND == $this->getBehavior()) {
             $this->saveAdvancedPricing();
         }
-
         return true;
     }
 
@@ -342,7 +341,7 @@ public function deleteAdvancedPricing()
     {
         $this->_cachedSkuToDelete = null;
         $listSku = [];
-        while ($bunch = $this->_dataSourceModel->getNextBunch()) {
+        while ($bunch = $this->_dataSourceModel->getNextUniqueBunch($this->getIds())) {
             foreach ($bunch as $rowNum => $rowData) {
                 $this->validateRow($rowData, $rowNum);
                 if (!$this->getErrorAggregator()->isRowInvalid($rowNum)) {
@@ -389,7 +388,7 @@ protected function saveAndReplaceAdvancedPrices()
         }
         $listSku = [];
         $tierPrices = [];
-        while ($bunch = $this->_dataSourceModel->getNextBunch()) {
+        while ($bunch = $this->_dataSourceModel->getNextUniqueBunch($this->getIds())) {
             $bunchTierPrices = [];
             foreach ($bunch as $rowNum => $rowData) {
                 if (!$this->validateRow($rowData, $rowNum)) {
@@ -417,7 +416,7 @@ protected function saveAndReplaceAdvancedPrices()
                         'website_id' => $this->getWebSiteId($rowData[self::COL_TIER_PRICE_WEBSITE])
                     ];
                     if (\Magento\ImportExport\Model\Import::BEHAVIOR_APPEND == $behavior) {
-                         $bunchTierPrices[$rowSku][] = $tierPrice;
+                        $bunchTierPrices[$rowSku][] = $tierPrice;
                     }
                     if (\Magento\ImportExport\Model\Import::BEHAVIOR_REPLACE == $behavior) {
                         $tierPrices[$rowSku][] = $tierPrice;
@@ -437,9 +436,7 @@ protected function saveAndReplaceAdvancedPrices()
             if ($listSku) {
                 $this->setUpdatedAt($listSku);
             }
-        }
-
-        if (\Magento\ImportExport\Model\Import::BEHAVIOR_REPLACE == $behavior) {
+        } elseif (\Magento\ImportExport\Model\Import::BEHAVIOR_REPLACE == $behavior) {
             if ($listSku) {
                 $this->processCountNewPrices($tierPrices);
                 if ($this->deleteProductTierPrices(array_unique($listSku), self::TABLE_TIER_PRICE)) {
@@ -448,6 +445,7 @@ protected function saveAndReplaceAdvancedPrices()
                 }
             }
         }
+        $this->finalizeCount();
 
         return $this;
     }
@@ -652,11 +650,18 @@ protected function processCountNewPrices(array $tierPrices)
         foreach ($tierPrices as $productPrices) {
             $this->countItemsCreated += count($productPrices);
         }
-        $this->countItemsCreated -= $this->countItemsUpdated;
 
         return $this;
     }
 
+    /**
+     *  Finalize count of new and existing records
+     */
+    protected function finalizeCount()
+    {
+        $this->countItemsCreated -= $this->countItemsUpdated;
+    }
+
     /**
      * Get product entity link field
      *

app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php

@@ -39,8 +39,8 @@ class AdvancedPricingTest extends AbstractImportTestCase
     /**
      * DB Table data
      */
-    const TABLE_NAME = 'tableName';
-    const LINK_FIELD = 'linkField';
+    public const TABLE_NAME = 'tableName';
+    public const LINK_FIELD = 'linkField';
 
     /**
      * @var ResourceFactory|MockObject
@@ -328,7 +328,7 @@ public function testSaveAndReplaceAdvancedPricesAddRowErrorCall(): void
             ]
         ];
         $this->dataSourceModel
-            ->method('getNextBunch')
+            ->method('getNextUniqueBunch')
             ->willReturnOnConsecutiveCalls($testBunch);
         $this->advancedPricing->expects($this->once())->method('validateRow')->willReturn(false);
         $this->advancedPricing->method('saveProductPrices')->willReturnSelf();
@@ -400,7 +400,7 @@ public function testSaveAndReplaceAdvancedPricesAppendBehaviourDataAndCalls(
             ->method('getBehavior')
             ->willReturn(Import::BEHAVIOR_APPEND);
         $this->dataSourceModel
-            ->method('getNextBunch')
+            ->method('getNextUniqueBunch')
             ->willReturnOnConsecutiveCalls($data);
         $advancedPricing->method('validateRow')->willReturn(true);
 
@@ -524,7 +524,7 @@ public function testSaveAndReplaceAdvancedPricesReplaceBehaviourInternalCalls():
             Import::BEHAVIOR_REPLACE
         );
         $this->dataSourceModel
-            ->method('getNextBunch')
+            ->method('getNextUniqueBunch')
             ->willReturnOnConsecutiveCalls($data);
         $this->advancedPricing->expects($this->once())->method('validateRow')->willReturn(true);
 
@@ -577,7 +577,7 @@ public function testDeleteAdvancedPricingFormListSkuToDelete(): void
         ];
 
         $this->dataSourceModel
-            ->method('getNextBunch')
+            ->method('getNextUniqueBunch')
             ->willReturnOnConsecutiveCalls($data);
         $this->advancedPricing->method('validateRow')->willReturn(true);
         $expectedSkuList = ['sku value'];

app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php

@@ -15,6 +15,6 @@
 
         <switchToNextTab stepKey="switchToNewTab"/>
         <waitForPageLoad stepKey="waitForAdvancedReportingPageLoad"/>
-        <seeInCurrentUrl url="reports/advanced-reporting" stepKey="seeAssertAdvancedReportingPageUrl"/>
+        <seeInCurrentUrl url="report"  stepKey="seeAssertAdvancedReportingPageUrl"/>
     </actionGroup>
 </actionGroups>

app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricingTest.php

@@ -861,15 +861,21 @@ public function fileWrite($resource, $data)
      */
     public function fileClose($resource): bool
     {
+        if (!is_resource($resource)) {
+            return false;
+        }
         //phpcs:disable
-        $resourcePath = stream_get_meta_data($resource)['uri'];
+        $meta = stream_get_meta_data($resource);
         //phpcs:enable
 
         foreach ($this->streams as $path => $stream) {
             // phpcs:ignore
-            if (stream_get_meta_data($stream)['uri'] === $resourcePath) {
+            if (stream_get_meta_data($stream)['uri'] === $meta['uri']) {
+                if (isset($meta['seekable']) && $meta['seekable']) {
+                    // rewind the file pointer to make sure the full content of the file is saved
+                    $this->fileSeek($resource, 0);
+                }
                 $this->adapter->writeStream($path, $resource, new Config(self::CONFIG));
-
                 // Remove path from streams after
                 unset($this->streams[$path]);
 

app/code/Magento/Analytics/Test/Mftf/ActionGroup/AssertAdminAdvancedReportingPageUrlActionGroup.xml

@@ -513,4 +513,28 @@ public function testRenameSameDestination(): void
 
         self::assertTrue($this->driver->rename('test/path', 'test/path'));
     }
+
+    public function testFileShouldBeRewindBeforeSave(): void
+    {
+        $resource = $this->driver->fileOpen('test/path', 'w');
+        $this->driver->fileWrite($resource, 'abc');
+        $this->adapterMock->method('fileExists')->willReturn(false);
+        $this->adapterMock->expects($this->once())
+            ->method('writeStream')
+            ->with(
+                'test/path',
+                $this->callback(
+                    // assert that the file pointer is at the beginning of the file before saving it in aws
+                    fn ($stream) => $stream === $resource && is_resource($stream) && ftell($stream) === 0
+                )
+            );
+        $this->driver->fileClose($resource);
+    }
+
+    public function testFileCloseShouldReturnFalseIfTheArgumentIsNotAResource(): void
+    {
+        $this->assertEquals(false, $this->driver->fileClose(''));
+        $this->assertEquals(false, $this->driver->fileClose(null));
+        $this->assertEquals(false, $this->driver->fileClose(false));
+    }
 }