kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-16 02:34:44 +00:00
Code Issues Projects Releases Wiki Activity

Auto-compact stock entries (closes #1343)

Browse Source
This commit is contained in:
Bernd Bestel
2021-07-11 21:06:05 +02:00
parent 696e9b3e28
commit 55807bfc94
4 changed files with 84 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
controllers/BaseController.php
View File

@@ -229,7 +229,10 @@ class BaseController
} }
// Allow some special chars // Allow some special chars
$value = str_replace('&', '&', $value); if (!is_array($value))
{
$value = str_replace('&', '&', $value);
}
} }
return $requestBody; return $requestBody;

18
migrations/0143.sql Normal file
View File

@@ -0,0 +1,18 @@
CREATE VIEW stock_splits
AS
/*
Helper view which shows splitted stock rows which could be compacted
*/
SELECT
product_id,
SUM(amount) AS total_amount,
MIN(stock_id) AS stock_id_to_keep,
MIN(id) AS id_to_keep,
GROUP_CONCAT(id) AS id_group,
GROUP_CONCAT(stock_id) AS stock_id_group,
id -- Dummy
FROM stock
GROUP BY product_id, best_before_date, purchased_date, price, open, opened_date, location_id, shopping_location_id
HAVING COUNT(*) > 1;

7
migrations/0144.php Normal file
View File

@@ -0,0 +1,7 @@
<?php
// This is executed inside DatabaseMigrationService class/context
use Grocy\Services\StockService;
$this->getStockService()->CompactStockEntries();

56
services/StockService.php
View File

@@ -219,6 +219,8 @@ class StockService extends BaseService
} }
} }
$this->CompactStockEntries($productId);
return $transactionId; return $transactionId;
} }
else else
@@ -413,6 +415,8 @@ class StockService extends BaseService
} }
} }
$this->CompactStockEntries($productId);
return $transactionId; return $transactionId;
} }
else else
@@ -490,6 +494,8 @@ class StockService extends BaseService
]); ]);
$logNewRowForStockUpdate->save(); $logNewRowForStockUpdate->save();
$this->CompactStockEntries($stockRow->product_id);
return $transactionId; return $transactionId;
} }
@@ -1294,7 +1300,7 @@ class StockService extends BaseService
return; return;
} }
$hasSubsequentBookings = $this->getDatabase()->stock_log()->where('stock_id = :1 AND id != :2 AND (correlation_id is not null OR correlation_id != :3) AND id > :2 AND undone = 0', $logRow->stock_id, $logRow->id, $logRow->correlation_id)->count() > 0; $hasSubsequentBookings = $this->getDatabase()->stock_log()->where('stock_id = :1 AND id != :2 AND (correlation_id IS NOT NULL OR correlation_id != :3) AND id > :2 AND undone = 0', $logRow->stock_id, $logRow->id, $logRow->correlation_id)->count() > 0;
if ($hasSubsequentBookings) if ($hasSubsequentBookings)
{ {
throw new \Exception('Booking has subsequent dependent bookings, undo not possible'); throw new \Exception('Booking has subsequent dependent bookings, undo not possible');
@@ -1514,6 +1520,54 @@ class StockService extends BaseService
$this->getDatabaseService()->GetDbConnectionRaw()->commit(); $this->getDatabaseService()->GetDbConnectionRaw()->commit();
} }
public function CompactStockEntries($productId = null)
{
if ($productId == null)
{
$splittedStockEntries = $this->getDatabase()->stock_splits();
}
else
{
$splittedStockEntries = $this->getDatabase()->stock_splits()->where('product_id = :1', $productId);
}
foreach ($splittedStockEntries as $splittedStockEntry)
{
$this->getDatabaseService()->GetDbConnectionRaw()->beginTransaction();
try
{
$stockIds = explode(',', $splittedStockEntry->stock_id_group);
foreach ($stockIds as $stockId)
{
if ($stockId != $splittedStockEntry->stock_id_to_keep)
{
$this->getDatabaseService()->ExecuteDbStatement('UPDATE stock SET stock_id = \'' . $splittedStockEntry->stock_id_to_keep . '\' WHERE stock_id = \'' . $stockId . '\'');
$this->getDatabaseService()->ExecuteDbStatement('UPDATE stock_log SET stock_id = \'' . $splittedStockEntry->stock_id_to_keep . '\' WHERE stock_id = \'' . $stockId . '\'');
}
}
$stockEntryIds = explode(',', $splittedStockEntry->id_group);
foreach ($stockEntryIds as $stockEntryId)
{
if ($stockEntryId != $splittedStockEntry->id_to_keep)
{
$this->getDatabaseService()->ExecuteDbStatement('DELETE FROM stock WHERE id = ' . $stockEntryId);
}
else
{
$this->getDatabaseService()->ExecuteDbStatement('UPDATE stock SET amount = ' . $splittedStockEntry->total_amount . ' WHERE id = ' . $splittedStockEntry->id_to_keep);
}
}
}
catch (Exception $ex)
{
$this->getDatabaseService()->GetDbConnectionRaw()->rollback();
throw $ex;
}
$this->getDatabaseService()->GetDbConnectionRaw()->commit();
}
}
private function LoadBarcodeLookupPlugin() private function LoadBarcodeLookupPlugin()
{ {
$pluginName = defined('GROCY_STOCK_BARCODE_LOOKUP_PLUGIN') ? GROCY_STOCK_BARCODE_LOOKUP_PLUGIN : ''; $pluginName = defined('GROCY_STOCK_BARCODE_LOOKUP_PLUGIN') ? GROCY_STOCK_BARCODE_LOOKUP_PLUGIN : '';