Cleaned up the category and budget pie charts.

app/Generator/Report/Support.php

@@ -34,27 +34,7 @@ class Support
      */
     public static function filterExpenses(Collection $collection, array $accounts): Collection
     {
-        $result = $collection->filter(
-            function (Transaction $transaction) use ($accounts) {
-                $opposing = $transaction->opposing_account_id;
-                // remove internal transfer
-                if (in_array($opposing, $accounts)) {
-                    Log::debug(sprintf('Filtered #%d because its opposite is in accounts.', $transaction->id));
-
-                    return null;
-                }
-                // remove positive amount
-                if (bccomp($transaction->transaction_amount, '0') === 1) {
-                    Log::debug(sprintf('Filtered #%d because amount is %f.', $transaction->id, $transaction->transaction_amount));
-
-                    return null;
-                }
-
-                return $transaction;
-            }
-        );
-
-        return $result;
+        return self::filterTransactions($collection, $accounts, 1);
     }
 
     /**
@@ -64,9 +44,21 @@ class Support
      * @return Collection
      */
     public static function filterIncome(Collection $collection, array $accounts): Collection
+    {
+        return self::filterTransactions($collection, $accounts, -1);
+    }
+
+    /**
+     * @param Collection $collection
+     * @param array      $accounts
+     * @param int        $modifier
+     *
+     * @return Collection
+     */
+    public static function filterTransactions(Collection $collection, array $accounts, int $modifier): Collection
     {
         $result = $collection->filter(
-            function (Transaction $transaction) use ($accounts) {
+            function (Transaction $transaction) use ($accounts, $modifier) {
                 $opposing = $transaction->opposing_account_id;
                 // remove internal transfer
                 if (in_array($opposing, $accounts)) {
@@ -75,7 +67,7 @@ class Support
                     return null;
                 }
                 // remove positive amount
-                if (bccomp($transaction->transaction_amount, '0') === -1) {
+                if (bccomp($transaction->transaction_amount, '0') === $modifier) {
                     Log::debug(sprintf('Filtered #%d because amount is %f.', $transaction->id, $transaction->transaction_amount));
 
                     return null;

app/Helpers/Chart/MetaPieChart.php

@@ -0,0 +1,278 @@
+<?php
+/**
+ * MetaPieChart.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Helpers\Chart;
+
+use Carbon\Carbon;
+use FireflyIII\Generator\Report\Support;
+use FireflyIII\Helpers\Collector\JournalCollectorInterface;
+use FireflyIII\Models\Transaction;
+use FireflyIII\Models\TransactionType;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
+use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
+use FireflyIII\User;
+use Illuminate\Support\Collection;
+
+/**
+ * Class MetaPieChart
+ *
+ * @package FireflyIII\Helpers\Chart
+ */
+class MetaPieChart implements MetaPieChartInterface
+{
+    /** @var  Collection */
+    protected $accounts;
+    /** @var  Collection */
+    protected $budgets;
+    /** @var  Collection */
+    protected $categories;
+    /** @var bool */
+    protected $collectOtherObjects = false;
+    /** @var  Carbon */
+    protected $end;
+    /** @var array */
+    protected $grouping
+        = [
+            'account'  => ['opposing_account_id'],
+            'budget'   => ['transaction_journal_budget_id', 'transaction_budget_id'],
+            'category' => ['transaction_journal_category_id', 'transaction_category_id'],
+        ];
+
+    /** @var array */
+    protected $repositories
+        = [
+            'account'  => AccountRepositoryInterface::class,
+            'budget'   => BudgetRepositoryInterface::class,
+            'category' => CategoryRepositoryInterface::class,
+        ];
+
+
+    /** @var  Carbon */
+    protected $start;
+    /** @var  string */
+    protected $total = '0';
+    /** @var  User */
+    protected $user;
+
+    public function __construct()
+    {
+        $this->accounts   = new Collection;
+        $this->budgets    = new Collection;
+        $this->categories = new Collection;
+    }
+
+    /**
+     * @param string $direction
+     * @param string $group
+     *
+     * @return array
+     */
+    public function generate(string $direction, string $group): array
+    {
+        $transactions = $this->getTransactions($direction);
+        $grouped      = $this->groupByFields($transactions, $this->grouping[$group]);
+        $chartData    = $this->organizeByType($group, $grouped);
+
+        // also collect all other transactions
+        if ($this->collectOtherObjects && $direction === 'expense') {
+            /** @var JournalCollectorInterface $collector */
+            $collector = app(JournalCollectorInterface::class, [$this->user]);
+            $collector->setAccounts($this->accounts)->setRange($this->start, $this->end)->setTypes([TransactionType::WITHDRAWAL]);
+            $journals                                            = $collector->getJournals();
+            $sum                                                 = strval($journals->sum('transaction_amount'));
+            $sum                                                 = bcmul($sum, '-1');
+            $sum                                                 = bcsub($sum, $this->total);
+            $chartData[strval(trans('firefly.everything_else'))] = $sum;
+        }
+
+        if ($this->collectOtherObjects && $direction === 'income') {
+            /** @var JournalCollectorInterface $collector */
+            $collector = app(JournalCollectorInterface::class, [auth()->user()]);
+            $collector->setAccounts($this->accounts)->setRange($this->start, $this->end)->setTypes([TransactionType::DEPOSIT]);
+            $journals                                            = $collector->getJournals();
+            $sum                                                 = strval($journals->sum('transaction_amount'));
+            $sum                                                 = bcsub($sum, $this->total);
+            $chartData[strval(trans('firefly.everything_else'))] = $sum;
+        }
+
+        return $chartData;
+
+    }
+
+    /**
+     * @param Collection $accounts
+     *
+     * @return MetaPieChartInterface
+     */
+    public function setAccounts(Collection $accounts): MetaPieChartInterface
+    {
+        $this->accounts = $accounts;
+
+        return $this;
+    }
+
+    /**
+     * @param Collection $budgets
+     *
+     * @return MetaPieChartInterface
+     */
+    public function setBudgets(Collection $budgets): MetaPieChartInterface
+    {
+        $this->budgets = $budgets;
+
+        return $this;
+    }
+
+    /**
+     * @param Collection $categories
+     *
+     * @return MetaPieChartInterface
+     */
+    public function setCategories(Collection $categories): MetaPieChartInterface
+    {
+        $this->categories = $categories;
+
+        return $this;
+    }
+
+    /**
+     * @param bool $collectOtherObjects
+     *
+     * @return MetaPieChartInterface
+     */
+    public function setCollectOtherObjects(bool $collectOtherObjects): MetaPieChartInterface
+    {
+        $this->collectOtherObjects = $collectOtherObjects;
+
+        return $this;
+    }
+
+    /**
+     * @param Carbon $end
+     *
+     * @return MetaPieChartInterface
+     */
+    public function setEnd(Carbon $end): MetaPieChartInterface
+    {
+        $this->end = $end;
+
+        return $this;
+    }
+
+    /**
+     * @param Carbon $start
+     *
+     * @return MetaPieChartInterface
+     */
+    public function setStart(Carbon $start): MetaPieChartInterface
+    {
+        $this->start = $start;
+
+        return $this;
+    }
+
+    /**
+     * @param User $user
+     *
+     * @return MetaPieChartInterface
+     */
+    public function setUser(User $user): MetaPieChartInterface
+    {
+        $this->user = $user;
+
+        return $this;
+    }
+
+    protected function getTransactions(string $direction)
+    {
+        $types    = [TransactionType::DEPOSIT, TransactionType::TRANSFER];
+        $modifier = -1;
+        if ($direction === 'expense') {
+            $types    = [TransactionType::WITHDRAWAL, TransactionType::TRANSFER];
+            $modifier = 1;
+        }
+        /** @var JournalCollectorInterface $collector */
+        $collector = app(JournalCollectorInterface::class, [auth()->user()]);
+        $collector->setAccounts($this->accounts);
+        $collector->setRange($this->start, $this->end);
+        $collector->setTypes($types);
+        $collector->withOpposingAccount();
+
+        if ($direction === 'income') {
+            $collector->disableFilter();
+        }
+
+        if ($this->budgets->count() > 0) {
+            $collector->setBudgets($this->budgets);
+        }
+        if ($this->categories->count() > 0) {
+            $collector->setCategories($this->categories);
+        }
+
+        $accountIds   = $this->accounts->pluck('id')->toArray();
+        $transactions = $collector->getJournals();
+        $set          = Support::filterTransactions($transactions, $accountIds, $modifier);
+
+        return $set;
+    }
+
+    /**
+     * @param Collection $set
+     * @param array      $fields
+     *
+     * @return array
+     */
+    protected function groupByFields(Collection $set, array $fields)
+    {
+        $grouped = [];
+        /** @var Transaction $transaction */
+        foreach ($set as $transaction) {
+            $values = [];
+            foreach ($fields as $field) {
+                $values[] = intval($transaction->$field);
+            }
+            $value           = max($values);
+            $grouped[$value] = $grouped[$value] ?? '0';
+            $grouped[$value] = bcadd($transaction->transaction_amount, $grouped[$value]);
+        }
+
+        return $grouped;
+    }
+
+    /**
+     * @param string $type
+     * @param array  $array
+     *
+     * @return array
+     */
+    protected function organizeByType(string $type, array $array): array
+    {
+        $chartData  = [];
+        $names      = [];
+        $repository = app($this->repositories[$type], [$this->user]);
+        foreach ($array as $objectId => $amount) {
+            if (!isset($names[$objectId])) {
+                $object           = $repository->find(intval($objectId));
+                $names[$objectId] = $object->name;
+            }
+            if (bccomp($amount, '0') === -1) {
+                $amount = bcmul($amount, '-1');
+            }
+
+            $this->total                  = bcadd($this->total, $amount);
+            $chartData[$names[$objectId]] = $amount;
+        }
+
+        return $chartData;
+
+    }
+}

app/Helpers/Chart/MetaPieChartInterface.php

@@ -0,0 +1,82 @@
+<?php
+/**
+ * MetaPieChartInterface.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Helpers\Chart;
+
+use Carbon\Carbon;
+use FireflyIII\User;
+use Illuminate\Support\Collection;
+
+/**
+ * Interface MetaPieChartInterface
+ *
+ * @package FireflyIII\Helpers\Chart
+ */
+interface MetaPieChartInterface
+{
+    /**
+     * @param string $direction
+     * @param string $group
+     *
+     * @return array
+     */
+    public function generate(string $direction, string $group): array;
+
+    /**
+     * @param Collection $accounts
+     *
+     * @return MetaPieChartInterface
+     */
+    public function setAccounts(Collection $accounts): MetaPieChartInterface;
+
+    /**
+     * @param Collection $budgets
+     *
+     * @return MetaPieChartInterface
+     */
+    public function setBudgets(Collection $budgets): MetaPieChartInterface;
+
+    /**
+     * @param Collection $categories
+     *
+     * @return MetaPieChartInterface
+     */
+    public function setCategories(Collection $categories): MetaPieChartInterface;
+
+    /**
+     * @param bool $collectOtherObjects
+     *
+     * @return MetaPieChartInterface
+     */
+    public function setCollectOtherObjects(bool $collectOtherObjects): MetaPieChartInterface;
+
+    /**
+     * @param Carbon $end
+     *
+     * @return MetaPieChartInterface
+     */
+    public function setEnd(Carbon $end): MetaPieChartInterface;
+
+    /**
+     * @param Carbon $start
+     *
+     * @return MetaPieChartInterface
+     */
+    public function setStart(Carbon $start): MetaPieChartInterface;
+
+    /**
+     * @param User $user
+     *
+     * @return MetaPieChartInterface
+     */
+    public function setUser(User $user): MetaPieChartInterface;
+
+}

app/Http/Controllers/Chart/BudgetReportController.php

@@ -17,6 +17,7 @@ namespace FireflyIII\Http\Controllers\Chart;
 use Carbon\Carbon;
 use FireflyIII\Generator\Chart\Basic\GeneratorInterface;
 use FireflyIII\Generator\Report\Category\MonthReportGenerator;
+use FireflyIII\Helpers\Chart\MetaPieChartInterface;
 use FireflyIII\Helpers\Collector\JournalCollectorInterface;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\Budget;
@@ -75,51 +76,19 @@ class BudgetReportController extends Controller
      */
     public function accountExpense(Collection $accounts, Collection $budgets, Carbon $start, Carbon $end, string $others)
     {
-        /** @var bool $others */
-        $others = intval($others) === 1;
-        $cache  = new CacheProperties;
-        $cache->addProperty('chart.budget.report.account-expense');
-        $cache->addProperty($accounts);
-        $cache->addProperty($budgets);
-        $cache->addProperty($start);
-        $cache->addProperty($end);
-        $cache->addProperty($others);
-        if ($cache->has()) {
-            return Response::json($cache->get());
-        }
-
-        $names     = [];
-        $set       = $this->getExpenses($accounts, $budgets, $start, $end);
-        $grouped   = $this->groupByOpposingAccount($set);
-        $chartData = [];
-        $total     = '0';
-
-        foreach ($grouped as $accountId => $amount) {
-            if (!isset($names[$accountId])) {
-                $account           = $this->accountRepository->find(intval($accountId));
-                $names[$accountId] = $account->name;
-            }
-            $amount                        = bcmul($amount, '-1');
-            $total                         = bcadd($total, $amount);
-            $chartData[$names[$accountId]] = $amount;
-        }
-
-        // also collect all transactions NOT in these budgets.
-        if ($others) {
-            /** @var JournalCollectorInterface $collector */
-            $collector = app(JournalCollectorInterface::class, [auth()->user()]);
-            $collector->setAccounts($accounts)->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL]);
-            $journals                                            = $collector->getJournals();
-            $sum                                                 = strval($journals->sum('transaction_amount'));
-            $sum                                                 = bcmul($sum, '-1');
-            $sum                                                 = bcsub($sum, $total);
-            $chartData[strval(trans('firefly.everything_else'))] = $sum;
-        }
-
-        $data = $this->generator->pieChart($chartData);
-        $cache->store($data);
+        /** @var MetaPieChartInterface $helper */
+        $helper = app(MetaPieChartInterface::class);
+        $helper->setAccounts($accounts);
+        $helper->setBudgets($budgets);
+        $helper->setUser(auth()->user());
+        $helper->setStart($start);
+        $helper->setEnd($end);
+        $helper->setCollectOtherObjects(intval($others) === 1);
+        $chartData = $helper->generate('expense', 'account');
+        $data      = $this->generator->pieChart($chartData);
 
         return Response::json($data);
+
     }
 
     /**
@@ -133,49 +102,16 @@ class BudgetReportController extends Controller
      */
     public function budgetExpense(Collection $accounts, Collection $budgets, Carbon $start, Carbon $end, string $others)
     {
-        /** @var bool $others */
-        $others = intval($others) === 1;
-        $cache  = new CacheProperties;
-        $cache->addProperty('chart.budget.report.budget-expense');
-        $cache->addProperty($accounts);
-        $cache->addProperty($budgets);
-        $cache->addProperty($start);
-        $cache->addProperty($end);
-        $cache->addProperty($others);
-        if ($cache->has()) {
-            return Response::json($cache->get());
-        }
-
-        $names     = [];
-        $set       = $this->getExpenses($accounts, $budgets, $start, $end);
-        $grouped   = $this->groupByBudget($set);
-        $total     = '0';
-        $chartData = [];
-
-        foreach ($grouped as $budgetId => $amount) {
-            if (!isset($names[$budgetId])) {
-                $budget           = $this->budgetRepository->find(intval($budgetId));
-                $names[$budgetId] = $budget->name;
-            }
-            $amount                       = bcmul($amount, '-1');
-            $total                        = bcadd($total, $amount);
-            $chartData[$names[$budgetId]] = $amount;
-        }
-
-        // also collect all transactions NOT in these budgets.
-        if ($others) {
-            /** @var JournalCollectorInterface $collector */
-            $collector = app(JournalCollectorInterface::class, [auth()->user()]);
-            $collector->setAccounts($accounts)->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL]);
-            $journals                                            = $collector->getJournals();
-            $sum                                                 = strval($journals->sum('transaction_amount'));
-            $sum                                                 = bcmul($sum, '-1');
-            $sum                                                 = bcsub($sum, $total);
-            $chartData[strval(trans('firefly.everything_else'))] = $sum;
-        }
-
-        $data = $this->generator->pieChart($chartData);
-        $cache->store($data);
+        /** @var MetaPieChartInterface $helper */
+        $helper = app(MetaPieChartInterface::class);
+        $helper->setAccounts($accounts);
+        $helper->setBudgets($budgets);
+        $helper->setUser(auth()->user());
+        $helper->setStart($start);
+        $helper->setEnd($end);
+        $helper->setCollectOtherObjects(intval($others) === 1);
+        $chartData = $helper->generate('expense', 'budget');
+        $data      = $this->generator->pieChart($chartData);
 
         return Response::json($data);
     }

app/Http/Controllers/Chart/CategoryReportController.php

@@ -17,6 +17,7 @@ namespace FireflyIII\Http\Controllers\Chart;
 use Carbon\Carbon;
 use FireflyIII\Generator\Chart\Basic\GeneratorInterface;
 use FireflyIII\Generator\Report\Category\MonthReportGenerator;
+use FireflyIII\Helpers\Chart\MetaPieChartInterface;
 use FireflyIII\Helpers\Collector\JournalCollectorInterface;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\Category;
@@ -75,49 +76,16 @@ class CategoryReportController extends Controller
      */
     public function accountExpense(Collection $accounts, Collection $categories, Carbon $start, Carbon $end, string $others)
     {
-        /** @var bool $others */
-        $others = intval($others) === 1;
-        $cache  = new CacheProperties;
-        $cache->addProperty('chart.category.report.account-expense');
-        $cache->addProperty($accounts);
-        $cache->addProperty($categories);
-        $cache->addProperty($start);
-        $cache->addProperty($end);
-        $cache->addProperty($others);
-        if ($cache->has()) {
-            return Response::json($cache->get());
-        }
-
-        $names     = [];
-        $set       = $this->getExpenses($accounts, $categories, $start, $end);
-        $grouped   = $this->groupByOpposingAccount($set);
-        $chartData = [];
-        $total     = '0';
-
-        foreach ($grouped as $accountId => $amount) {
-            if (!isset($names[$accountId])) {
-                $account           = $this->accountRepository->find(intval($accountId));
-                $names[$accountId] = $account->name;
-            }
-            $amount                        = bcmul($amount, '-1');
-            $total                         = bcadd($total, $amount);
-            $chartData[$names[$accountId]] = $amount;
-        }
-
-        // also collect all transactions NOT in these categories.
-        if ($others) {
-            /** @var JournalCollectorInterface $collector */
-            $collector = app(JournalCollectorInterface::class, [auth()->user()]);
-            $collector->setAccounts($accounts)->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL]);
-            $journals                                            = $collector->getJournals();
-            $sum                                                 = strval($journals->sum('transaction_amount'));
-            $sum                                                 = bcmul($sum, '-1');
-            $sum                                                 = bcsub($sum, $total);
-            $chartData[strval(trans('firefly.everything_else'))] = $sum;
-        }
-
-        $data = $this->generator->pieChart($chartData);
-        $cache->store($data);
+        /** @var MetaPieChartInterface $helper */
+        $helper = app(MetaPieChartInterface::class);
+        $helper->setAccounts($accounts);
+        $helper->setCategories($categories);
+        $helper->setUser(auth()->user());
+        $helper->setStart($start);
+        $helper->setEnd($end);
+        $helper->setCollectOtherObjects(intval($others) === 1);
+        $chartData = $helper->generate('expense', 'account');
+        $data      = $this->generator->pieChart($chartData);
 
         return Response::json($data);
     }
