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

Code cleanup that (hopefully) matches style CI

Browse Source
This commit is contained in:
James Cole
2020-03-17 16:46:00 +01:00
parent 91c067ac9f
commit 9a25d6a741
42 changed files with 1395 additions and 1262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
app/Jobs/CreateAutoBudgetLimits.php
View File

@@ -126,8 +126,10 @@ class CreateAutoBudgetLimits implements ShouldQueue
Log::debug(
sprintf(
'Current period is %s-%s, so previous period is %s-%s',
$start->format('Y-m-d'), $end->format('Y-m-d'),
$previousStart->format('Y-m-d'), $previousEnd->format('Y-m-d')
$start->format('Y-m-d'),
$end->format('Y-m-d'),
$previousStart->format('Y-m-d'),
$previousEnd->format('Y-m-d')
)
);
@@ -147,7 +149,7 @@ class CreateAutoBudgetLimits implements ShouldQueue
$repository = app(OperationsRepositoryInterface::class);
$repository->setUser($autoBudget->budget->user);
$spent = $repository->sumExpenses($previousStart, $previousEnd, null, new Collection([$autoBudget->budget]), $autoBudget->transactionCurrency);
$currencyId = (int)$autoBudget->transaction_currency_id;
$currencyId = (int) $autoBudget->transaction_currency_id;
$spentAmount = $spent[$currencyId]['sum'] ?? '0';
Log::debug(sprintf('Spent in previous budget period (%s-%s) is %s', $previousStart->format('Y-m-d'), $previousEnd->format('Y-m-d'), $spentAmount));
@@ -176,7 +178,10 @@ class CreateAutoBudgetLimits implements ShouldQueue
{
Log::debug(
sprintf(
'Going to find a budget limit for budget #%d ("%s") between %s and %s', $budget->id, $budget->name, $start->format('Y-m-d'),
'Going to find a budget limit for budget #%d ("%s") between %s and %s',
$budget->id,
$budget->name,
$start->format('Y-m-d'),
$end->format('Y-m-d')
)
);
@@ -197,16 +202,25 @@ class CreateAutoBudgetLimits implements ShouldQueue
Log::info(
sprintf(
'Today (%s) is not a magic day for %s auto-budget #%d (part of budget #%d "%s")',
$this->date->format('Y-m-d'), $autoBudget->period, $autoBudget->id, $autoBudget->budget->id, $autoBudget->budget->name
$this->date->format('Y-m-d'),
$autoBudget->period,
$autoBudget->id,
$autoBudget->budget->id,
$autoBudget->budget->name
)
);
Log::debug(sprintf('Done with auto budget #%d', $autoBudget->id));
return;
}
Log::info(
sprintf(
'Today (%s) is a magic day for %s auto-budget #%d (part of budget #%d "%s")',
$this->date->format('Y-m-d'), $autoBudget->period, $autoBudget->id, $autoBudget->budget->id, $autoBudget->budget->name
$this->date->format('Y-m-d'),
$autoBudget->period,
$autoBudget->id,
$autoBudget->budget->id,
$autoBudget->budget->name
)
);
@@ -239,8 +253,8 @@ class CreateAutoBudgetLimits implements ShouldQueue
/**
* @param AutoBudget $autoBudget
*
* @return bool
* @throws FireflyException
* @return bool
*/
private function isMagicDay(AutoBudget $autoBudget): bool
{
@@ -273,4 +287,4 @@ class CreateAutoBudgetLimits implements ShouldQueue
return '01-01' === $value;
}
}
}
}