From 4958f280528ddf0af32c82908142d11246f27065 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 10 Feb 2018 09:57:31 +0100 Subject: [PATCH] Allow API to work with bills. --- app/Api/V1/Controllers/BillController.php | 55 ++++++++++--- app/Api/V1/Requests/BillRequest.php | 96 +++++++++++++++++++++++ app/Api/V1/Requests/Request.php | 32 ++++++++ app/Repositories/Bill/BillRepository.php | 12 ++- 4 files changed, 184 insertions(+), 11 deletions(-) create mode 100644 app/Api/V1/Requests/BillRequest.php create mode 100644 app/Api/V1/Requests/Request.php diff --git a/app/Api/V1/Controllers/BillController.php b/app/Api/V1/Controllers/BillController.php index 876ffa2f85..c6676e6373 100644 --- a/app/Api/V1/Controllers/BillController.php +++ b/app/Api/V1/Controllers/BillController.php @@ -22,8 +22,8 @@ declare(strict_types=1); namespace FireflyIII\Api\V1\Controllers; -use Auth; use Carbon\Carbon; +use FireflyIII\Api\V1\Requests\BillRequest; use FireflyIII\Models\Bill; use FireflyIII\Repositories\Bill\BillRepositoryInterface; use FireflyIII\Transformers\BillTransformer; @@ -71,11 +71,11 @@ class BillController extends Controller * * @return \Illuminate\Http\Response */ - public function destroy(Bill $bill) + public function delete(Bill $bill) { $this->repository->destroy($bill); - return response()->json(null, 204); + return response()->json([], 204); } /** @@ -85,8 +85,7 @@ class BillController extends Controller */ public function index(Request $request) { - $user = Auth::guard('api')->user(); - $pageSize = intval(Preferences::getForUser($user, 'listPageSize', 50)->data); + $pageSize = intval(Preferences::getForUser(auth()->user(), 'listPageSize', 50)->data); $start = null; $end = null; if (null !== $request->get('start')) { @@ -145,9 +144,28 @@ class BillController extends Controller * * @return \Illuminate\Http\Response */ - public function store(Request $request) + public function store(BillRequest $request) { - // + $start = null; + $end = null; + if (null !== $request->get('start')) { + $start = new Carbon($request->get('start')); + } + if (null !== $request->get('end')) { + $end = new Carbon($request->get('end')); + } + + $bill = $this->repository->store($request->getAll()); + + $manager = new Manager(); + $manager->parseIncludes(['attachments']); + $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1'; + $manager->setSerializer(new JsonApiSerializer($baseUrl)); + + $resource = new Item($bill, new BillTransformer($start, $end), 'bill'); + + return Response::json($manager->createData($resource)->toArray()); + } /** @@ -158,8 +176,27 @@ class BillController extends Controller * * @return \Illuminate\Http\Response */ - public function update(Request $request, Bill $bill) + public function update(BillRequest $request, Bill $bill) { - // + $data = $request->getAll(); + $bill = $this->repository->update($bill, $data); + + $start = null; + $end = null; + if (null !== $request->get('start')) { + $start = new Carbon($request->get('start')); + } + if (null !== $request->get('end')) { + $end = new Carbon($request->get('end')); + } + $manager = new Manager(); + $manager->parseIncludes(['attachments']); + $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1'; + $manager->setSerializer(new JsonApiSerializer($baseUrl)); + + $resource = new Item($bill, new BillTransformer($start, $end), 'bill'); + + return Response::json($manager->createData($resource)->toArray()); + } } diff --git a/app/Api/V1/Requests/BillRequest.php b/app/Api/V1/Requests/BillRequest.php new file mode 100644 index 0000000000..3b628d8fae --- /dev/null +++ b/app/Api/V1/Requests/BillRequest.php @@ -0,0 +1,96 @@ +. + */ + +declare(strict_types=1); + +namespace FireflyIII\Api\V1\Requests; + +/** + * Class BillRequest + */ +class BillRequest extends Request +{ + + /** + * @return bool + */ + public function authorize() + { + // Only allow authenticated users + return auth()->check(); + } + + /** + * @return array + */ + public function getAll(): array + { + $data = [ + 'name' => $this->string('name'), + 'match' => $this->string('match'), + 'amount_min' => $this->string('amount_min'), + 'amount_max' => $this->string('amount_max'), + 'currency_id' => $this->integer('currency_id'), + 'currency_code' => $this->string('currency_code'), + 'date' => $this->date('date'), + 'repeat_freq' => $this->string('repeat_freq'), + 'skip' => $this->integer('skip'), + 'automatch' => $this->boolean('automatch'), + 'active' => $this->boolean('active'), + 'notes' => $this->string('notes'), + ]; + + return $data; + } + + /** + * @return array + */ + public function rules() + { + $rules = [ + 'name' => 'required|between:1,255|uniqueObjectForUser:bills,name', + 'match' => 'required|between:1,255|uniqueObjectForUser:bills,match', + 'amount_min' => 'required|numeric|more:0', + 'amount_max' => 'required|numeric|more:0', + 'currency_id' => 'numeric|exists:transaction_currencies,id|required_without:currency_code', + 'currency_code' => 'min:3|max:3|exists:transaction_currencies,code|required_without:currency_id', + 'date' => 'required|date', + 'repeat_freq' => 'required|in:weekly,monthly,quarterly,half-year,yearly', + 'skip' => 'required|between:0,31', + 'automatch' => 'required|boolean', + 'active' => 'required|boolean', + 'notes' => 'between:1,65536', + ]; + switch ($this->method()) { + default: + break; + case 'PUT': + case 'PATCH': + $bill = $this->route()->parameter('bill'); + $rules['name'] .= ',' . $bill->id; + $rules['match'] .= ',' . $bill->id; + break; + } + + return $rules; + } +} \ No newline at end of file diff --git a/app/Api/V1/Requests/Request.php b/app/Api/V1/Requests/Request.php new file mode 100644 index 0000000000..198680635b --- /dev/null +++ b/app/Api/V1/Requests/Request.php @@ -0,0 +1,32 @@ +. + */ +declare(strict_types=1); + +namespace FireflyIII\Api\V1\Requests; + +use FireflyIII\Http\Requests\Request as FireflyIIIRequest; +/** + * Class Request. + */ +class Request extends FireflyIIIRequest +{ + +} diff --git a/app/Repositories/Bill/BillRepository.php b/app/Repositories/Bill/BillRepository.php index 6341dba9fc..ca93440c2f 100644 --- a/app/Repositories/Bill/BillRepository.php +++ b/app/Repositories/Bill/BillRepository.php @@ -535,11 +535,15 @@ class BillRepository implements BillRepositoryInterface */ public function store(array $data): Bill { + $matchArray = explode(',', $data['match']); + $matchArray = array_unique($matchArray); + $match = join(',', $matchArray); + /** @var Bill $bill */ $bill = Bill::create( [ 'name' => $data['name'], - 'match' => $data['match'], + 'match' => $match, 'amount_min' => $data['amount_min'], 'user_id' => $this->user->id, 'amount_max' => $data['amount_max'], @@ -567,8 +571,12 @@ class BillRepository implements BillRepositoryInterface */ public function update(Bill $bill, array $data): Bill { + $matchArray = explode(',', $data['match']); + $matchArray = array_unique($matchArray); + $match = join(',', $matchArray); + $bill->name = $data['name']; - $bill->match = $data['match']; + $bill->match = $match; $bill->amount_min = $data['amount_min']; $bill->amount_max = $data['amount_max']; $bill->date = $data['date'];