Various messy code.

app/Support/JsonApi/Enrichments/AccountEnrichment.php

@@ -25,7 +25,10 @@ namespace FireflyIII\Support\JsonApi\Enrichments;
 
 use Carbon\Carbon;
 use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Models\Account;
+use FireflyIII\Models\AccountType;
 use FireflyIII\Repositories\UserGroups\Account\AccountRepositoryInterface;
+use FireflyIII\Repositories\UserGroups\Currency\CurrencyRepositoryInterface;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Log;
 
@@ -33,20 +36,30 @@ class AccountEnrichment implements EnrichmentInterface
 {
 
     private Collection $collection;
+    private array      $currencies;
+
 
     #[\Override] public function enrich(Collection $collection): Collection
     {
-        $this->collection         = $collection;
-
+        $this->collection = $collection;
+        $this->currencies = [];
         // do everything here:
         $this->getLastActivity();
-        $this->getMetaBalances();
+        //$this->getMetaBalances();
+        $this->collectAccountTypes();
+        $this->collectMetaData();
+
+        $this->collection->transform(function (Account $account) {
+            $account->user_array = ['id' => 1,'bla bla' => 'bla'];
+            return $account;
+        });
 
         return $this->collection;
     }
 
     /**
      * TODO this method refers to a single-use method inside Steam that could be moved here.
+     *
      * @return void
      */
     private function getLastActivity(): void
@@ -56,11 +69,13 @@ class AccountEnrichment implements EnrichmentInterface
         $lastActivity      = $accountRepository->getLastActivity($this->collection);
         foreach ($lastActivity as $row) {
             $this->collection->where('id', $row['account_id'])->first()->last_activity = Carbon::parse($row['date_max'], config('app.timezone'));
+
         }
     }
 
     /**
      * TODO this method refers to a single-use method inside Steam that could be moved here.
+     *
      * @return void
      */
     private function getMetaBalances(): void
@@ -72,8 +87,62 @@ class AccountEnrichment implements EnrichmentInterface
             return;
         }
         foreach ($array as $accountId => $row) {
-            $this->collection->where('id', $accountId)->first()->balance = $row['balance'];
+            $this->collection->where('id', $accountId)->first()->balance        = $row['balance'];
             $this->collection->where('id', $accountId)->first()->native_balance = $row['native_balance'];
         }
     }
+
+    /**
+     * TODO this method refers to a single-use method inside Steam that could be moved here.
+     *
+     * @return void
+     */
+    private function collectAccountTypes(): void
+    {
+        /** @var AccountRepositoryInterface $accountRepository */
+        $accountRepository = app(AccountRepositoryInterface::class);
+        $accountTypes      = $accountRepository->getAccountTypes($this->collection);
+        $types             = [];
+
+        /** @var AccountType $row */
+        foreach ($accountTypes as $row) {
+            $types[$row->id] = $row->type;
+        }
+        $this->collection->transform(function (Account $account) use ($types) {
+            $account->type = $types[$account->id];
+            return $account;
+        });
+    }
+
+    private function collectMetaData(): void
+    {
+        /** @var AccountRepositoryInterface $accountRepository */
+        $accountRepository = app(AccountRepositoryInterface::class);
+        /** @var CurrencyRepositoryInterface $repository */
+        $repository = app(CurrencyRepositoryInterface::class);
+
+        $metaFields  = $accountRepository->getMetaValues($this->collection, ['currency_id', 'account_role', 'account_number', 'liability_direction', 'interest', 'interest_period', 'current_debt']);
+        $currencyIds = $metaFields->where('name', 'currency_id')->pluck('data')->toArray();
+
+        $currencies = [];
+        foreach ($repository->getByIds($currencyIds) as $currency) {
+            $id              = $currency->id;
+            $currencies[$id] = $currency;
+        }
+
+
+        $this->collection->transform(function (Account $account) use ($metaFields, $currencies) {
+            $set = $metaFields->where('account_id', $account->id);
+            foreach ($set as $entry) {
+                $account->{$entry->name} = $entry->data;
+                if ('currency_id' === $entry->name) {
+                    $id                               = (int) $entry->data;
+                    $account->currency_code           = $currencies[$id]?->code;
+                    $account->currency_symbol         = $currencies[$id]?->symbol;
+                    $account->currency_decimal_places = $currencies[$id]?->decimal_places;
+                }
+            }
+            return $account;
+        });
+    }
 }

app/Support/JsonApi/ExpandsQuery.php

@@ -23,20 +23,26 @@ declare(strict_types=1);
 
 namespace FireflyIII\Support\JsonApi;
 
+use FireflyIII\Support\Http\Api\AccountFilter;
 use Illuminate\Contracts\Database\Eloquent\Builder;
 use LaravelJsonApi\Core\Query\FilterParameters;
 use LaravelJsonApi\Core\Query\SortFields;
 
 trait ExpandsQuery
 {
+    use AccountFilter;
+
     final protected function addPagination(Builder $query, array $pagination): Builder
     {
         $skip = ($pagination['number'] - 1) * $pagination['size'];
         return $query->skip($skip)->take($pagination['size']);
     }
 
-    final protected function addSortParams(Builder $query, SortFields $sort): Builder
+    final protected function addSortParams(Builder $query, ?SortFields $sort): Builder
     {
+        if (null === $sort) {
+            return $query;
+        }
         foreach ($sort->all() as $sortField) {
             $query->orderBy($sortField->name(), $sortField->isAscending() ? 'ASC' : 'DESC');
         }
@@ -55,13 +61,23 @@ trait ExpandsQuery
         $query->where(function (Builder $q) use ($config, $filters) {
             foreach ($filters->all() as $filter) {
                 if (in_array($filter->key(), $config, true)) {
-                    foreach($filter->value() as $value) {
+                    foreach ($filter->value() as $value) {
                         $q->where($filter->key(), 'LIKE', sprintf('%%%s%%', $value));
                     }
                 }
             }
         });
 
+        // some filters are special, i.e. the account type filter.
+        $typeFilters = $filters->value('type', false);
+        if (false !== $typeFilters && count($typeFilters) > 0) {
+            $query->leftJoin('account_types', 'accounts.account_type_id', '=', 'account_types.id');
+            foreach ($typeFilters as $typeFilter) {
+                $types = $this->mapAccountTypes($typeFilter);
+                $query->whereIn('account_types.type', $types);
+            }
+        }
+
         return $query;
     }
 

app/Support/JsonApi/SortsCollection.php

@@ -28,8 +28,11 @@ use LaravelJsonApi\Core\Query\SortFields;
 
 trait SortsCollection
 {
-    protected function sortCollection(Collection $collection, SortFields $sortFields): Collection {
+    protected function sortCollection(Collection $collection, ?SortFields $sortFields): Collection {
 
+        if(null === $sortFields) {
+            return $collection;
+        }
         foreach($sortFields->all() as $sortField) {
             $collection = $sortField->isAscending() ? $collection->sortBy($sortField->name()) :  $collection->sortByDesc($sortField->name());
         }

app/Support/JsonApi/ValidateSortParameters.php

@@ -27,11 +27,15 @@ use LaravelJsonApi\Core\Query\SortFields;
 
 trait ValidateSortParameters
 {
-    function validateParams(string $class, SortFields $params): bool
+    function validateParams(string $class, ?SortFields $params): bool
     {
+        if(null === $params) {
+            return false;
+        }
 
         $config = config(sprintf('firefly.full_data_set.%s', $class)) ?? [];
 
+
         foreach ($params->all() as $field) {
             if (in_array($field->name(), $config, true)) {
                 return true;