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

Clean up API code and fix test code.

Browse Source
This commit is contained in:
James Cole
2019-09-04 17:39:39 +02:00
parent f52584d46b
commit f9f1fa0fcb
60 changed files with 812 additions and 1191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
app/Api/V1/Controllers/UserController.php
View File

@@ -31,13 +31,10 @@ use FireflyIII\Repositories\User\UserRepositoryInterface;
use FireflyIII\Transformers\UserTransformer;
use FireflyIII\User;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Pagination\LengthAwarePaginator;
use League\Fractal\Manager;
use League\Fractal\Pagination\IlluminatePaginatorAdapter;
use League\Fractal\Resource\Collection as FractalCollection;
use League\Fractal\Resource\Item;
use League\Fractal\Serializer\JsonApiSerializer;
/**
@@ -52,6 +49,7 @@ class UserController extends Controller
/**
* UserController constructor.
*
* @codeCoverageIgnore
*/
public function __construct()
@@ -91,20 +89,14 @@ class UserController extends Controller
/**
* Display a listing of the resource.
*
* @param Request $request
*
* @return JsonResponse
* @codeCoverageIgnore
*/
public function index(Request $request): JsonResponse
public function index(): JsonResponse
{
// user preferences
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
// make manager
$manager = new Manager();
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
$manager->setSerializer(new JsonApiSerializer($baseUrl));
$manager = $this->getManager();
// build collection
$collection = $this->repository->all();
@@ -129,19 +121,15 @@ class UserController extends Controller
/**
* Show a single user.
*
* @param Request $request
* @param User $user
*
* @return JsonResponse
* @codeCoverageIgnore
*/
public function show(Request $request, User $user): JsonResponse
public function show(User $user): JsonResponse
{
// make manager
$manager = new Manager();
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
$manager->setSerializer(new JsonApiSerializer($baseUrl));
$manager = $this->getManager();
// make resource
/** @var UserTransformer $transformer */
$transformer = app(UserTransformer::class);
@@ -161,13 +149,9 @@ class UserController extends Controller
*/
public function store(UserStoreRequest $request): JsonResponse
{
$data = $request->getAll();
$user = $this->repository->store($data);
// make manager
$manager = new Manager();
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
$manager->setSerializer(new JsonApiSerializer($baseUrl));
$data = $request->getAll();
$user = $this->repository->store($data);
$manager = $this->getManager();
// make resource
@@ -184,20 +168,15 @@ class UserController extends Controller
* Update a user.
*
* @param UserUpdateRequest $request
* @param User $user
* @param User $user
*
* @return JsonResponse
*/
public function update(UserUpdateRequest $request, User $user): JsonResponse
{
$data = $request->getAll();
$user = $this->repository->update($user, $data);
// make manager
$manager = new Manager();
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
$manager->setSerializer(new JsonApiSerializer($baseUrl));
$data = $request->getAll();
$user = $this->repository->update($user, $data);
$manager = $this->getManager();
// make resource
/** @var UserTransformer $transformer */
$transformer = app(UserTransformer::class);