Move get income / get expense methods to trait.

app/Http/Controllers/Chart/ExpenseReportController.php

@@ -25,14 +25,12 @@ namespace FireflyIII\Http\Controllers\Chart;
 
 use Carbon\Carbon;
 use FireflyIII\Generator\Chart\Basic\GeneratorInterface;
-use FireflyIII\Helpers\Collector\JournalCollectorInterface;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\Account;
-use FireflyIII\Models\AccountType;
-use FireflyIII\Models\Transaction;
-use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Support\CacheProperties;
+use FireflyIII\Support\Http\Controllers\AugumentData;
+use FireflyIII\Support\Http\Controllers\TransactionCalculation;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Collection;
 
@@ -43,6 +41,7 @@ use Illuminate\Support\Collection;
  */
 class ExpenseReportController extends Controller
 {
+    use AugumentData, TransactionCalculation;
     /** @var AccountRepositoryInterface The account repository */
     protected $accountRepository;
     /** @var GeneratorInterface Chart generation methods. */
@@ -104,6 +103,10 @@ class ExpenseReportController extends Controller
         }
 
         // prep chart data:
+        /**
+         * @var string     $name
+         * @var Collection $combi
+         */
         foreach ($combined as $name => $combi) {
             // first is always expense account:
             /** @var Account $exp */
@@ -145,8 +148,8 @@ class ExpenseReportController extends Controller
             $currentEnd = $currentEnd->$function();
 
             // get expenses grouped by opposing name:
-            $expenses = $this->groupByName($this->getExpenses($accounts, $all, $currentStart, $currentEnd));
-            $income   = $this->groupByName($this->getIncome($accounts, $all, $currentStart, $currentEnd));
+            $expenses = $this->groupByName($this->getExpensesForOpposing($accounts, $all, $currentStart, $currentEnd));
+            $income   = $this->groupByName($this->getIncomeForOpposing($accounts, $all, $currentStart, $currentEnd));
             $label    = $currentStart->formatLocalized($format);
 
             foreach ($combined as $name => $combi) {
@@ -191,89 +194,4 @@ class ExpenseReportController extends Controller
 
         return response()->json($data);
     }
-
-    /**
-     * Searches for the opposing account.
-     *
-     * @param Collection $accounts
-     *
-     * @return array
-     */
-    protected function combineAccounts(Collection $accounts): array // filter + group data
-    {
-        $combined = [];
-        /** @var Account $expenseAccount */
-        foreach ($accounts as $expenseAccount) {
-            $collection = new Collection;
-            $collection->push($expenseAccount);
-
-            $revenue = $this->accountRepository->findByName($expenseAccount->name, [AccountType::REVENUE]);
-            if (null !== $revenue) {
-                $collection->push($revenue);
-            }
-            $combined[$expenseAccount->name] = $collection;
-        }
-
-        return $combined;
-    }
-
-    /**
-     * Get all expenses for a set of accounts.
-     *
-     * @param Collection $accounts
-     * @param Collection $opposing
-     * @param Carbon     $start
-     * @param Carbon     $end
-     *
-     * @return Collection
-     */
-    protected function getExpenses(Collection $accounts, Collection $opposing, Carbon $start, Carbon $end): Collection // get data + augument
-    {
-        /** @var JournalCollectorInterface $collector */
-        $collector = app(JournalCollectorInterface::class);
-        $collector->setAccounts($accounts)->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL])->setOpposingAccounts($opposing);
-
-        return $collector->getJournals();
-    }
-
-    /**
-     * Get the income for a set of accounts.
-     *
-     * @param Collection $accounts
-     * @param Collection $opposing
-     * @param Carbon     $start
-     * @param Carbon     $end
-     *
-     * @return Collection
-     */
-    protected function getIncome(Collection $accounts, Collection $opposing, Carbon $start, Carbon $end): Collection // get data + augument
-    {
-        /** @var JournalCollectorInterface $collector */
-        /** @var JournalCollectorInterface $collector */
-        $collector = app(JournalCollectorInterface::class);
-        $collector->setAccounts($accounts)->setRange($start, $end)->setTypes([TransactionType::DEPOSIT])->setOpposingAccounts($opposing);
-
-        return $collector->getJournals();
-    }
-
-    /**
-     * Group set of transactions by name of opposing account.
-     *
-     * @param Collection $set
-     *
-     * @return array
-     */
-    protected function groupByName(Collection $set): array // filter + group data
-    {
-        // group by opposing account name.
-        $grouped = [];
-        /** @var Transaction $transaction */
-        foreach ($set as $transaction) {
-            $name           = $transaction->opposing_account_name;
-            $grouped[$name] = $grouped[$name] ?? '0';
-            $grouped[$name] = bcadd($transaction->transaction_amount, $grouped[$name]);
-        }
-
-        return $grouped;
-    }
 }