@@ -133,48 +101,16 @@ class CategoryReportController extends Controller
      */
     public function accountIncome(Collection $accounts, Collection $categories, Carbon $start, Carbon $end, string $others)
     {
-        /** @var bool $others */
-        $others = intval($others) === 1;
-        $cache  = new CacheProperties;
-        $cache->addProperty('chart.category.report.account-income');
-        $cache->addProperty($accounts);
-        $cache->addProperty($categories);
-        $cache->addProperty($start);
-        $cache->addProperty($others);
-        $cache->addProperty($end);
-        if ($cache->has()) {
-            return Response::json($cache->get());
-        }
-
-
-        $names     = [];
-        $set       = $this->getIncome($accounts, $categories, $start, $end);
-        $grouped   = $this->groupByOpposingAccount($set);
-        $chartData = [];
-        $total     = '0';
-
-        foreach ($grouped as $accountId => $amount) {
-            if (!isset($names[$accountId])) {
-                $account           = $this->accountRepository->find(intval($accountId));
-                $names[$accountId] = $account->name;
-            }
-            $total                         = bcadd($total, $amount);
-            $chartData[$names[$accountId]] = $amount;
-        }
-
-        // also collect others?
-        if ($others) {
-            /** @var JournalCollectorInterface $collector */
-            $collector = app(JournalCollectorInterface::class, [auth()->user()]);
-            $collector->setAccounts($accounts)->setRange($start, $end)->setTypes([TransactionType::DEPOSIT]);
-            $journals                                            = $collector->getJournals();
-            $sum                                                 = strval($journals->sum('transaction_amount'));
-            $sum                                                 = bcsub($sum, $total);
-            $chartData[strval(trans('firefly.everything_else'))] = $sum;
-        }
-
-        $data = $this->generator->pieChart($chartData);
-        $cache->store($data);
+        /** @var MetaPieChartInterface $helper */
+        $helper = app(MetaPieChartInterface::class);
+        $helper->setAccounts($accounts);
+        $helper->setCategories($categories);
+        $helper->setUser(auth()->user());
+        $helper->setStart($start);
+        $helper->setEnd($end);
+        $helper->setCollectOtherObjects(intval($others) === 1);
+        $chartData = $helper->generate('income', 'account');
+        $data      = $this->generator->pieChart($chartData);
 
         return Response::json($data);
     }
