kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-17 07:08:19 +00:00
Code Issues Projects Releases Wiki Activity

Optimize imports.

Browse Source
This commit is contained in:
James Cole
2018-03-10 20:30:09 +01:00
parent da1dc67e1c
commit dd2f3c861b
35 changed files with 125 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
app/Http/Controllers/Chart/AccountController.php
View File

@@ -38,7 +38,6 @@ use FireflyIII\Support\CacheProperties;
use Illuminate\Support\Collection;
use Log;
use Preferences;
use Response;
/** checked
* Class AccountController.
@@ -74,7 +73,7 @@ class AccountController extends Controller
$cache->addProperty($end);
$cache->addProperty('chart.account.expense-accounts');
if ($cache->has()) {
return Response::json($cache->get()); // @codeCoverageIgnore
return response()->json($cache->get()); // @codeCoverageIgnore
}
$start->subDay();
@@ -97,7 +96,7 @@ class AccountController extends Controller
$data = $this->generator->singleSet(strval(trans('firefly.spent')), $chartData);
$cache->store($data);
return Response::json($data);
return response()->json($data);
}
/**
@@ -115,7 +114,7 @@ class AccountController extends Controller
$cache->addProperty($end);
$cache->addProperty('chart.account.expense-budget');
if ($cache->has()) {
return Response::json($cache->get()); // @codeCoverageIgnore
return response()->json($cache->get()); // @codeCoverageIgnore
}
$collector = app(JournalCollectorInterface::class);
$collector->setAccounts(new Collection([$account]))->setRange($start, $end)->withBudgetInformation()->setTypes([TransactionType::WITHDRAWAL]);
@@ -140,7 +139,7 @@ class AccountController extends Controller
$data = $this->generator->pieChart($chartData);
$cache->store($data);
return Response::json($data);
return response()->json($data);
}
/**
@@ -172,7 +171,7 @@ class AccountController extends Controller
$cache->addProperty($end);
$cache->addProperty('chart.account.expense-category');
if ($cache->has()) {
return Response::json($cache->get()); // @codeCoverageIgnore
return response()->json($cache->get()); // @codeCoverageIgnore
}
$collector = app(JournalCollectorInterface::class);
@@ -197,7 +196,7 @@ class AccountController extends Controller
$data = $this->generator->pieChart($chartData);
$cache->store($data);
return Response::json($data);
return response()->json($data);
}
/**
@@ -236,7 +235,7 @@ class AccountController extends Controller
}
$accounts = $repository->getAccountsById($frontPage->data);
return Response::json($this->accountBalanceChart($accounts, $start, $end));
return response()->json($this->accountBalanceChart($accounts, $start, $end));
}
/**
@@ -254,7 +253,7 @@ class AccountController extends Controller
$cache->addProperty($end);
$cache->addProperty('chart.account.income-category');
if ($cache->has()) {
return Response::json($cache->get()); // @codeCoverageIgnore
return response()->json($cache->get()); // @codeCoverageIgnore
}
// grab all journals:
@@ -279,7 +278,7 @@ class AccountController extends Controller
$data = $this->generator->pieChart($chartData);
$cache->store($data);
return Response::json($data);
return response()->json($data);
}
/**
@@ -310,7 +309,7 @@ class AccountController extends Controller
$cache->addProperty($end);
$cache->addProperty($account->id);
if ($cache->has()) {
return Response::json($cache->get()); // @codeCoverageIgnore
return response()->json($cache->get()); // @codeCoverageIgnore
}
// depending on diff, do something with range of chart.
$step = '1D';
@@ -356,7 +355,7 @@ class AccountController extends Controller
$data = $this->generator->singleSet($account->name, $chartData);
$cache->store($data);
return Response::json($data);
return response()->json($data);
}
/**
@@ -370,7 +369,7 @@ class AccountController extends Controller
*/
public function report(Collection $accounts, Carbon $start, Carbon $end)
{
return Response::json($this->accountBalanceChart($accounts, $start, $end));
return response()->json($this->accountBalanceChart($accounts, $start, $end));
}
/**
@@ -390,7 +389,7 @@ class AccountController extends Controller
$cache->addProperty($end);
$cache->addProperty('chart.account.revenue-accounts');
if ($cache->has()) {
return Response::json($cache->get()); // @codeCoverageIgnore
return response()->json($cache->get()); // @codeCoverageIgnore
}
$accounts = $repository->getAccountsByType([AccountType::REVENUE]);
@@ -413,7 +412,7 @@ class AccountController extends Controller
$data = $this->generator->singleSet(strval(trans('firefly.earned')), $chartData);
$cache->store($data);
return Response::json($data);
return response()->json($data);
}
/**

9
app/Http/Controllers/Chart/BillController.php
View File

@@ -31,7 +31,6 @@ use FireflyIII\Models\Transaction;
use FireflyIII\Repositories\Bill\BillRepositoryInterface;
use FireflyIII\Support\CacheProperties;
use Illuminate\Support\Collection;
use Response;
/**
* Class BillController.
@@ -66,7 +65,7 @@ class BillController extends Controller
$cache->addProperty($end);
$cache->addProperty('chart.bill.frontpage');
if ($cache->has()) {
return Response::json($cache->get()); // @codeCoverageIgnore
return response()->json($cache->get()); // @codeCoverageIgnore
}
$paid = $repository->getBillsPaidInRange($start, $end); // will be a negative amount.
@@ -79,7 +78,7 @@ class BillController extends Controller
$data = $this->generator->pieChart($chartData);
$cache->store($data);
return Response::json($data);
return response()->json($data);
}
/**
@@ -94,7 +93,7 @@ class BillController extends Controller
$cache->addProperty('chart.bill.single');
$cache->addProperty($bill->id);
if ($cache->has()) {
return Response::json($cache->get()); // @codeCoverageIgnore
return response()->json($cache->get()); // @codeCoverageIgnore
}
$results = $collector->setAllAssetAccounts()->setBills(new Collection([$bill]))->getJournals();
@@ -120,6 +119,6 @@ class BillController extends Controller
$data = $this->generator->multiSet($chartData);
$cache->store($data);
return Response::json($data);
return response()->json($data);
}
}

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

@@ -37,7 +37,6 @@ use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
use FireflyIII\Support\CacheProperties;
use Illuminate\Support\Collection;
use Response;
use Steam;
/**
@@ -86,7 +85,7 @@ class BudgetController extends Controller
$cache->addProperty($budget->id);
if ($cache->has()) {
return Response::json($cache->get()); // @codeCoverageIgnore
return response()->json($cache->get()); // @codeCoverageIgnore
}
// depending on diff, do something with range of chart.
@@ -122,7 +121,7 @@ class BudgetController extends Controller
$cache->store($data);
return Response::json($data);
return response()->json($data);
}
/**
@@ -153,7 +152,7 @@ class BudgetController extends Controller
$cache->addProperty($budget->id);
if ($cache->has()) {
return Response::json($cache->get()); // @codeCoverageIgnore
return response()->json($cache->get()); // @codeCoverageIgnore
}
$entries = [];
@@ -170,7 +169,7 @@ class BudgetController extends Controller
$data = $this->generator->singleSet(strval(trans('firefly.left')), $entries);
$cache->store($data);
return Response::json($data);
return response()->json($data);
}
/**
@@ -186,7 +185,7 @@ class BudgetController extends Controller
$cache->addProperty($budgetLimit->id ?? 0);
$cache->addProperty('chart.budget.expense-asset');
if ($cache->has()) {
return Response::json($cache->get()); // @codeCoverageIgnore
return response()->json($cache->get()); // @codeCoverageIgnore
}
/** @var JournalCollectorInterface $collector */
@@ -214,7 +213,7 @@ class BudgetController extends Controller
$data = $this->generator->pieChart($chartData);
$cache->store($data);
return Response::json($data);
return response()->json($data);
}
/**
@@ -230,7 +229,7 @@ class BudgetController extends Controller
$cache->addProperty($budgetLimit->id ?? 0);
$cache->addProperty('chart.budget.expense-category');
if ($cache->has()) {
return Response::json($cache->get()); // @codeCoverageIgnore
return response()->json($cache->get()); // @codeCoverageIgnore
}
/** @var JournalCollectorInterface $collector */
@@ -260,7 +259,7 @@ class BudgetController extends Controller
$data = $this->generator->pieChart($chartData);
$cache->store($data);
return Response::json($data);
return response()->json($data);
}
/**
@@ -276,7 +275,7 @@ class BudgetController extends Controller
$cache->addProperty($budgetLimit->id ?? 0);
$cache->addProperty('chart.budget.expense-expense');
if ($cache->has()) {
return Response::json($cache->get()); // @codeCoverageIgnore
return response()->json($cache->get()); // @codeCoverageIgnore
}
/** @var JournalCollectorInterface $collector */
@@ -305,7 +304,7 @@ class BudgetController extends Controller
$data = $this->generator->pieChart($chartData);
$cache->store($data);
return Response::json($data);
return response()->json($data);
}
/**
@@ -326,7 +325,7 @@ class BudgetController extends Controller
$cache->addProperty($end);
$cache->addProperty('chart.budget.frontpage');
if ($cache->has()) {
return Response::json($cache->get()); // @codeCoverageIgnore
return response()->json($cache->get()); // @codeCoverageIgnore
}
$budgets = $this->repository->getActiveBudgets();
$chartData = [
@@ -359,7 +358,7 @@ class BudgetController extends Controller
$data = $this->generator->multiSet($chartData);
$cache->store($data);
return Response::json($data);
return response()->json($data);
}
/**
@@ -382,7 +381,7 @@ class BudgetController extends Controller
$cache->addProperty($budget->id);
$cache->addProperty('chart.budget.period');
if ($cache->has()) {
return Response::json($cache->get()); // @codeCoverageIgnore
return response()->json($cache->get()); // @codeCoverageIgnore
}
$periods = app('navigation')->listOfPeriods($start, $end);
$entries = $this->repository->getBudgetPeriodReport(new Collection([$budget]), $accounts, $start, $end); // get the expenses
@@ -404,7 +403,7 @@ class BudgetController extends Controller
$data = $this->generator->multiSet($chartData);
$cache->store($data);
return Response::json($data);
return response()->json($data);
}
/**
@@ -423,7 +422,7 @@ class BudgetController extends Controller
$cache->addProperty($accounts);
$cache->addProperty('chart.budget.no-budget');
if ($cache->has()) {
return Response::json($cache->get()); // @codeCoverageIgnore
return response()->json($cache->get()); // @codeCoverageIgnore
}
// the expenses:
@@ -440,7 +439,7 @@ class BudgetController extends Controller
$data = $this->generator->singleSet(strval(trans('firefly.spent')), $chartData);
$cache->store($data);
return Response::json($data);
return response()->json($data);
}
/**

9
app/Http/Controllers/Chart/BudgetReportController.php
View File

@@ -37,7 +37,6 @@ use FireflyIII\Models\TransactionType;
use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
use FireflyIII\Support\CacheProperties;
use Illuminate\Support\Collection;
use Response;
/**
* Separate controller because many helper functions are shared.
@@ -88,7 +87,7 @@ class BudgetReportController extends Controller
$chartData = $helper->generate('expense', 'account');
$data = $this->generator->pieChart($chartData);
return Response::json($data);
return response()->json($data);
}
/**
@@ -112,7 +111,7 @@ class BudgetReportController extends Controller
$chartData = $helper->generate('expense', 'budget');
$data = $this->generator->pieChart($chartData);
return Response::json($data);
return response()->json($data);
}
/**
@@ -132,7 +131,7 @@ class BudgetReportController extends Controller
$cache->addProperty($start);
$cache->addProperty($end);
if ($cache->has()) {
return Response::json($cache->get()); // @codeCoverageIgnore
return response()->json($cache->get()); // @codeCoverageIgnore
}
$format = app('navigation')->preferredCarbonLocalizedFormat($start, $end);
$function = app('navigation')->preferredEndOfPeriod($start, $end);
@@ -195,7 +194,7 @@ class BudgetReportController extends Controller
$data = $this->generator->multiSet($chartData);
$cache->store($data);
return Response::json($data);
return response()->json($data);
}
/**

15
app/Http/Controllers/Chart/CategoryController.php
View File

@@ -32,7 +32,6 @@ use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
use FireflyIII\Support\CacheProperties;
use Illuminate\Support\Collection;
use Preferences;
use Response;
/**
* Class CategoryController.
@@ -67,7 +66,7 @@ class CategoryController extends Controller
$cache->addProperty('chart.category.all');
$cache->addProperty($category->id);
if ($cache->has()) {
return Response::json($cache->get()); // @codeCoverageIgnore
return response()->json($cache->get()); // @codeCoverageIgnore
}
$start = $repository->firstUseDate($category);
@@ -114,7 +113,7 @@ class CategoryController extends Controller
$data = $this->generator->multiSet($chartData);
$cache->store($data);
return Response::json($data);
return response()->json($data);
}
/**
@@ -133,7 +132,7 @@ class CategoryController extends Controller
$cache->addProperty($end);
$cache->addProperty('chart.category.frontpage');
if ($cache->has()) {
return Response::json($cache->get()); // @codeCoverageIgnore
return response()->json($cache->get()); // @codeCoverageIgnore
}
$chartData = [];
$categories = $repository->getCategories();
@@ -154,7 +153,7 @@ class CategoryController extends Controller
$data = $this->generator->singleSet(strval(trans('firefly.spent')), $chartData);
$cache->store($data);
return Response::json($data);
return response()->json($data);
}
/**
@@ -212,7 +211,7 @@ class CategoryController extends Controller
$data = $this->generator->multiSet($chartData);
$cache->store($data);
return Response::json($data);
return response()->json($data);
}
/**
@@ -267,7 +266,7 @@ class CategoryController extends Controller
$data = $this->generator->multiSet($chartData);
$cache->store($data);
return Response::json($data);
return response()->json($data);
}
/**
@@ -284,7 +283,7 @@ class CategoryController extends Controller
$end = app('navigation')->endOfPeriod($date, $range);
$data = $this->makePeriodChart($repository, $category, $start, $end);
return Response::json($data);
return response()->json($data);
}
/**

13
app/Http/Controllers/Chart/CategoryReportController.php
View File

@@ -36,7 +36,6 @@ use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionType;
use FireflyIII\Support\CacheProperties;
use Illuminate\Support\Collection;
use Response;
/**
* Separate controller because many helper functions are shared.
@@ -81,7 +80,7 @@ class CategoryReportController extends Controller
$chartData = $helper->generate('expense', 'account');
$data = $this->generator->pieChart($chartData);
return Response::json($data);
return response()->json($data);
}
/**
@@ -105,7 +104,7 @@ class CategoryReportController extends Controller
$chartData = $helper->generate('income', 'account');
$data = $this->generator->pieChart($chartData);
return Response::json($data);
return response()->json($data);
}
/**
@@ -129,7 +128,7 @@ class CategoryReportController extends Controller
$chartData = $helper->generate('expense', 'category');
$data = $this->generator->pieChart($chartData);
return Response::json($data);
return response()->json($data);
}
/**
@@ -153,7 +152,7 @@ class CategoryReportController extends Controller
$chartData = $helper->generate('income', 'category');
$data = $this->generator->pieChart($chartData);
return Response::json($data);
return response()->json($data);
}
/**
@@ -173,7 +172,7 @@ class CategoryReportController extends Controller
$cache->addProperty($start);
$cache->addProperty($end);
if ($cache->has()) {
return Response::json($cache->get()); // @codeCoverageIgnore
return response()->json($cache->get()); // @codeCoverageIgnore
}
$format = app('navigation')->preferredCarbonLocalizedFormat($start, $end);
@@ -258,7 +257,7 @@ class CategoryReportController extends Controller
$data = $this->generator->multiSet($newSet);
$cache->store($data);
return Response::json($data);
return response()->json($data);
}
/**

5
app/Http/Controllers/Chart/ExpenseReportController.php
View File

@@ -33,7 +33,6 @@ use FireflyIII\Models\TransactionType;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Support\CacheProperties;
use Illuminate\Support\Collection;
use Response;
/**
* Separate controller because many helper functions are shared.
@@ -80,7 +79,7 @@ class ExpenseReportController extends Controller
$cache->addProperty($start);
$cache->addProperty($end);
if ($cache->has()) {
return Response::json($cache->get()); // @codeCoverageIgnore
return response()->json($cache->get()); // @codeCoverageIgnore
}
$format = app('navigation')->preferredCarbonLocalizedFormat($start, $end);
@@ -180,7 +179,7 @@ class ExpenseReportController extends Controller
$data = $this->generator->multiSet($newSet);
$cache->store($data);
return Response::json($data);
return response()->json($data);
}
/**

5
app/Http/Controllers/Chart/PiggyBankController.php
View File

@@ -28,7 +28,6 @@ use FireflyIII\Models\PiggyBank;
use FireflyIII\Models\PiggyBankEvent;
use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
use FireflyIII\Support\CacheProperties;
use Response;
/**
* Class PiggyBankController.
@@ -63,7 +62,7 @@ class PiggyBankController extends Controller
$cache->addProperty('chart.piggy-bank.history');
$cache->addProperty($piggyBank->id);
if ($cache->has()) {
return Response::json($cache->get()); // @codeCoverageIgnore
return response()->json($cache->get()); // @codeCoverageIgnore
}
$set = $repository->getEvents($piggyBank);
@@ -80,6 +79,6 @@ class PiggyBankController extends Controller
$data = $this->generator->singleSet($piggyBank->name, $chartData);
$cache->store($data);
return Response::json($data);
return response()->json($data);
}
}

13
app/Http/Controllers/Chart/ReportController.php
View File

@@ -29,7 +29,6 @@ use FireflyIII\Repositories\Account\AccountTaskerInterface;
use FireflyIII\Support\CacheProperties;
use Illuminate\Support\Collection;
use Log;
use Response;
use Steam;
/**
@@ -69,7 +68,7 @@ class ReportController extends Controller
$cache->addProperty($accounts);
$cache->addProperty($end);
if ($cache->has()) {
return Response::json($cache->get()); // @codeCoverageIgnore
return response()->json($cache->get()); // @codeCoverageIgnore
}
$current = clone $start;
$chartData = [];
@@ -84,7 +83,7 @@ class ReportController extends Controller
$data = $this->generator->singleSet(strval(trans('firefly.net_worth')), $chartData);
$cache->store($data);
return Response::json($data);
return response()->json($data);
}
/**
@@ -105,7 +104,7 @@ class ReportController extends Controller
$cache->addProperty($accounts);
$cache->addProperty($end);
if ($cache->has()) {
return Response::json($cache->get()); // @codeCoverageIgnore
return response()->json($cache->get()); // @codeCoverageIgnore
}
Log::debug('Going to do operations for accounts ', $accounts->pluck('id')->toArray());
$format = app('navigation')->preferredCarbonLocalizedFormat($start, $end);
@@ -139,7 +138,7 @@ class ReportController extends Controller
$data = $this->generator->multiSet($chartData);
$cache->store($data);
return Response::json($data);
return response()->json($data);
}
/**
@@ -160,7 +159,7 @@ class ReportController extends Controller
$cache->addProperty($end);
$cache->addProperty($accounts);
if ($cache->has()) {
return Response::json($cache->get()); // @codeCoverageIgnore
return response()->json($cache->get()); // @codeCoverageIgnore
}
$source = $this->getChartData($accounts, $start, $end);
@@ -209,7 +208,7 @@ class ReportController extends Controller
$data = $this->generator->multiSet($chartData);
$cache->store($data);
return Response::json($data);
return response()->json($data);
}
/**

17
app/Http/Controllers/Chart/TagReportController.php
View File

@@ -36,7 +36,6 @@ use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionType;
use FireflyIII\Support\CacheProperties;
use Illuminate\Support\Collection;
use Response;
/**
* Class TagReportController
@@ -77,7 +76,7 @@ class TagReportController extends Controller
$chartData = $helper->generate('expense', 'account');
$data = $this->generator->pieChart($chartData);
return Response::json($data);
return response()->json($data);
}
/**
@@ -101,7 +100,7 @@ class TagReportController extends Controller
$chartData = $helper->generate('income', 'account');
$data = $this->generator->pieChart($chartData);
return Response::json($data);
return response()->json($data);
}
/**
@@ -124,7 +123,7 @@ class TagReportController extends Controller
$chartData = $helper->generate('expense', 'budget');
$data = $this->generator->pieChart($chartData);
return Response::json($data);
return response()->json($data);
}
/**
@@ -147,7 +146,7 @@ class TagReportController extends Controller
$chartData = $helper->generate('expense', 'category');
$data = $this->generator->pieChart($chartData);
return Response::json($data);
return response()->json($data);
}
/**
@@ -167,7 +166,7 @@ class TagReportController extends Controller
$cache->addProperty($start);
$cache->addProperty($end);
if ($cache->has()) {
return Response::json($cache->get()); // @codeCoverageIgnore
return response()->json($cache->get()); // @codeCoverageIgnore
}
$format = app('navigation')->preferredCarbonLocalizedFormat($start, $end);
@@ -252,7 +251,7 @@ class TagReportController extends Controller
$data = $this->generator->multiSet($newSet);
$cache->store($data);
return Response::json($data);
return response()->json($data);
}
/**
@@ -276,7 +275,7 @@ class TagReportController extends Controller
$chartData = $helper->generate('expense', 'tag');
$data = $this->generator->pieChart($chartData);
return Response::json($data);
return response()->json($data);
}
/**
@@ -300,7 +299,7 @@ class TagReportController extends Controller
$chartData = $helper->generate('income', 'tag');
$data = $this->generator->pieChart($chartData);
return Response::json($data);
return response()->json($data);
}
/**