kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Remove exceptions.

Browse Source
This commit is contained in:
James Cole
2023-09-23 16:43:54 +02:00
parent 40585469f2
commit dad58fa362
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Api/V2/Controllers/Model/Budget/ShowController.php
View File

@@ -30,13 +30,17 @@ use FireflyIII\Api\V2\Request\Generic\DateRequest;
use FireflyIII\Exceptions\FireflyException; use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\Budget; use FireflyIII\Models\Budget;
use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
use FireflyIII\Support\Http\Api\ConvertsExchangeRates;
use Illuminate\Http\JsonResponse; use Illuminate\Http\JsonResponse;
/** /**
* Class ShowController * Class ShowController
* TODO lots of deprecated code here.
*/ */
class ShowController extends Controller class ShowController extends Controller
{ {
use ConvertsExchangeRates;
private BudgetRepositoryInterface $repository; private BudgetRepositoryInterface $repository;
/** /**
@@ -61,7 +65,6 @@ class ShowController extends Controller
*/ */
public function budgeted(DateRequest $request, Budget $budget): JsonResponse public function budgeted(DateRequest $request, Budget $budget): JsonResponse
{ {
throw new FireflyException('deprecated use of thing.');
$data = $request->getAll(); $data = $request->getAll();
$result = $this->repository->budgetedInPeriodForBudget($budget, $data['start'], $data['end']); $result = $this->repository->budgetedInPeriodForBudget($budget, $data['start'], $data['end']);
$converted = $this->cerSum(array_values($result)); $converted = $this->cerSum(array_values($result));
@@ -76,7 +79,6 @@ class ShowController extends Controller
*/ */
public function spent(DateRequest $request, Budget $budget): JsonResponse public function spent(DateRequest $request, Budget $budget): JsonResponse
{ {
throw new FireflyException('deprecated use of thing.');
$data = $request->getAll(); $data = $request->getAll();
$result = $this->repository->spentInPeriodForBudget($budget, $data['start'], $data['end']); $result = $this->repository->spentInPeriodForBudget($budget, $data['start'], $data['end']);
$converted = $this->cerSum(array_values($result)); $converted = $this->cerSum(array_values($result));

5
app/Api/V2/Controllers/Model/Budget/SumController.php
View File

@@ -28,6 +28,7 @@ use FireflyIII\Api\V2\Controllers\Controller;
use FireflyIII\Api\V2\Request\Generic\DateRequest; use FireflyIII\Api\V2\Request\Generic\DateRequest;
use FireflyIII\Exceptions\FireflyException; use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
use FireflyIII\Support\Http\Api\ConvertsExchangeRates;
use Illuminate\Http\JsonResponse; use Illuminate\Http\JsonResponse;
/** /**
@@ -35,6 +36,8 @@ use Illuminate\Http\JsonResponse;
*/ */
class SumController extends Controller class SumController extends Controller
{ {
use ConvertsExchangeRates;
private BudgetRepositoryInterface $repository; private BudgetRepositoryInterface $repository;
/** /**
@@ -62,7 +65,6 @@ class SumController extends Controller
*/ */
public function budgeted(DateRequest $request): JsonResponse public function budgeted(DateRequest $request): JsonResponse
{ {
throw new FireflyException('deprecated use of thing.');
$data = $request->getAll(); $data = $request->getAll();
$result = $this->repository->budgetedInPeriod($data['start'], $data['end']); $result = $this->repository->budgetedInPeriod($data['start'], $data['end']);
$converted = $this->cerSum(array_values($result)); $converted = $this->cerSum(array_values($result));
@@ -80,7 +82,6 @@ class SumController extends Controller
*/ */
public function spent(DateRequest $request): JsonResponse public function spent(DateRequest $request): JsonResponse
{ {
throw new FireflyException('deprecated use of thing.');
$data = $request->getAll(); $data = $request->getAll();
$result = $this->repository->spentInPeriod($data['start'], $data['end']); $result = $this->repository->spentInPeriod($data['start'], $data['end']);
$converted = $this->cerSum(array_values($result)); $converted = $this->cerSum(array_values($result));

1
app/Support/Http/Api/ConvertsExchangeRates.php
View File

@@ -115,7 +115,6 @@ trait ConvertsExchangeRates
*/ */
public function cerSum(array $entries): array public function cerSum(array $entries): array
{ {
throw new FireflyException('do not use me, needs refactor');
if (null === $this->enabled) { if (null === $this->enabled) {
$this->getPreference(); $this->getPreference();
} }