@@ -190,49 +126,16 @@ class CategoryReportController extends Controller
      */
     public function categoryExpense(Collection $accounts, Collection $categories, Carbon $start, Carbon $end, string $others)
     {
-        /** @var bool $others */
-        $others = intval($others) === 1;
-        $cache  = new CacheProperties;
-        $cache->addProperty('chart.category.report.category-expense');
-        $cache->addProperty($accounts);
-        $cache->addProperty($categories);
-        $cache->addProperty($start);
-        $cache->addProperty($end);
-        $cache->addProperty($others);
-        if ($cache->has()) {
-            return Response::json($cache->get());
-        }
-
-        $names     = [];
-        $set       = $this->getExpenses($accounts, $categories, $start, $end);
-        $grouped   = $this->groupByCategory($set);
-        $total     = '0';
-        $chartData = [];
-
-        foreach ($grouped as $categoryId => $amount) {
-            if (!isset($names[$categoryId])) {
-                $category           = $this->categoryRepository->find(intval($categoryId));
-                $names[$categoryId] = $category->name;
-            }
-            $amount                         = bcmul($amount, '-1');
-            $total                          = bcadd($total, $amount);
-            $chartData[$names[$categoryId]] = $amount;
-        }
-
-        // also collect all transactions NOT in these categories.
-        if ($others) {
-            /** @var JournalCollectorInterface $collector */
-            $collector = app(JournalCollectorInterface::class, [auth()->user()]);
-            $collector->setAccounts($accounts)->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL]);
-            $journals                                            = $collector->getJournals();
-            $sum                                                 = strval($journals->sum('transaction_amount'));
-            $sum                                                 = bcmul($sum, '-1');
-            $sum                                                 = bcsub($sum, $total);
-            $chartData[strval(trans('firefly.everything_else'))] = $sum;
-        }
-
-        $data = $this->generator->pieChart($chartData);
-        $cache->store($data);
+        /** @var MetaPieChartInterface $helper */
+        $helper = app(MetaPieChartInterface::class);
+        $helper->setAccounts($accounts);
+        $helper->setCategories($categories);
+        $helper->setUser(auth()->user());
+        $helper->setStart($start);
+        $helper->setEnd($end);
+        $helper->setCollectOtherObjects(intval($others) === 1);
+        $chartData = $helper->generate('expense', 'category');
+        $data      = $this->generator->pieChart($chartData);
 
         return Response::json($data);
     }
