IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

All API routes seem to work.

Browse Source
This commit is contained in:
James Cole 2018-03-04 08:22:32 +01:00
parent 2ab44fb33a
commit 7171e69715
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
7 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Api/V1/Controllers/AccountController.php
View File

@ -169,6 +169,8 @@ class AccountController extends Controller
} }
/** /**
* Update account.
*
* @param AccountRequest $request * @param AccountRequest $request
* @param Account $account * @param Account $account
* *

2
app/Api/V1/Controllers/TransactionController.php
View File

@ -80,7 +80,7 @@ class TransactionController extends Controller
public function delete(Transaction $transaction) public function delete(Transaction $transaction)
{ {
$journal = $transaction->transactionJournal; $journal = $transaction->transactionJournal;
$this->repository->delete($journal); $this->repository->destroy($journal);
return response()->json([], 204); return response()->json([], 204);
} }

2
app/Api/V1/Requests/AccountRequest.php
View File

@ -47,6 +47,7 @@ class AccountRequest extends Request
'name' => $this->string('name'), 'name' => $this->string('name'),
'active' => $this->boolean('active'), 'active' => $this->boolean('active'),
'accountType' => $this->string('type'), 'accountType' => $this->string('type'),
'account_type_id' => null,
'currency_id' => $this->integer('currency_id'), 'currency_id' => $this->integer('currency_id'),
'currency_code' => $this->string('currency_code'), 'currency_code' => $this->string('currency_code'),
'virtualBalance' => $this->string('virtual_balance'), 'virtualBalance' => $this->string('virtual_balance'),
@ -97,6 +98,7 @@ class AccountRequest extends Request
$account = $this->route()->parameter('account'); $account = $this->route()->parameter('account');
$rules['name'] .= ':' . $account->id; $rules['name'] .= ':' . $account->id;
$rules['account_number'] .= ':' . $account->id; $rules['account_number'] .= ':' . $account->id;
$rules['type'] = 'in:' . $types;
break; break;
} }

4
app/Api/V1/Requests/BillRequest.php
View File

@ -108,8 +108,8 @@ class BillRequest extends Request
$validator->after( $validator->after(
function (Validator $validator) { function (Validator $validator) {
$data = $validator->getData(); $data = $validator->getData();
$min = floatval($data['amount_min']); $min = floatval($data['amount_min'] ?? 0);
$max = floatval($data['amount_max']); $max = floatval($data['amount_max'] ?? 0);
if ($min > $max) { if ($min > $max) {
$validator->errors()->add('amount_min', trans('validation.amount_min_over_max')); $validator->errors()->add('amount_min', trans('validation.amount_min_over_max'));
} }

3
app/Exceptions/Handler.php
View File

@ -77,8 +77,9 @@ class Handler extends ExceptionHandler
return response()->json(['message' => 'Unauthenticated', 'exception' => 'AuthenticationException'], 401); return response()->json(['message' => 'Unauthenticated', 'exception' => 'AuthenticationException'], 401);
} }
if ($request->expectsJson()) { if ($request->expectsJson()) {
$isDebug = env('APP_DEBUG', false); $isDebug = config('app.debug', false);
if ($isDebug) { if ($isDebug) {
return response()->json( return response()->json(
[ [

2
app/Services/Internal/Support/TransactionServiceTrait.php
View File

@ -216,6 +216,7 @@ trait TransactionServiceTrait
protected function setBudget(Transaction $transaction, ?Budget $budget): void protected function setBudget(Transaction $transaction, ?Budget $budget): void
{ {
if (is_null($budget)) { if (is_null($budget)) {
$transaction->budgets()->sync([]);
return; return;
} }
$transaction->budgets()->sync([$budget->id]); $transaction->budgets()->sync([$budget->id]);
@ -231,6 +232,7 @@ trait TransactionServiceTrait
protected function setCategory(Transaction $transaction, ?Category $category): void protected function setCategory(Transaction $transaction, ?Category $category): void
{ {
if (is_null($category)) { if (is_null($category)) {
$transaction->categories()->sync([]);
return; return;
} }
$transaction->categories()->sync([$category->id]); $transaction->categories()->sync([$category->id]);

2
tests/Api/V1/Controllers/TransactionControllerTest.php
View File

@ -64,7 +64,7 @@ class TransactionControllerTest extends TestCase
// mock calls: // mock calls:
$repository->shouldReceive('setUser')->once(); $repository->shouldReceive('setUser')->once();
$repository->shouldReceive('delete')->once()->andReturn(true); $repository->shouldReceive('destroy')->once()->andReturn(true);
// get account: // get account:
$transaction = $this->user()->transactions()->first(); $transaction = $this->user()->transactions()->first();