kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-05-05 05:33:36 +00:00
Code Issues Projects Releases Wiki Activity

Removed a lot of references to the old collector.

Browse Source
This commit is contained in:
James Cole
2019-05-29 21:52:08 +02:00
parent 280b2efee6
commit 7e2159d12c
17 changed files with 876 additions and 664 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
app/Generator/Report/Support.php
View File

@@ -24,13 +24,12 @@ declare(strict_types=1);
namespace FireflyIII\Generator\Report;
use FireflyIII\Models\Transaction;
use Illuminate\Support\Collection;
/**
* Class Support.
* @method Collection getExpenses()
* @method Collection getIncome()
* @method array getExpenses()
* @method array getIncome()
*
* @codeCoverageIgnore
*/
@@ -39,53 +38,63 @@ class Support
/**
* Get the top expenses.
*
* @return Collection
* @return array
*/
public function getTopExpenses(): Collection
public function getTopExpenses(): array
{
return $this->getExpenses()->sortBy('transaction_amount');
$expenses = $this->getExpenses();
usort($expenses, function ($a, $b) {
return $a['amount'] <=> $b['amount'];
});
return $expenses;
}
/**
* Get the top income.
*
* @return Collection
* @return array
*/
public function getTopIncome(): Collection
public function getTopIncome(): array
{
return $this->getIncome()->sortByDesc('transaction_amount');
$income = $this->getIncome();
usort($income, function ($a, $b) {
return $b['amount'] <=> $a['amount'];
});
return $income;
}
/**
* Get averages from a collection.
*
* @param Collection $collection
* @param int $sortFlag
* @param array $array
* @param int $sortFlag
*
* @return array
*/
protected function getAverages(Collection $collection, int $sortFlag): array
protected function getAverages(array $array, int $sortFlag): array
{
$result = [];
/** @var Transaction $transaction */
foreach ($collection as $transaction) {
/** @var array $journal */
foreach ($array as $journal) {
// opposing name and ID:
$opposingId = $transaction->opposing_account_id;
$opposingId = $journal['destination_account_id'];
// is not set?
if (!isset($result[$opposingId])) {
$name = $transaction->opposing_account_name;
$name = $journal['destination_account_name'];
$result[$opposingId] = [
'name' => $name,
'count' => 1,
'id' => $opposingId,
'average' => $transaction->transaction_amount,
'sum' => $transaction->transaction_amount,
'average' => $journal['amount'],
'sum' => $journal['amount'],
];
continue;
}
++$result[$opposingId]['count'];
$result[$opposingId]['sum'] = bcadd($result[$opposingId]['sum'], $transaction->transaction_amount);
$result[$opposingId]['sum'] = bcadd($result[$opposingId]['sum'], $journal['amount']);
$result[$opposingId]['average'] = bcdiv($result[$opposingId]['sum'], (string)$result[$opposingId]['count']);
}
@@ -151,18 +160,18 @@ class Support
/**
* Summarize the data by account.
*
* @param Collection $collection
* @param array $array
*
* @return array
*/
protected function summarizeByAccount(Collection $collection): array
protected function summarizeByAccount(array $array): array
{
$result = [];
/** @var Transaction $transaction */
foreach ($collection as $transaction) {
$accountId = $transaction->account_id;
/** @var array $journal */
foreach ($array as $journal) {
$accountId = $journal['source_account_id'] ?? 0;
$result[$accountId] = $result[$accountId] ?? '0';
$result[$accountId] = bcadd($transaction->transaction_amount, $result[$accountId]);
$result[$accountId] = bcadd($journal['amount'], $result[$accountId]);
}
return $result;