Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for race condition when saving expense numbers

Browse Source
This commit is contained in:
David Bomba 2022-09-08 07:57:30 +10:00
parent 87005cb3e5
commit 870da39eb3
1 changed files with 42 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
app/Repositories/ExpenseRepository.php
View File

@ -1,4 +1,5 @@
<?php <?php
/** /**
* Invoice Ninja (https://invoiceninja.com). * Invoice Ninja (https://invoiceninja.com).
* *
@ -16,6 +17,7 @@ use App\Libraries\Currency\Conversion\CurrencyApi;
use App\Models\Expense; use App\Models\Expense;
use App\Utils\Traits\GeneratesCounter; use App\Utils\Traits\GeneratesCounter;
use Illuminate\Support\Carbon; use Illuminate\Support\Carbon;
use Illuminate\Database\QueryException;
/** /**
* ExpenseRepository. * ExpenseRepository.
@ -24,6 +26,8 @@ class ExpenseRepository extends BaseRepository
{ {
use GeneratesCounter; use GeneratesCounter;
private $completed = true;
/** /**
* Saves the expense and its contacts. * Saves the expense and its contacts.
* *
@ -32,15 +36,17 @@ class ExpenseRepository extends BaseRepository
* *
* @return \App\Models\Expense|null expense Object * @return \App\Models\Expense|null expense Object
*/ */
public function save(array $data, Expense $expense) : ?Expense public function save(array $data, Expense $expense): ?Expense
{ {
$expense->fill($data); $expense->fill($data);
if (! $expense->id) { if (!$expense->id) {
$expense = $this->processExchangeRates($data, $expense); $expense = $this->processExchangeRates($data, $expense);
} }
$expense->number = empty($expense->number) ? $this->getNextExpenseNumber($expense) : $expense->number; if (empty($expense->number))
$expense = $this->findAndSaveNumber($expense);
$expense->save(); $expense->save();
if (array_key_exists('documents', $data)) { if (array_key_exists('documents', $data)) {
@ -54,6 +60,7 @@ class ExpenseRepository extends BaseRepository
* Store expenses in bulk. * Store expenses in bulk.
* *
* @param array $expense * @param array $expense
*
* @return \App\Models\Expense|null * @return \App\Models\Expense|null
*/ */
public function create($expense): ?Expense public function create($expense): ?Expense
@ -64,7 +71,7 @@ class ExpenseRepository extends BaseRepository
); );
} }
public function processExchangeRates($data, $expense) public function processExchangeRates($data, $expense): Expense
{ {
if (array_key_exists('exchange_rate', $data) && isset($data['exchange_rate']) && $data['exchange_rate'] != 1) { if (array_key_exists('exchange_rate', $data) && isset($data['exchange_rate']) && $data['exchange_rate'] != 1) {
return $expense; return $expense;
@ -83,4 +90,35 @@ class ExpenseRepository extends BaseRepository
return $expense; return $expense;
} }
/**
* Handle race conditions when creating expense numbers
*
* @param Expense $expense
* @return \App\Models\Expense
*/
private function findAndSaveNumber($expense): Expense
{
$x = 1;
do {
try {
$expense->number = $this->getNextExpenseNumber($expense);
$expense->saveQuietly();
$this->completed = false;
} catch (QueryException $e) {
$x++;
if ($x > 50)
$this->completed = false;
}
} while ($this->completed);
return $expense;
}
} }