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

New test code.

Browse Source
This commit is contained in:
James Cole
2018-07-02 20:02:20 +02:00
parent f27eb084c7
commit 2e67bd3b78
8 changed files with 2083 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Api/V1/Controllers/JournalLinkController.php
View File

@@ -68,13 +68,13 @@ class JournalLinkController extends Controller
/**
* Delete the resource.
*
* @param string $object
* @param TransactionJournalLink $link
*
* @return JsonResponse
*/
public function delete(string $object): JsonResponse
public function delete(TransactionJournalLink $link): JsonResponse
{
// todo delete object.
$this->repository->destroyLink($link);
return response()->json([], 204);
}
@@ -88,8 +88,6 @@ class JournalLinkController extends Controller
*/
public function index(Request $request): JsonResponse
{
// create some objects:
$manager = new Manager;
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';

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

@@ -66,7 +66,7 @@ class RecurrenceController extends Controller
/**
* Delete the resource.
*
* @param string $object
* @param Recurrence $recurrence
*
* @return JsonResponse
*/

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

@@ -30,6 +30,7 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Rules\BelongsUser;
use Illuminate\Validation\Validator;
use InvalidArgumentException;
use Log;
/**
* Class RecurrenceRequest
@@ -208,6 +209,7 @@ class RecurrenceRequest extends Request
$repository = app(AccountRepositoryInterface::class);
$repository->setUser(auth()->user());
$set = $repository->getAccountsById([$accountId]);
Log::debug(sprintf('Count of accounts found by ID %d is: %d', $accountId, $set->count()));
if ($set->count() === 1) {
/** @var Account $first */
$first = $set->first();
@@ -399,7 +401,7 @@ class RecurrenceRequest extends Request
if (null !== $repetitions && null !== $repeatUntil) {
// expect a date OR count:
$validator->errors()->add('repeat_until', trans('validation.require_repeat_until'));
$validator->errors()->add('repetitions', trans('validation.require_repeat_until'));
$validator->errors()->add('nr_of_repetitions', trans('validation.require_repeat_until'));
return;
}