kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 23:45:10 +00:00
Code Issues Projects Releases Wiki Activity

Catch division by zero.

Browse Source
This commit is contained in:
James Cole
2023-12-29 09:05:44 +01:00
parent bdba786322
commit 0d7fd36c38
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/Support/Http/Api/ExchangeRateConverter.php
View File

@@ -37,11 +37,11 @@ use Illuminate\Support\Facades\Log;
class ExchangeRateConverter class ExchangeRateConverter
{ {
// use ConvertsExchangeRates; // use ConvertsExchangeRates;
private int $queryCount = 0; private int $queryCount = 0;
private array $prepared = []; private array $prepared = [];
private array $fallback = []; private array $fallback = [];
private bool $isPrepared = false; private bool $isPrepared = false;
private bool $noPreparedRates = false; private bool $noPreparedRates = false;
/** /**
* @throws FireflyException * @throws FireflyException
@@ -123,7 +123,7 @@ class ExchangeRateConverter
*/ */
private function getRate(TransactionCurrency $from, TransactionCurrency $to, Carbon $date): string private function getRate(TransactionCurrency $from, TransactionCurrency $to, Carbon $date): string
{ {
if($this->isPrepared && !$this->noPreparedRates) { if ($this->isPrepared && !$this->noPreparedRates) {
Log::debug(sprintf('Return fallback rate from #%d to #%d on %s.', $from->id, $to->id, $date->format('Y-m-d'))); Log::debug(sprintf('Return fallback rate from #%d to #%d on %s.', $from->id, $to->id, $date->format('Y-m-d')));
return $this->fallback[$from->id][$to->id] ?? '0'; return $this->fallback[$from->id][$to->id] ?? '0';
} }
@@ -289,6 +289,7 @@ class ExchangeRateConverter
private function fallback(TransactionCurrency $from, TransactionCurrency $to, Carbon $date): void private function fallback(TransactionCurrency $from, TransactionCurrency $to, Carbon $date): void
{ {
$fallback = $this->getRate($from, $to, $date); $fallback = $this->getRate($from, $to, $date);
$fallback = 0 === bccomp('0', $fallback) ? '1' : $fallback;
$this->fallback[$from->id][$to->id] = $fallback; $this->fallback[$from->id][$to->id] = $fallback;
$this->fallback[$to->id][$from->id] = bcdiv('1', $fallback); $this->fallback[$to->id][$from->id] = bcdiv('1', $fallback);
Log::debug(sprintf('Fallback rate %s > %s = %s', $from->code, $to->code, $fallback)); Log::debug(sprintf('Fallback rate %s > %s = %s', $from->code, $to->code, $fallback));