Expand API.

app/Api/V1/Controllers/AccountController.php

@@ -23,9 +23,11 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Controllers;
 
+use FireflyIII\Api\V1\Requests\AccountRequest;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use FireflyIII\Transformers\AccountTransformer;
 use Illuminate\Http\Request;
 use Illuminate\Pagination\LengthAwarePaginator;
@@ -35,7 +37,6 @@ use League\Fractal\Resource\Collection as FractalCollection;
 use League\Fractal\Resource\Item;
 use League\Fractal\Serializer\JsonApiSerializer;
 use Preferences;
-use Response;
 
 /**
  * Class AccountController
@@ -43,6 +44,8 @@ use Response;
 class AccountController extends Controller
 {
 
+    /** @var CurrencyRepositoryInterface */
+    private $currencyRepository;
     /** @var AccountRepositoryInterface */
     private $repository;
 
@@ -60,6 +63,9 @@ class AccountController extends Controller
                 $this->repository = app(AccountRepositoryInterface::class);
                 $this->repository->setUser(auth()->user());
 
+                $this->currencyRepository = app(CurrencyRepositoryInterface::class);
+                $this->currencyRepository->setUser(auth()->user());
+
                 return $next($request);
             }
         );
@@ -103,7 +109,7 @@ class AccountController extends Controller
         $resource = new FractalCollection($accounts, new AccountTransformer($this->parameters), 'accounts');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return Response::json($manager->createData($resource)->toArray());
+        return response()->json($manager->createData($resource)->toArray());
     }
 
     /**
@@ -121,7 +127,7 @@ class AccountController extends Controller
         $manager->setSerializer(new JsonApiSerializer($baseUrl));
         $resource = new Item($account, new AccountTransformer($this->parameters), 'accounts');
 
-        return Response::json($manager->createData($resource)->toArray());
+        return response()->json($manager->createData($resource)->toArray());
     }
 
     /**
@@ -131,6 +137,20 @@ class AccountController extends Controller
      */
     public function store(AccountRequest $request)
     {
+        $data = $request->getAll();
+        // if currency ID is 0, find the currency by the code:
+        if ($data['currency_id'] === 0) {
+            $currency            = $this->currencyRepository->findByCode($data['currency_code']);
+            $data['currency_id'] = $currency->id;
+        }
+        $account = $this->repository->store($data);
+        $manager = new Manager();
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        $resource = new Item($account, new AccountTransformer($this->parameters), 'accounts');
+
+        return response()->json($manager->createData($resource)->toArray());
 
     }
 
