Add missing API endpoints.

app/Api/V1/Controllers/Autocomplete/TransactionController.php

@@ -80,9 +80,10 @@ class TransactionController extends Controller
         /** @var TransactionJournal $journal */
         foreach ($filtered as $journal) {
             $array[] = [
-                'id'          => $journal->id,
+                'id'                   => $journal->id,
-                'name'        => $journal->description,
+                'transaction_group_id' => $journal->transaction_group_id,
-                'description' => $journal->description,
+                'name'                 => $journal->description,
+                'description'          => $journal->description,
             ];
         }
 
@@ -90,22 +91,14 @@ class TransactionController extends Controller
     }
 
     /**
-     * Searches in the titles of all transaction journals.
-     * The result is limited to the top 15 unique results.
-     *
-     * If the query is numeric, it will append the journal with that particular ID.
-     *
      * @param AutocompleteRequest $request
      *
      * @return JsonResponse
      */
-    public function allJournalsWithID(AutocompleteRequest $request): JsonResponse
+    public function transactionsWithID(AutocompleteRequest $request): JsonResponse
     {
         $data   = $request->getData();
-        $array  = [];
         $result = new Collection;
-
-
         if (is_numeric($data['query'])) {
             // search for group, not journal.
             $firstResult = $this->groupRepository->find((int) $data['query']);
@@ -120,12 +113,16 @@ class TransactionController extends Controller
             $result = $this->repository->searchJournalDescriptions($data['query'], $data['limit']);
         }
 
+        // limit and unique
+        $array = [];
+
         /** @var TransactionJournal $journal */
         foreach ($result as $journal) {
             $array[] = [
-                'id'          => $journal->id,
+                'id'                   => $journal->id,
-                'name'        => printf('#%d: %s', $journal->id, $journal->description),
+                'transaction_group_id' => $journal->transaction_group_id,
-                'description' => $journal->description,
+                'name'                 => sprintf('#%d: %s', $journal->transaction_group_id, $journal->description),
+                'description'          => sprintf('#%d: %s', $journal->transaction_group_id, $journal->description),
             ];
         }
 

app/Api/V1/Controllers/TransactionController.php

@@ -40,6 +40,7 @@ use FireflyIII\Support\Http\Api\TransactionFilter;
 use FireflyIII\Transformers\AttachmentTransformer;
 use FireflyIII\Transformers\PiggyBankEventTransformer;
 use FireflyIII\Transformers\TransactionGroupTransformer;
+use FireflyIII\Transformers\TransactionLinkTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -57,12 +58,9 @@ class TransactionController extends Controller
 {
     use TransactionFilter;
 
-    /** @var TransactionGroupRepositoryInterface Group repository. */
+    private TransactionGroupRepositoryInterface $groupRepository;
-    private $groupRepository;
+    private JournalAPIRepositoryInterface       $journalAPIRepository;
-    /** @var JournalAPIRepositoryInterface Journal API repos */
+    private JournalRepositoryInterface          $repository;
-    private $journalAPIRepository;
-    /** @var JournalRepositoryInterface The journal repository */
-    private $repository;
 
     /**
      * TransactionController constructor.
@@ -112,6 +110,29 @@ class TransactionController extends Controller
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
     }
 
+    /**
+     * @param TransactionGroup $transactionGroup
+     *
+     * @return JsonResponse
+     * @codeCoverageIgnore
+     */
+    public function transactionLinks(TransactionGroup $transactionGroup): JsonResponse
+    {
+        $manager     = $this->getManager();
+        $journalLinks = new Collection;
+        foreach ($transactionGroup->transactionJournals as $transactionJournal) {
+            $journalLinks = $this->journalAPIRepository->getJournalLinks($transactionJournal)->merge($journalLinks);
+        }
+
+        /** @var TransactionLinkTransformer $transformer */
+        $transformer = app(TransactionLinkTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new FractalCollection($journalLinks, $transformer, 'transaction_links');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
+
     /**
      * Remove the specified resource from storage.
      *

app/Api/V1/Controllers/UserController.php

@@ -43,9 +43,7 @@ use League\Fractal\Resource\Item;
  */
 class UserController extends Controller
 {
-
+    private UserRepositoryInterface $repository;
-    /** @var UserRepositoryInterface The user repository */
-    private $repository;
 
     /**
      * UserController constructor.

app/Repositories/Journal/JournalAPIRepository.php

@@ -121,4 +121,14 @@ class JournalAPIRepository implements JournalAPIRepositoryInterface
     {
         $this->user = $user;
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function getJournalLinks(TransactionJournal $journal): Collection
+    {
+        $collection = $journal->destJournalLinks()->get();
+
+        return $journal->sourceJournalLinks()->get()->merge($collection);
+    }
 }

app/Repositories/Journal/JournalAPIRepositoryInterface.php

@@ -51,6 +51,15 @@ interface JournalAPIRepositoryInterface
      */
     public function getAttachments(TransactionJournal $journal): Collection;
 
+    /**
+     * Return all journal links for journal.
+     *
+     * @param TransactionJournal $journal
+     *
+     * @return Collection
+     */
+    public function getJournalLinks(TransactionJournal $journal): Collection;
+
     /**
      * Get all piggy bank events for a journal.
      *

app/Repositories/User/UserRepository.php

@@ -28,6 +28,7 @@ use FireflyIII\User;
 use Illuminate\Database\QueryException;
 use Illuminate\Support\Collection;
 use Log;
+use Str;
 
 /**
  * Class UserRepository.
@@ -327,7 +328,7 @@ class UserRepository implements UserRepositoryInterface
                 'blocked'      => $data['blocked'] ?? false,
                 'blocked_code' => $data['blocked_code'] ?? null,
                 'email'        => $data['email'],
-                'password'     => str_random(24),
+                'password'     => Str::random(24),
             ]
         );
         $role = $data['role'] ?? '';

public/v1/js/ff/transactions/show.js

@@ -66,7 +66,7 @@ function makeAutoComplete() {
             }
         },
         remote: {
-            url: acURI + '?search=%QUERY&uid=' + uid,
+            url: acURI + '?query=%QUERY&uid=' + uid,
             wildcard: '%QUERY',
             filter: function (list) {
                 return $.map(list, function (item) {
@@ -85,4 +85,4 @@ function selectedJournal(event, journal) {
     $('#journal-selection').show();
     $('#selected-journal').html('<a href="' + groupURI.replace('%GROUP%', journal.transaction_group_id) + '">' + journal.description + '</a>').show();
     $('input[name="opposing"]').val(journal.id);
-}
+}

routes/api.php

@@ -481,6 +481,7 @@ 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::put('{transactionGroup}', ['uses' => 'TransactionController@update', 'as' => 'update']);
         Route::delete('{transactionGroup}/{transactionJournal}', ['uses' => 'TransactionController@deleteJournal', 'as' => 'delete-journal']);
         Route::delete('{transactionGroup}', ['uses' => 'TransactionController@delete', 'as' => 'delete']);