From f60bacba85a7e231afe413156da4772020ec4e20 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 7 Aug 2020 11:10:35 +0200 Subject: [PATCH] Fix transaction link route. --- app/Api/V1/Controllers/TransactionController.php | 13 +++++-------- routes/api.php | 4 ++-- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/app/Api/V1/Controllers/TransactionController.php b/app/Api/V1/Controllers/TransactionController.php index c758eb9b4d..a9918f774b 100644 --- a/app/Api/V1/Controllers/TransactionController.php +++ b/app/Api/V1/Controllers/TransactionController.php @@ -114,18 +114,15 @@ class TransactionController extends Controller } /** - * @param TransactionGroup $transactionGroup + * @param TransactionJournal $transactionJournal * * @return JsonResponse * @codeCoverageIgnore */ - public function transactionLinks(TransactionGroup $transactionGroup): JsonResponse + public function transactionLinks(TransactionJournal $transactionJournal): JsonResponse { - $manager = $this->getManager(); - $journalLinks = new Collection; - foreach ($transactionGroup->transactionJournals as $transactionJournal) { - $journalLinks = $this->journalAPIRepository->getJournalLinks($transactionJournal)->merge($journalLinks); - } + $manager = $this->getManager(); + $journalLinks = $this->journalAPIRepository->getJournalLinks($transactionJournal); /** @var TransactionLinkTransformer $transformer */ $transformer = app(TransactionLinkTransformer::class); @@ -293,8 +290,8 @@ class TransactionController extends Controller * * @param TransactionStoreRequest $request * - * @throws FireflyException * @return JsonResponse + * @throws FireflyException */ public function store(TransactionStoreRequest $request): JsonResponse { diff --git a/routes/api.php b/routes/api.php index c1c66396c7..42919ad95e 100644 --- a/routes/api.php +++ b/routes/api.php @@ -481,9 +481,9 @@ Route::group( Route::get('{transactionGroup}', ['uses' => 'TransactionController@show', 'as' => 'show']); Route::get('{transactionGroup}/attachments', ['uses' => 'TransactionController@attachments', 'as' => 'attachments']); Route::get('{transactionGroup}/piggy_bank_events', ['uses' => 'TransactionController@piggyBankEvents', 'as' => 'piggy_bank_events']); - Route::get('{transactionGroup}/transaction_links', ['uses' => 'TransactionController@transactionLinks', 'as' => 'transaction_links']); + Route::get('{tj}/transaction_links', ['uses' => 'TransactionController@transactionLinks', 'as' => 'transaction_links']); Route::put('{transactionGroup}', ['uses' => 'TransactionController@update', 'as' => 'update']); - Route::delete('{transactionGroup}/{transactionJournal}', ['uses' => 'TransactionController@deleteJournal', 'as' => 'delete-journal']); + Route::delete('{transactionGroup}/{tj}', ['uses' => 'TransactionController@deleteJournal', 'as' => 'delete-journal']); Route::delete('{transactionGroup}', ['uses' => 'TransactionController@delete', 'as' => 'delete']); } );