@@ -142,8 +162,22 @@ class AccountController extends Controller
      */
     public function update(AccountRequest $request, Account $account)
     {
+        $data = $request->getAll();
+        // if currency ID is 0, find the currency by the code:
+        if ($data['currency_id'] === 0) {
+            $currency            = $this->currencyRepository->findByCode($data['currency_code']);
+            $data['currency_id'] = $currency->id;
+        }
+        // set correct type:
+        $data['type'] = config('firefly.shortNamesByFullName.' . $account->accountType->type);
+        $this->repository->update($account, $data);
+        $manager = new Manager();
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
+        $resource = new Item($account, new AccountTransformer($this->parameters), 'accounts');
 
+        return response()->json($manager->createData($resource)->toArray());
     }
 
     /**

app/Api/V1/Controllers/BillController.php

@@ -34,7 +34,6 @@ use League\Fractal\Resource\Collection as FractalCollection;
 use League\Fractal\Resource\Item;
 use League\Fractal\Serializer\JsonApiSerializer;
 use Preferences;
-use Response;
 
 /**
  * Class BillController
@@ -98,7 +97,7 @@ class BillController extends Controller
         $resource = new FractalCollection($bills, new BillTransformer($this->parameters), 'bills');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return Response::json($manager->createData($resource)->toArray());
+        return response()->json($manager->createData($resource)->toArray());
     }
 
 
@@ -117,7 +116,7 @@ class BillController extends Controller
 
         $resource = new Item($bill, new BillTransformer($this->parameters), 'bills');
 
-        return Response::json($manager->createData($resource)->toArray());
+        return response()->json($manager->createData($resource)->toArray());
     }
 
     /**
@@ -134,7 +133,7 @@ class BillController extends Controller
 
         $resource = new Item($bill, new BillTransformer($this->parameters), 'bills');
 
-        return Response::json($manager->createData($resource)->toArray());
+        return response()->json($manager->createData($resource)->toArray());
 
     }
 
@@ -155,7 +154,7 @@ class BillController extends Controller
 
         $resource = new Item($bill, new BillTransformer($this->parameters), 'bills');
 
-        return Response::json($manager->createData($resource)->toArray());
+        return response()->json($manager->createData($resource)->toArray());
 
     }
 }

app/Api/V1/Controllers/Controller.php

@@ -73,27 +73,20 @@ class Controller extends BaseController
         }
         $bag->set('page', $page);
 
-        $start     = request()->get('start');
-        $startDate = null;
-        if (!is_null($start)) {
-            try {
-                $startDate = new Carbon($start);
-            } catch (InvalidDateException $e) {
-                // don't care
+        // some date fields:
+        $dates = ['start','end','date'];
+        foreach($dates as $field) {
+            $date =  request()->get($field);
+            $obj = null;
+            if (!is_null($date)) {
+                try {
+                    $obj= new Carbon($date);
+                } catch (InvalidDateException $e) {
+                    // don't care
+                }
             }
+            $bag->set($field, $obj);
         }
-        $bag->set('start', $startDate);
-
-        $end     = request()->get('end');
-        $endDate = null;
-        if (!is_null($end)) {
-            try {
-                $endDate = new Carbon($end);
-            } catch (InvalidDateException $e) {
-                // don't care
-            }
-        }
-        $bag->set('end', $endDate);
 
         $type = request()->get('type') ?? 'all';
         $bag->set('type', $type);

app/Api/V1/Controllers/UserController.php

@@ -0,0 +1,149 @@
+<?php
+/**
+ * UserController.php
+ * Copyright (c) 2018 thegrumpydictator@gmail.com
+ *
+ * This file is part of Firefly III.
+ *
+ * Firefly III is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Firefly III is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers;
+
+use FireflyIII\Repositories\User\UserRepositoryInterface;
+use FireflyIII\Transformers\UserTransformer;
+use FireflyIII\User;
+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;
+use Preferences;
+use Symfony\Component\HttpFoundation\File\Exception\AccessDeniedException;
+
+/**
+ * Class UserController
+ */
+class UserController extends Controller
+{
+
+    /** @var UserRepositoryInterface */
+    private $repository;
+
+    /**
+     * UserController constructor.
+     *
+     * @throws \FireflyIII\Exceptions\FireflyException
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                /** @var UserRepositoryInterface repository */
+                $this->repository = app(UserRepositoryInterface::class);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  \FireflyIII\User $user
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function delete(User $user)
+    {
+        if (auth()->user()->hasRole('owner')) {
+            $this->repository->destroy($user);
+
+            return response()->json([], 204);
+        }
+        throw new AccessDeniedException('');
+    }
+
+    /**
+     * Display a listing of the resource.
+     *
+     * @param Request $request
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function index(Request $request)
+    {
+        $pageSize   = intval(Preferences::getForUser(auth()->user(), 'listPageSize', 50)->data);
+        $collection = $this->repository->all();
+        $count      = $collection->count();
+        $users      = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+
+        // make paginator:
+        $paginator = new LengthAwarePaginator($users, $count, $pageSize, $this->parameters->get('page'));
+        $manager   = new Manager();
+        $baseUrl   = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        $resource = new FractalCollection($users, new UserTransformer($this->parameters), 'users');
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+
+        return response()->json($manager->createData($resource)->toArray());
+    }
+
+    /**
+     * @param Request $request
+     * @param User    $user
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function show(Request $request, User $user)
+    {
+
+        $manager = new Manager();
+        //$manager->parseIncludes(['attachments', 'journals', 'user']);
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+        $resource = new Item($user, new UserTransformer($this->parameters), 'users');
+
+        return response()->json($manager->createData($resource)->toArray());
+    }
+
+    /**
+     * @param AccountRequest $request
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function store(AccountRequest $request)
+    {
+
+    }
+
+    /**
+     * @param AccountRequest $request
+     * @param Account        $account
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function update(AccountRequest $request, Account $account)
+    {
+
+
+    }
+
+}