@@ -248,46 +151,17 @@ class CategoryReportController extends Controller
      */
     public function categoryIncome(Collection $accounts, Collection $categories, Carbon $start, Carbon $end, string $others)
     {
-        /** @var bool $others */
-        $others = intval($others) === 1;
-        $cache  = new CacheProperties;
-        $cache->addProperty('chart.category.report.category-income');
-        $cache->addProperty($accounts);
-        $cache->addProperty($categories);
-        $cache->addProperty($start);
-        $cache->addProperty($end);
-        $cache->addProperty($others);
-        if ($cache->has()) {
-            return Response::json($cache->get());
-        }
 
-        $names     = [];
-        $set       = $this->getIncome($accounts, $categories, $start, $end);
-        $grouped   = $this->groupByCategory($set);
-        $total     = '0';
-        $chartData = [];
-
-        foreach ($grouped as $categoryId => $amount) {
-            if (!isset($names[$categoryId])) {
-                $category           = $this->categoryRepository->find(intval($categoryId));
-                $names[$categoryId] = $category->name;
-            }
-            $total                          = bcadd($total, $amount);
-            $chartData[$names[$categoryId]] = $amount;
-        }
-
-        if ($others) {
-            /** @var JournalCollectorInterface $collector */
-            $collector = app(JournalCollectorInterface::class, [auth()->user()]);
-            $collector->setAccounts($accounts)->setRange($start, $end)->setTypes([TransactionType::DEPOSIT]);
-            $journals                                            = $collector->getJournals();
-            $sum                                                 = strval($journals->sum('transaction_amount'));
-            $sum                                                 = bcsub($sum, $total);
-            $chartData[strval(trans('firefly.everything_else'))] = $sum;
-        }
-
-        $data = $this->generator->pieChart($chartData);
-        $cache->store($data);
+        /** @var MetaPieChartInterface $helper */
+        $helper = app(MetaPieChartInterface::class);
+        $helper->setAccounts($accounts);
+        $helper->setCategories($categories);
+        $helper->setUser(auth()->user());
+        $helper->setStart($start);
+        $helper->setEnd($end);
+        $helper->setCollectOtherObjects(intval($others) === 1);
+        $chartData = $helper->generate('income', 'category');
+        $data      = $this->generator->pieChart($chartData);
 
         return Response::json($data);
     }

