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

Code cleanup.

Browse Source
This commit is contained in:
James Cole
2023-12-20 19:35:52 +01:00
parent c4f6366642
commit 64ec0cf62e
997 changed files with 12908 additions and 28136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Api/V2/Controllers/Model/Account/ShowController.php
View File

@@ -46,6 +46,7 @@ class ShowController extends Controller
return response()
->api($this->jsonApiObject('accounts', $account, $transformer))
->header('Content-Type', self::CONTENT_TYPE);
->header('Content-Type', self::CONTENT_TYPE)
;
}
}

7
app/Api/V2/Controllers/Model/Bill/IndexController.php
View File

@@ -1,6 +1,5 @@
<?php
/*
* ShowController.php
* Copyright (c) 2023 james@firefly-iii.org
@@ -60,10 +59,7 @@ class IndexController extends Controller
}
/**
*
* TODO see autocomplete/accountcontroller for list.
*
* @return JsonResponse
*/
public function index(): JsonResponse
{
@@ -78,6 +74,7 @@ class IndexController extends Controller
return response()
->json($this->jsonApiList('subscriptions', $paginator, $transformer))
->header('Content-Type', self::CONTENT_TYPE);
->header('Content-Type', self::CONTENT_TYPE)
;
}
}

4
app/Api/V2/Controllers/Model/Bill/ShowController.php
View File

@@ -1,6 +1,5 @@
<?php
/*
* ShowController.php
* Copyright (c) 2023 james@firefly-iii.org
@@ -69,6 +68,7 @@ class ShowController extends Controller
return response()
->api($this->jsonApiObject('subscriptions', $bill, $transformer))
->header('Content-Type', self::CONTENT_TYPE);
->header('Content-Type', self::CONTENT_TYPE)
;
}
}

10
app/Api/V2/Controllers/Model/Bill/SumController.php
View File

@@ -39,9 +39,6 @@ class SumController extends Controller
private BillRepositoryInterface $repository;
/**
*
*/
public function __construct()
{
parent::__construct();
@@ -54,7 +51,6 @@ class SumController extends Controller
$this->repository->setUserGroup($userGroup);
}
return $next($request);
}
);
@@ -66,9 +62,6 @@ class SumController extends Controller
*
* TODO see autocomplete/accountcontroller for list.
*
* @param DateRequest $request
*
* @return JsonResponse
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function paid(DateRequest $request): JsonResponse
@@ -85,10 +78,7 @@ class SumController extends Controller
*
* TODO see autocomplete/accountcontroller for list.
*
* @param DateRequest $request
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*
* @return JsonResponse
*/
public function unpaid(DateRequest $request): JsonResponse
{

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

@@ -52,9 +52,6 @@ class IndexController extends Controller
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v2)#/budgets/listBudgets
*
*
* @return JsonResponse
*/
public function index(): JsonResponse
{
@@ -68,6 +65,7 @@ class IndexController extends Controller
return response()
->api($this->jsonApiList('budgets', $paginator, $transformer))
->header('Content-Type', self::CONTENT_TYPE);
->header('Content-Type', self::CONTENT_TYPE)
;
}
}

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

