mirror of
https://github.com/grocy/grocy.git
synced 2025-04-29 17:45:39 +00:00
Revert "Cache StockService->GetCurrentStock
result"
This (partly) reverts commit bc5051351a6e582331c6c0f052439adf6ccb982e.
This commit is contained in:
parent
8c79cc4f8e
commit
8c033ff6c8
@ -627,25 +627,19 @@ class StockService extends BaseService
|
|||||||
return $pluginOutput;
|
return $pluginOutput;
|
||||||
}
|
}
|
||||||
|
|
||||||
private $CurrentStockCache = null;
|
|
||||||
|
|
||||||
public function GetCurrentStock()
|
public function GetCurrentStock()
|
||||||
{
|
{
|
||||||
if ($this->CurrentStockCache == null)
|
$sql = 'SELECT * FROM stock_current';
|
||||||
{
|
$currentStockMapped = $this->getDatabaseService()->ExecuteDbQuery($sql)->fetchAll(\PDO::FETCH_GROUP | \PDO::FETCH_OBJ);
|
||||||
$sql = 'SELECT * FROM stock_current';
|
$relevantProducts = $this->getDatabase()->products()->where('id IN (SELECT product_id FROM (' . $sql . ') x)');
|
||||||
$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;
|
|
||||||
}
|
|
||||||
|
|
||||||
$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)
|
public function GetCurrentStockLocationContent($includeOutOfStockProductsAtTheDefaultLocation = false)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user