app/Providers/FireflyServiceProvider.php

@@ -96,6 +96,9 @@ class FireflyServiceProvider extends ServiceProvider
         // chart generator:
         $this->app->bind('FireflyIII\Generator\Chart\Basic\GeneratorInterface', 'FireflyIII\Generator\Chart\Basic\ChartJsGenerator');
 
+        // chart builder
+        $this->app->bind('FireflyIII\Helpers\Chart\MetaPieChartInterface', 'FireflyIII\Helpers\Chart\MetaPieChart');
+
         // other generators
         $this->app->bind('FireflyIII\Export\ProcessorInterface', 'FireflyIII\Export\Processor');
         $this->app->bind('FireflyIII\Import\ImportProcedureInterface', 'FireflyIII\Import\ImportProcedure');

resources/views/reports/budget/month.twig

@@ -80,7 +80,7 @@
                         </div>
                         <label style="font-weight:normal;">
                             <input type="checkbox" id="budgets-out-pie-chart-checked">
-                            <small>{{ 'include_not_in_budget'|_ }}</small>
+                            <small>{{ 'include_expense_not_in_budget'|_ }}</small>
                         </label>
                     </div>
                 </div>
@@ -97,7 +97,7 @@
                     </div>
                     <label style="font-weight:normal;">
                         <input type="checkbox" id="accounts-out-pie-chart-checked">
