Merge pull request #38 from Hlavtox/assemble-in-bulk

Assemble products in bulk to save performance

Author: ShaiMagal

.github/workflows/php.yml

@@ -41,7 +41,7 @@ jobs:
         uses: actions/checkout@v2.0.0
 
       - name: Cache dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: vendor
           key: php-${{ hashFiles('composer.lock') }}
@@ -70,14 +70,14 @@ jobs:
 
       # Add vendor folder in cache to make next builds faster
       - name: Cache vendor folder
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: vendor
           key: php-${{ hashFiles('composer.lock') }}
 
       # Add composer local folder in cache to make next builds faster
       - name: Cache composer folder
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: ~/.composer/cache
           key: php-composer-cache

ps_viewedproduct.php

@@ -260,51 +260,64 @@ protected function getViewedProducts()
     {
         $productIds = $this->getViewedProductIds();
 
-        if (!empty($productIds)) {
-            $assembler = new ProductAssembler($this->context);
-
-            $presenterFactory = new ProductPresenterFactory($this->context);
-            $presentationSettings = $presenterFactory->getPresentationSettings();
-            if (version_compare(_PS_VERSION_, '1.7.5', '>=')) {
-                $presenter = new \PrestaShop\PrestaShop\Adapter\Presenter\Product\ProductListingPresenter(
-                    new ImageRetriever(
-                        $this->context->link
-                    ),
-                    $this->context->link,
-                    new PriceFormatter(),
-                    new ProductColorsRetriever(),
-                    $this->context->getTranslator()
-                );
-            } else {
-                $presenter = new \PrestaShop\PrestaShop\Core\Product\ProductListingPresenter(
-                    new ImageRetriever(
-                        $this->context->link
-                    ),
-                    $this->context->link,
-                    new PriceFormatter(),
-                    new ProductColorsRetriever(),
-                    $this->context->getTranslator()
-                );
-            }
+        if (empty($productIds)) {
+            return false;
+        }
+
+        $assembler = new ProductAssembler($this->context);
+
+        $presenterFactory = new ProductPresenterFactory($this->context);
+        $presentationSettings = $presenterFactory->getPresentationSettings();
+        if (version_compare(_PS_VERSION_, '1.7.5', '>=')) {
+            $presenter = new \PrestaShop\PrestaShop\Adapter\Presenter\Product\ProductListingPresenter(
+                new ImageRetriever(
+                    $this->context->link
+                ),
+                $this->context->link,
+                new PriceFormatter(),
+                new ProductColorsRetriever(),
+                $this->context->getTranslator()
+            );
+        } else {
+            $presenter = new \PrestaShop\PrestaShop\Core\Product\ProductListingPresenter(
+                new ImageRetriever(
+                    $this->context->link
+                ),
+                $this->context->link,
+                new PriceFormatter(),
+                new ProductColorsRetriever(),
+                $this->context->getTranslator()
+            );
+        }
+
+        // Now, we can present the products for the template.
+        $products_for_template = [];
 
-            $products_for_template = [];
-
-            if (is_array($productIds)) {
-                foreach ($productIds as $productId) {
-                    if ($this->currentProductId !== $productId) {
-                        $products_for_template[] = $presenter->present(
-                            $presentationSettings,
-                            $assembler->assembleProduct(['id_product' => $productId]),
-                            $this->context->language
-                        );
-                    }
+        if (is_array($productIds)) {
+            // Prepare a standardized array with products
+            $rawProducts = [];
+            foreach ($productIds as $productId) {
+                if ($this->currentProductId == $productId) {
+                    continue;
                 }
+                $rawProducts[] = ['id_product' => $productId];
             }
 
-            return $products_for_template;
+            // Assemble & present in bulk or separately, depending on core version
+            $assembleInBulk = method_exists($assembler, 'assembleProducts');
+            if ($assembleInBulk) {
+                $rawProducts = $assembler->assembleProducts($rawProducts);
+            }
+            foreach ($rawProducts as $rawProduct) {
+                $products_for_template[] = $presenter->present(
+                    $presentationSettings,
+                    ($assembleInBulk ? $rawProduct : $assembler->assembleProduct($rawProduct)),
+                    $this->context->language
+                );
+            }
         }
 
-        return false;
+        return $products_for_template;
     }
 
     /**