github-mirror/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2026-03-28 07:39:25 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed GetCurrentStock caching

Browse Source
This commit is contained in:
Bernd Bestel 2023-09-02 09:12:37 +02:00
parent 60adda2b42
commit 1f7580af3f
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
services/StockService.php
View File

@ -620,9 +620,9 @@ class StockService extends BaseService
}
private static $CurrentStockCache = null;
public function GetCurrentStock()
public function GetCurrentStock(bool $useCache = false)
{
if (self::$CurrentStockCache == null)
if (!$useCache || self::$CurrentStockCache == null)
{
$sql = 'SELECT * FROM stock_current';
$currentStockMapped = $this->getDatabaseService()->ExecuteDbQuery($sql)->fetchAll(\PDO::FETCH_GROUP | \PDO::FETCH_OBJ);
@ -665,7 +665,7 @@ class StockService extends BaseService
public function GetDueProducts(int $days = 5, bool $excludeOverdue = false)
{
$currentStock = $this->GetCurrentStock();
$currentStock = $this->GetCurrentStock(true);
$currentStock = FindAllObjectsInArrayByPropertyValue($currentStock, 'best_before_date', date('Y-m-d 23:59:59', strtotime("+$days days")), '<');
if ($excludeOverdue)
@ -678,7 +678,7 @@ class StockService extends BaseService
public function GetExpiredProducts()
{
$currentStock = $this->GetCurrentStock();
$currentStock = $this->GetCurrentStock(true);
$currentStock = FindAllObjectsInArrayByPropertyValue($currentStock, 'best_before_date', date('Y-m-d 23:59:59', strtotime('-1 days')), '<');
$currentStock = FindAllObjectsInArrayByPropertyValue($currentStock, 'due_type', 2);