kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-29 18:20:01 +00:00
Code Issues Projects Releases Wiki Activity

Code for #3875

Browse Source
This commit is contained in:
James Cole
2020-10-01 12:48:27 +02:00
parent 3ce949f0aa
commit b3edbecde2
4 changed files with 54 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Helpers/Collector/GroupCollector.php
View File

@@ -447,9 +447,11 @@ class GroupCollector implements GroupCollectorInterface
*/ */
public function setUser(User $user): GroupCollectorInterface public function setUser(User $user): GroupCollectorInterface
{ {
$this->user = $user; if (null === $this->user) {
$this->startQuery(); $this->user = $user;
$this->startQuery();
}
return $this; return $this;
} }

1
app/Http/Controllers/Budget/IndexController.php
View File

@@ -310,7 +310,6 @@ class IndexController extends Controller
} }
$budgets[] = $array; $budgets[] = $array;
} }
return $budgets; return $budgets;
} }
} }

7
app/Http/Controllers/Chart/BudgetController.php
View File

@@ -115,8 +115,8 @@ class BudgetController extends Controller
while ($end >= $loopStart) { while ($end >= $loopStart) {
/** @var Carbon $currentEnd */ /** @var Carbon $currentEnd */
$loopEnd = app('navigation')->endOfPeriod($loopStart, $step); $loopEnd = app('navigation')->endOfPeriod($loopStart, $step);
$spent = $this->opsRepository->sumExpenses($loopStart, $loopEnd, null, $collection); $spent = $this->opsRepository->sumExpenses($loopStart, $loopEnd, null, $collection);
$label = trim(app('navigation')->periodShow($loopStart, $step)); $label = trim(app('navigation')->periodShow($loopStart, $step));
foreach ($spent as $row) { foreach ($spent as $row) {
$currencyId = $row['currency_id']; $currencyId = $row['currency_id'];
@@ -404,9 +404,6 @@ class BudgetController extends Controller
/** /**
* Shows a budget list with spent/left/overspent. * Shows a budget list with spent/left/overspent.
* *
* TODO there are cases when this chart hides expenses: when budget has limits
* and limits are found and used, but the expense is in another currency.
*
* @return JsonResponse * @return JsonResponse
* *
*/ */

63
app/Repositories/Budget/OperationsRepository.php
View File

@@ -59,15 +59,15 @@ class OperationsRepository implements OperationsRepositoryInterface
foreach ($budget->budgetlimits as $limit) { foreach ($budget->budgetlimits as $limit) {
$diff = $limit->start_date->diffInDays($limit->end_date); $diff = $limit->start_date->diffInDays($limit->end_date);
$diff = 0 === $diff ? 1 : $diff; $diff = 0 === $diff ? 1 : $diff;
$amount = (string)$limit->amount; $amount = (string) $limit->amount;
$perDay = bcdiv($amount, (string)$diff); $perDay = bcdiv($amount, (string) $diff);
$total = bcadd($total, $perDay); $total = bcadd($total, $perDay);
$count++; $count++;
Log::debug(sprintf('Found %d budget limits. Per day is %s, total is %s', $count, $perDay, $total)); Log::debug(sprintf('Found %d budget limits. Per day is %s, total is %s', $count, $perDay, $total));
} }
$avg = $total; $avg = $total;
if ($count > 0) { if ($count > 0) {
$avg = bcdiv($total, (string)$count); $avg = bcdiv($total, (string) $count);
} }
Log::debug(sprintf('%s / %d = %s = average.', $total, $count, $avg)); Log::debug(sprintf('%s / %d = %s = average.', $total, $count, $avg));
@@ -150,9 +150,9 @@ class OperationsRepository implements OperationsRepositoryInterface
/** @var array $journal */ /** @var array $journal */
foreach ($journals as $journal) { foreach ($journals as $journal) {
// prep data array for currency: // prep data array for currency:
$budgetId = (int)$journal['budget_id']; $budgetId = (int) $journal['budget_id'];
$budgetName = $journal['budget_name']; $budgetName = $journal['budget_name'];
$currencyId = (int)$journal['currency_id']; $currencyId = (int) $journal['currency_id'];
$key = sprintf('%d-%d', $budgetId, $currencyId); $key = sprintf('%d-%d', $budgetId, $currencyId);
$data[$key] = $data[$key] ?? [ $data[$key] = $data[$key] ?? [
@@ -204,9 +204,9 @@ class OperationsRepository implements OperationsRepositoryInterface
$array = []; $array = [];
foreach ($journals as $journal) { foreach ($journals as $journal) {
$currencyId = (int)$journal['currency_id']; $currencyId = (int) $journal['currency_id'];
$budgetId = (int)$journal['budget_id']; $budgetId = (int) $journal['budget_id'];
$budgetName = (string)$journal['budget_name']; $budgetName = (string) $journal['budget_name'];
// catch "no category" entries. // catch "no category" entries.
if (0 === $budgetId) { if (0 === $budgetId) {
@@ -232,7 +232,7 @@ class OperationsRepository implements OperationsRepositoryInterface
// add journal to array: // add journal to array:
// only a subset of the fields. // only a subset of the fields.
$journalId = (int)$journal['transaction_journal_id']; $journalId = (int) $journal['transaction_journal_id'];
$array[$currencyId]['budgets'][$budgetId]['transaction_journals'][$journalId] = [ $array[$currencyId]['budgets'][$budgetId]['transaction_journals'][$journalId] = [
@@ -357,28 +357,46 @@ class OperationsRepository implements OperationsRepositoryInterface
* @return array * @return array
*/ */
public function sumExpenses(Carbon $start, Carbon $end, ?Collection $accounts = null, ?Collection $budgets = null, ?TransactionCurrency $currency = null public function sumExpenses(Carbon $start, Carbon $end, ?Collection $accounts = null, ?Collection $budgets = null, ?TransactionCurrency $currency = null
): array { ): array
{
Log::debug(sprintf('Now in %s', __METHOD__));
/** @var GroupCollectorInterface $collector */ /** @var GroupCollectorInterface $collector */
$collector = app(GroupCollectorInterface::class); $collector = app(GroupCollectorInterface::class);
$collector->setUser($this->user)->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL]); $collector->setUser($this->user)->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL]);
if (null !== $accounts && $accounts->count() > 0) { if (null !== $accounts) {
$collector->setAccounts($accounts); $collector->setAccounts($accounts);
} }
if (null === $budgets || (null !== $budgets && 0 === $budgets->count())) { if (null === $budgets) {
$budgets = $this->getBudgets(); $budgets = $this->getBudgets();
} }
if (null !== $currency) { if (null !== $currency) {
$collector->setCurrency($currency); $collector->setCurrency($currency);
} }
$collector->setBudgets($budgets); $collector->setBudgets($budgets);
$collector->withBudgetInformation();
$journals = $collector->getExtractedJournals(); $journals = $collector->getExtractedJournals();
$array = [];
// same but for foreign currencies:
if (null !== $currency) {
Log::debug(sprintf('Currency is "%s".', $currency->name));
/** @var GroupCollectorInterface $collector */
$collector = app(GroupCollectorInterface::class);
$collector->setUser($this->user)->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL])
->setForeignCurrency($currency)->setBudgets($budgets);
if (null !== $accounts) {
$collector->setAccounts($accounts);
}
$result = $collector->getExtractedJournals();
Log::debug(sprintf('Found %d journals with currency %s.', count($result), $currency->code));
// do not use array_merge because you want keys to overwrite (otherwise you get double results):
$journals = $result + $journals;
}
$array = [];
foreach ($journals as $journal) { foreach ($journals as $journal) {
$currencyId = (int)$journal['currency_id']; $currencyId = (int) $journal['currency_id'];
$array[$currencyId] = $array[$currencyId] ?? [ $array[$currencyId] = $array[$currencyId] ?? [
'sum' => '0', 'sum' => '0',
'currency_id' => $currencyId, 'currency_id' => $currencyId,
@@ -388,8 +406,23 @@ class OperationsRepository implements OperationsRepositoryInterface
'currency_decimal_places' => $journal['currency_decimal_places'], 'currency_decimal_places' => $journal['currency_decimal_places'],
]; ];
$array[$currencyId]['sum'] = bcadd($array[$currencyId]['sum'], app('steam')->negative($journal['amount'])); $array[$currencyId]['sum'] = bcadd($array[$currencyId]['sum'], app('steam')->negative($journal['amount']));
// also do foreign amount:
$foreignId = (int) $journal['foreign_currency_id'];
if(0 !== $foreignId) {
$array[$foreignId] = $array[$foreignId] ?? [
'sum' => '0',
'currency_id' => $foreignId,
'currency_name' => $journal['foreign_currency_name'],
'currency_symbol' => $journal['foreign_currency_symbol'],
'currency_code' => $journal['foreign_currency_code'],
'currency_decimal_places' => $journal['foreign_currency_decimal_places'],
];
$array[$foreignId]['sum'] = bcadd($array[$foreignId]['sum'], app('steam')->negative($journal['foreign_amount']));
}
} }
return $array; return $array;
} }