Remove view generation and put in trait.

app/Http/Controllers/Popup/ReportController.php

@@ -22,17 +22,11 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Popup;
 
-use FireflyIII\Helpers\Collection\BalanceLine;
-use FireflyIII\Helpers\Report\PopupReportInterface;
 use FireflyIII\Http\Controllers\Controller;
-use FireflyIII\Repositories\Account\AccountRepositoryInterface;
-use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
-use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
+use FireflyIII\Support\Http\Controllers\RenderPartialViews;
 use FireflyIII\Support\Http\Controllers\RequestInformation;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
-use Log;
-use Throwable;
 
 /**
  * Class ReportController.
@@ -41,40 +35,7 @@ use Throwable;
  */
 class ReportController extends Controller
 {
-    use RequestInformation;
-    /** @var AccountRepositoryInterface The account repository */
-    private $accountRepository;
-    /** @var BudgetRepositoryInterface The budget repository */
-    private $budgetRepository;
-    /** @var CategoryRepositoryInterface The category repository */
-    private $categoryRepository;
-    /** @var PopupReportInterface Various helper functions. */
-    private $popupHelper;
-
-    /**
-     * ReportController constructor.
-     */
-    public function __construct()
-    {
-        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                /** @var AccountRepositoryInterface accountRepository */
-                $this->accountRepository = app(AccountRepositoryInterface::class);
-
-                /** @var BudgetRepositoryInterface budgetRepository */
-                $this->budgetRepository = app(BudgetRepositoryInterface::class);
-
-                /** @var CategoryRepositoryInterface categoryRepository */
-                $this->categoryRepository = app(CategoryRepositoryInterface::class);
-
-                /** @var PopupReportInterface popupHelper */
-                $this->popupHelper = app(PopupReportInterface::class);
-
-                return $next($request);
-            }
-        );
-    }
+    use RequestInformation, RenderPartialViews;
 
     /**
      * Generate popup view.
@@ -116,147 +77,5 @@ class ReportController extends Controller
         return response()->json(['html' => $html]);
     }
 
-    /**
-     * View for balance row.
-     *
-     * @param array $attributes
-     *
-     * @return string
-     *
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     */
-    protected function balanceAmount(array $attributes): string // generate view for report.
-    {
-        $role    = (int)$attributes['role'];
-        $budget  = $this->budgetRepository->findNull((int)$attributes['budgetId']);
-        $account = $this->accountRepository->findNull((int)$attributes['accountId']);
-
-
-        switch (true) {
-            case BalanceLine::ROLE_DEFAULTROLE === $role && null !== $budget && null !== $account:
-                // normal row with a budget:
-                $journals = $this->popupHelper->balanceForBudget($budget, $account, $attributes);
-                break;
-            case BalanceLine::ROLE_DEFAULTROLE === $role && null === $budget && null !== $account:
-                // normal row without a budget:
-                $journals     = $this->popupHelper->balanceForNoBudget($account, $attributes);
-                $budget->name = (string)trans('firefly.no_budget');
-                break;
-            case BalanceLine::ROLE_TAGROLE === $role:
-                // row with tag info.
-                return 'Firefly cannot handle this type of info-button (BalanceLine::TagRole)';
-        }
-        try {
-            $view = view('popup.report.balance-amount', compact('journals', 'budget', 'account'))->render();
-        } catch (Throwable $e) {
-            Log::error(sprintf('Could not render: %s', $e->getMessage()));
-            $view = 'Firefly III could not render the view. Please see the log files.';
-        }
-
-        return $view;
-    }
-
-    /**
-     * View for spent in a single budget.
-     *
-     * @param array $attributes
-     *
-     * @return string
-     */
-    protected function budgetSpentAmount(array $attributes): string // generate view for report.
-    {
-        $budget = $this->budgetRepository->findNull((int)$attributes['budgetId']);
-        if (null === $budget) {
-            return 'This is an unknown budget. Apologies.';
-        }
-        $journals = $this->popupHelper->byBudget($budget, $attributes);
-        try {
-            $view = view('popup.report.budget-spent-amount', compact('journals', 'budget'))->render();
-        } catch (Throwable $e) {
-            Log::error(sprintf('Could not render: %s', $e->getMessage()));
-            $view = 'Firefly III could not render the view. Please see the log files.';
-        }
-
-        return $view;
-    }
-
-    /**
-     * View for transactions in a category.
-     *
-     * @param array $attributes
-     *
-     * @return string
-     */
-    protected function categoryEntry(array $attributes): string // generate view for report.
-    {
-        $category = $this->categoryRepository->findNull((int)$attributes['categoryId']);
-
-        if (null === $category) {
-            return 'This is an unknown category. Apologies.';
-        }
-
-        $journals = $this->popupHelper->byCategory($category, $attributes);
-        try {
-            $view = view('popup.report.category-entry', compact('journals', 'category'))->render();
-        } catch (Throwable $e) {
-            Log::error(sprintf('Could not render: %s', $e->getMessage()));
-            $view = 'Firefly III could not render the view. Please see the log files.';
-        }
-
-        return $view;
-    }
-
-    /**
-     * Returns all the expenses that went to the given expense account.
-     *
-     * @param array $attributes
-     *
-     * @return string
-     */
-    protected function expenseEntry(array $attributes): string // generate view for report.
-    {
-        $account = $this->accountRepository->findNull((int)$attributes['accountId']);
-
-        if (null === $account) {
-            return 'This is an unknown account. Apologies.';
-        }
-
-        $journals = $this->popupHelper->byExpenses($account, $attributes);
-        try {
-            $view = view('popup.report.expense-entry', compact('journals', 'account'))->render();
-        } catch (Throwable $e) {
-            Log::error(sprintf('Could not render: %s', $e->getMessage()));
-            $view = 'Firefly III could not render the view. Please see the log files.';
-        }
-
-        return $view;
-    }
-
-    /**
-     * Returns all the incomes that went to the given asset account.
-     *
-     * @param array $attributes
-     *
-     * @return string
-     */
-    protected function incomeEntry(array $attributes): string // generate view for report.
-    {
-        $account = $this->accountRepository->findNull((int)$attributes['accountId']);
-
-        if (null === $account) {
-            return 'This is an unknown category. Apologies.';
-        }
-
-        $journals = $this->popupHelper->byIncome($account, $attributes);
-        try {
-            $view = view('popup.report.income-entry', compact('journals', 'account'))->render();
-        } catch (Throwable $e) {
-            Log::error(sprintf('Could not render: %s', $e->getMessage()));
-            $view = 'Firefly III could not render the view. Please see the log files.';
-        }
-
-        return $view;
-    }
-
 
 }