From 8c033ff6c8ebb983d6f301011cc2933d7d87e7bf Mon Sep 17 00:00:00 2001 From: Bernd Bestel Date: Tue, 23 May 2023 21:26:53 +0200 Subject: [PATCH] Revert "Cache `StockService->GetCurrentStock` result" This (partly) reverts commit bc5051351a6e582331c6c0f052439adf6ccb982e. --- services/StockService.php | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/services/StockService.php b/services/StockService.php index aa417c98..9e753c21 100644 --- a/services/StockService.php +++ b/services/StockService.php @@ -627,25 +627,19 @@ class StockService extends BaseService return $pluginOutput; } - private $CurrentStockCache = null; - public function GetCurrentStock() { - if ($this->CurrentStockCache == null) - { - $sql = 'SELECT * FROM stock_current'; - $currentStockMapped = $this->getDatabaseService()->ExecuteDbQuery($sql)->fetchAll(\PDO::FETCH_GROUP | \PDO::FETCH_OBJ); - $relevantProducts = $this->getDatabase()->products()->where('id IN (SELECT product_id FROM (' . $sql . ') x)'); - foreach ($relevantProducts as $product) - { - $currentStockMapped[$product->id][0]->product_id = $product->id; - $currentStockMapped[$product->id][0]->product = $product; - } + $sql = 'SELECT * FROM stock_current'; + $currentStockMapped = $this->getDatabaseService()->ExecuteDbQuery($sql)->fetchAll(\PDO::FETCH_GROUP | \PDO::FETCH_OBJ); + $relevantProducts = $this->getDatabase()->products()->where('id IN (SELECT product_id FROM (' . $sql . ') x)'); - $this->CurrentStockCache = array_column($currentStockMapped, 0); + foreach ($relevantProducts as $product) + { + $currentStockMapped[$product->id][0]->product_id = $product->id; + $currentStockMapped[$product->id][0]->product = $product; } - return $this->CurrentStockCache; + return array_column($currentStockMapped, 0); } public function GetCurrentStockLocationContent($includeOutOfStockProductsAtTheDefaultLocation = false)