-                        <small>{{ 'include_not_in_budget'|_ }}</small>
+                        <small>{{ 'include_expense_not_in_account'|_ }}</small>
                     </label>
                 </div>
             </div>

resources/views/reports/category/month.twig

@@ -90,7 +90,7 @@
                         <canvas id="categories-in-pie-chart" style="margin:0 auto;" height="150" width="150"></canvas>
                         <label style="font-weight:normal;">
                             <input type="checkbox" id="categories-in-pie-chart-checked">
-                            <small>{{ 'include_not_in_category'|_ }}</small>
+                            <small>{{ 'include_income_not_in_category'|_ }}</small>
                         </label>
                     </div>
                 </div>
@@ -104,7 +104,7 @@
                         <canvas id="categories-out-pie-chart" style="margin:0 auto;" height="150" width="150"></canvas>
                         <label style="font-weight:normal;">
                             <input type="checkbox" id="categories-out-pie-chart-checked">
-                            <small>{{ 'include_not_in_category'|_ }}</small>
+                            <small>{{ 'include_expense_not_in_category'|_ }}</small>
                         </label>
                     </div>
                 </div>
@@ -119,7 +119,7 @@
                     <canvas id="accounts-in-pie-chart" style="margin:0 auto;" height="150" width="150"></canvas>
                     <label style="font-weight:normal;">
                         <input type="checkbox" id="accounts-in-pie-chart-checked">
-                        <small>{{ 'include_not_in_category'|_ }}</small>
+                        <small>{{ 'include_income_not_in_account'|_ }}</small>
                     </label>
                 </div>
             </div>
@@ -133,7 +133,7 @@
                     <canvas id="accounts-out-pie-chart" style="margin:0 auto;" height="150" width="150"></canvas>
                     <label style="font-weight:normal;">
                         <input type="checkbox" id="accounts-out-pie-chart-checked">
-                        <small>{{ 'include_not_in_category'|_ }}</small>
+                        <small>{{ 'include_expenses_not_in_account'|_ }}</small>
                     </label>
                 </div>
             </div>