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

Author: glanujnehra

app/code/Magento/Catalog/Model/Product/Price/BasePriceStorage.php

@@ -157,9 +157,11 @@ public function update(array $prices)
     {
         $prices = $this->retrieveValidPrices($prices);
         $formattedPrices = [];
+        $productIds = [];
 
         foreach ($prices as $price) {
             $ids = array_keys($this->productIdLocator->retrieveProductIdsBySkus([$price->getSku()])[$price->getSku()]);
+            $productIds[] = $ids[key($ids)];
             foreach ($ids as $id) {
                 $formattedPrices[] = [
                     'store_id' => $price->getStoreId(),
@@ -182,6 +184,7 @@ public function update(array $prices)
         }
 
         $this->getPricePersistence()->update($formattedPrices);
+        $this->getPricePersistence()->updateLastUpdatedAt($productIds);
 
         return $this->validationResult->getFailedItems();
     }

app/code/Magento/Catalog/Model/Product/Price/PricePersistence.php

@@ -10,12 +10,15 @@
 use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
 use Magento\Catalog\Model\ProductIdLocatorInterface;
 use Magento\Catalog\Model\ResourceModel\Attribute;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Exception\CouldNotDeleteException;
 use Magento\Framework\Exception\CouldNotSaveException;
+use Magento\Framework\Stdlib\DateTime\DateTime;
 
 /**
  * Class responsibly for persistence of prices.
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class PricePersistence
 {
@@ -42,33 +45,40 @@ class PricePersistence
     private $productIdLocator;
 
     /**
-     * Metadata pool.
+     * Metadata pool property to get a metadata.
      *
      * @var MetadataPool
      */
     private $metadataPool;
 
     /**
-     * Attribute code.
+     * Attribute code attribute to get the attribute id.
      *
      * @var string
      */
     private $attributeCode;
 
     /**
-     * Attribute ID.
+     * Attribute ID property to store the attribute id.
      *
      * @var int
      */
     private $attributeId;
 
     /**
-     * Items per operation.
+     * Items per operation to chunk the array in a batch.
      *
      * @var int
      */
     private $itemsPerOperation = 500;
 
+    /**
+     * Date time property to get the gm date.
+     *
+     * @var DateTime
+     */
+    private $dateTime;
+
     /**
      * PricePersistence constructor.
      *
@@ -77,19 +87,23 @@ class PricePersistence
      * @param ProductIdLocatorInterface $productIdLocator
      * @param MetadataPool $metadataPool
      * @param string $attributeCode
+     * @param DateTime|null $dateTime
      */
     public function __construct(
         Attribute $attributeResource,
         ProductAttributeRepositoryInterface $attributeRepository,
         ProductIdLocatorInterface $productIdLocator,
         MetadataPool $metadataPool,
-        $attributeCode = ''
+        $attributeCode = '',
+        ?DateTime $dateTime = null
     ) {
         $this->attributeResource = $attributeResource;
         $this->attributeRepository = $attributeRepository;
         $this->attributeCode = $attributeCode;
         $this->productIdLocator = $productIdLocator;
         $this->metadataPool = $metadataPool;
+        $this->dateTime = $dateTime ?: ObjectManager::getInstance()
+            ->get(DateTime::class);
     }
 
     /**
@@ -233,4 +247,27 @@ public function getEntityLinkField()
         return $this->metadataPool->getMetadata(ProductInterface::class)
             ->getLinkField();
     }
+
+    /**
+     * Update last updated date.
+     *
+     * @param array $productIds
+     * @return void
+     * @throws CouldNotSaveException
+     */
+    public function updateLastUpdatedAt(array $productIds): void
+    {
+        try {
+            $this->attributeResource->getConnection()->update(
+                $this->attributeResource->getTable('catalog_product_entity'),
+                [ProductInterface::UPDATED_AT => $this->dateTime->gmtDate()],
+                [$this->getEntityLinkField(). ' IN(?)' => $productIds]
+            );
+        } catch (\Exception $e) {
+            throw new CouldNotSaveException(
+                __("The attribute can't be saved."),
+                $e
+            );
+        }
+    }
 }

dev/tests/api-functional/testsuite/Magento/Catalog/Api/BasePriceStorageTest.php

@@ -6,29 +6,48 @@
 
 namespace Magento\Catalog\Api;
 
+use Magento\Catalog\Model\ProductRepository;
+use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\WebapiAbstract;
 use Magento\Framework\Webapi\Exception as HTTPExceptionCodes;
+use Magento\Catalog\Model\ProductRepositoryFactory;
+use Magento\TestFramework\Fixture\DataFixture;
+use Magento\TestFramework\Fixture\DataFixtureStorage;
+use Magento\TestFramework\Fixture\DataFixtureStorageManager;
+use Magento\Catalog\Test\Fixture\Product as ProductFixture;
 
 /**
- * BasePriceStorage test.
+ * Base price storage test to test the update and update with invalid parameter.
  */
 class BasePriceStorageTest extends WebapiAbstract
 {
-    const SERVICE_NAME = 'catalogBasePriceStorageV1';
-    const SERVICE_VERSION = 'V1';
-    const SIMPLE_PRODUCT_SKU = 'simple';
+    private const SERVICE_NAME = 'catalogBasePriceStorageV1';
+    private const SERVICE_VERSION = 'V1';
+    private const SIMPLE_PRODUCT_SKU = 'simple';
 
     /**
      * @var \Magento\TestFramework\ObjectManager
      */
     private $objectManager;
 
+    /**
+     * @var ProductRepositoryFactory
+     */
+    private $repositoryFactory;
+
+    /**
+     * @var DataFixtureStorage
+     */
+    private $fixtures;
+
     /**
      * Set up.
      */
     protected function setUp(): void
     {
         $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->repositoryFactory = Bootstrap::getObjectManager()->get(ProductRepositoryFactory::class);
+        $this->fixtures = $this->objectManager->get(DataFixtureStorageManager::class)->getStorage();
     }
 
     /**
@@ -157,4 +176,51 @@ public function testUpdateWithInvalidParameters()
 
         $this->assertEquals($expectedResponse, $response);
     }
+
+    /**
+     * Test update last updated at method.
+     *
+     */
+    #[
+        DataFixture(ProductFixture::class, as: 'product'),
+    ]
+    public function testUpdateLastUpdatedAt()
+    {
+        $product = $this->fixtures->get('product');
+        $productSku = $product->getSku();
+        /** @var ProductRepository $beforeProductRepository */
+        $beforeProductRepository = $this->repositoryFactory->create();
+        $beforeProductUpdatedAt = $beforeProductRepository->get($productSku)->getUpdatedAt();
+        $serviceInfo = [
+            'rest' => [
+                'resourcePath' => '/V1/products/base-prices',
+                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_POST
+            ],
+            'soap' => [
+                'service' => self::SERVICE_NAME,
+                'serviceVersion' => self::SERVICE_VERSION,
+                'operation' => self::SERVICE_NAME . 'Update',
+            ],
+        ];
+        $newPrice = 9999;
+        $storeId = 0;
+        $response = $this->_webApiCall(
+            $serviceInfo,
+            [
+                'prices' => [
+                    [
+                        'price' => $newPrice,
+                        'store_id' => $storeId,
+                        'sku' => $productSku,
+                    ]
+                ]
+            ]
+        );
+        $this->assertEmpty($response);
+
+        /** @var ProductRepository $afterProductRepository */
+        $afterProductRepository = $this->repositoryFactory->create();
+        $afterProductUpdatedAt = $afterProductRepository->get($productSku)->getUpdatedAt();
+        $this->assertTrue(strtotime($afterProductUpdatedAt) >= strtotime($beforeProductUpdatedAt));
+    }
 }