optimize loading old usages

superdav42 · Sep 4, 2024 · 07be069 · 07be069
1 parent 0efa79c
commit 07be069
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/Block/Catalog/Product/Usage.php b/Block/Catalog/Product/Usage.php
@@ -62,6 +62,7 @@ class Usage extends AbstractProduct
     protected CollectionFactory $orderCollectionFactory;
     protected SortOrderBuilder $sortOrderBuilder;
     private DataHelper $config;
+    private array $previousCategories;
 
     public function __construct(
         Context                         $context,
@@ -527,6 +528,10 @@ public function getPreviousSelectHtml(): string
      */
     public function getPreviousCategories(): array
     {
+        if (isset($this->previousCategories)) {
+            return $this->previousCategories;
+        }
+
         $previousCategories = [];
         try {
             $items = $this->checkoutSession->getQuote()->getAllVisibleItems();
@@ -544,8 +549,10 @@ public function getPreviousCategories(): array
                 $ordersCollection = $this->orderCollectionFactory->create()
                     ->addFieldToSelect('*')
                     ->addFieldToFilter('customer_id', $this->getCustomerId())
+                    ->addFieldToFilter('created_at', ['from' => '2023-05-01 00:00:00'])
                     ->setPageSize(20 - count($previousCategories))
                     ->setOrder('created_at', 'desc');
+                $tried = 0;
                 /**
                  * @var Order $order
                  * @var OrderItemInterface $item
@@ -568,10 +575,11 @@ public function getPreviousCategories(): array
                         } catch (Exception $e) {
                             // Probably usage was deleted, skip.
                             continue;
+                            $tried++;
                         }
 
-                        if (count($previousCategories) >= 10) {
-                            break;
+                        if (count($previousCategories) >= 10 || $tried > 20) {
+                            break 2;
                         }
                     }
                 }
@@ -580,7 +588,8 @@ public function getPreviousCategories(): array
             $this->_logger->error(__('Unable to fetch previous categories.'));
             $this->_logger->error($e->getMessage());
         }
-        return $previousCategories;
+        $this->previousCategories = $previousCategories;
+        return $this->previousCategories;
     }
 
     /**