@@ -1,6 +1,5 @@
<?php
/*
* ShowController.php
* Copyright (c) 2023 james@firefly-iii.org
@@ -39,9 +38,6 @@ class ShowController extends Controller
{
private BudgetRepositoryInterface $repository;
/**
*
*/
public function __construct()
{
parent::__construct();
@@ -60,7 +56,6 @@ class ShowController extends Controller
*
* This endpoint is documented at:
* TODO add URL
*
*/
public function budgeted(DateRequest $request, Budget $budget): JsonResponse
{
@@ -73,7 +68,6 @@ class ShowController extends Controller
/**
* This endpoint is documented at:
* TODO add URL
*
*/
public function spent(DateRequest $request, Budget $budget): JsonResponse
{

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

@@ -36,9 +36,6 @@ class SumController extends Controller
{
private BudgetRepositoryInterface $repository;
/**
*
*/
public function __construct()
{
parent::__construct();
@@ -54,10 +51,6 @@ class SumController extends Controller
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v2)#/budgets/getBudgetedForBudget
*
* @param DateRequest $request
*
* @return JsonResponse
*/
public function budgeted(DateRequest $request): JsonResponse
{
@@ -70,10 +63,6 @@ class SumController extends Controller
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v2)#/budgets/getSpentForBudget
*
* @param DateRequest $request
*
* @return JsonResponse
*/
public function spent(DateRequest $request): JsonResponse
{

6
app/Api/V2/Controllers/Model/Currency/IndexController.php
View File

@@ -53,8 +53,6 @@ class IndexController extends Controller
* TODO This endpoint is not yet documented.
*
* Display a listing of the resource.
*
* @return JsonResponse
*/
public function index(): JsonResponse
{
@@ -68,7 +66,7 @@ class IndexController extends Controller
return response()
->json($this->jsonApiList('currencies', $paginator, $transformer))
->header('Content-Type', self::CONTENT_TYPE);
->header('Content-Type', self::CONTENT_TYPE)
;
}
}

6
app/Api/V2/Controllers/Model/PiggyBank/IndexController.php
View File

@@ -1,6 +1,5 @@
<?php
/*
* ShowController.php
* Copyright (c) 2023 james@firefly-iii.org
@@ -60,8 +59,6 @@ class IndexController extends Controller
/**
* TODO see autocomplete/accountcontroller for list.
*
* @return JsonResponse
*/
public function index(): JsonResponse
{
@@ -75,6 +72,7 @@ class IndexController extends Controller
return response()
->json($this->jsonApiList('piggy-banks', $paginator, $transformer))
->header('Content-Type', self::CONTENT_TYPE);
->header('Content-Type', self::CONTENT_TYPE)
;
}
}

15
app/Api/V2/Controllers/Model/Transaction/StoreController.php
View File

@@ -1,6 +1,5 @@
<?php
/*
* StoreController.php
* Copyright (c) 2023 james@firefly-iii.org
@@ -55,6 +54,7 @@ class StoreController extends Controller
$this->middleware(
function ($request, $next) {
$this->groupRepository = app(TransactionGroupRepositoryInterface::class);
return $next($request);
}
);
@@ -63,13 +63,11 @@ class StoreController extends Controller
/**
* TODO this method is practically the same as the V1 method and borrows as much code as possible.
*
* @return JsonResponse
* @throws FireflyException
* @throws ValidationException
*/
public function post(StoreRequest $request): JsonResponse
{
app('log')->debug('Now in API v2 StoreController::store()');
$data = $request->getAll();
$userGroup = $request->getUserGroup();
@@ -88,12 +86,14 @@ class StoreController extends Controller
['transactions' => [['description' => $e->getMessage()]]],
['transactions.0.description' => new IsDuplicateTransaction()]
);
throw new ValidationException($validator); // @phpstan-ignore-line
} catch (FireflyException $e) { // @phpstan-ignore-line
app('log')->warning('Caught an exception. Return error message.');
app('log')->error($e->getMessage());
$message = sprintf('Internal exception: %s', $e->getMessage());
$validator = Validator::make(['transactions' => [['description' => $message]]], ['transactions.0.description' => new IsDuplicateTransaction()]);
throw new ValidationException($validator); // @phpstan-ignore-line
}
app('preferences')->mark();
@@ -103,13 +103,15 @@ class StoreController extends Controller
/** @var User $admin */
$admin = auth()->user();
// use new group collector:
/** @var GroupCollectorInterface $collector */
$collector = app(GroupCollectorInterface::class);
$collector
->setUser($admin)
// filter on transaction group.
->setTransactionGroup($transactionGroup);
->setTransactionGroup($transactionGroup)
;
$selectedGroup = $collector->getGroups()->first();
if (null === $selectedGroup) {
@@ -121,8 +123,7 @@ class StoreController extends Controller
return response()
->api($this->jsonApiObject('transactions', $selectedGroup, $transformer))
->header('Content-Type', self::CONTENT_TYPE);
->header('Content-Type', self::CONTENT_TYPE)
;
}
}