Auto commit for release 'develop' on 2024-05-19

.env.example

@@ -299,27 +299,6 @@ DKR_BUILD_LOCALE=false
 # Won't significantly speed up things.
 DKR_CHECK_SQLITE=true
 
-# Run database creation and migration commands. Disable this only if you're 100% sure the DB exists
-# and is up to date.
-DKR_RUN_MIGRATION=true
-
-# Run database upgrade commands. Disable this only when you're 100% sure your DB is up-to-date
-# with the latest fixes (outside of migrations!)
-DKR_RUN_UPGRADE=true
-
-# Verify database integrity. Includes all data checks and verifications.
-# Disabling this makes Firefly III assume your DB is intact.
-DKR_RUN_VERIFY=true
-
-# Run database reporting commands. When disabled, Firefly III won't go over your data to report current state.
-# Disabling this should have no impact on data integrity or safety but it won't warn you of possible issues.
-DKR_RUN_REPORT=true
-
-# Generate OAuth2 keys.
-# When disabled, Firefly III won't attempt to generate OAuth2 Passport keys. This won't be an issue, IFF (if and only if)
-# you had previously generated keys already and they're stored in your database for restoration.
-DKR_RUN_PASSPORT_INSTALL=true
-
 # Leave the following configuration vars as is.
 # Unless you like to tinker and know what you're doing.
 APP_NAME=FireflyIII

.github/workflows/release.yml

@@ -254,7 +254,7 @@ jobs:
             echo '' >> output.txt
             echo "* Installation instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/installation/docker/), [Portainer](https://docs.firefly-iii.org/how-to/firefly-iii/installation/portainer/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/installation/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/installation/self-managed/)" >> output.txt
             echo "* Or read the upgrade instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/docker/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/self-managed/)" >> output.txt
-            echo "* The releases are signed, and you can verify them using the [Firefly III releases PGP key](https://docs.firefly-iii.org/explanation/more-information/signatures/)."
+            echo "* The releases are signed, and you can verify them using the [Firefly III releases PGP key](https://docs.firefly-iii.org/explanation/more-information/signatures/)." >> output.txt
 
             echo "Create default release."
             git tag -a $releaseName -m "Here be changelog"

app/Api/V2/Controllers/Autocomplete/AccountController.php

@@ -64,18 +64,12 @@ class AccountController extends Controller
     }
 
     /**
-     * Documentation for this endpoint:
-     * TODO list of checks
-     * 1. use dates from ParameterBag
-     * 2. Request validates dates
-     * 3. Request includes user_group_id
-     * 4. Endpoint is documented.
-     * 5. Collector uses user_group_id
+     * Documentation: https://api-docs.firefly-iii.org/?urls.primaryName=2.1.0%20(v2)#/autocomplete/getAccountsAC
      */
     public function accounts(AutocompleteRequest $request): JsonResponse
     {
         $queryParameters = $request->getParameters();
-        $result          = $this->repository->searchAccount((string) $queryParameters['query'], $queryParameters['account_types'], $queryParameters['size']);
+        $result          = $this->repository->searchAccount($queryParameters['query'], $queryParameters['account_types'], $queryParameters['size']);
         $return          = [];
 
         /** @var Account $account */
@@ -94,12 +88,12 @@ class AccountController extends Controller
             'id'    => (string) $account->id,
             'title' => $account->name,
             'meta'  => [
-                'type'             => $account->accountType->type,
-                'currency_id'      => null === $currency ? null : (string) $currency->id,
-                'currency_code'    => $currency?->code,
-                'currency_symbol'  => $currency?->symbol,
-                'currency_decimal' => $currency?->decimal_places,
-                'account_balances' => $this->getAccountBalances($account),
+                'type'                    => $account->accountType->type,
+                'currency_id'             => null === $currency ? null : (string) $currency->id,
+                'currency_code'           => $currency?->code,
+                'currency_symbol'         => $currency?->symbol,
+                'currency_decimal_places' => $currency?->decimal_places,
+                'account_balances'        => $this->getAccountBalances($account),
             ],
         ];
     }
@@ -129,17 +123,17 @@ class AccountController extends Controller
         $currency = $balance->transactionCurrency;
 
         return [
-            'title'                   => $balance->title,
-            'native_amount'           => $this->converter->convert($currency, $this->default, today(), $balance->balance),
-            'amount'                  => app('steam')->bcround($balance->balance, $currency->decimal_places),
-            'currency_id'             => (string) $currency->id,
-            'currency_code'           => $currency->code,
-            'currency_symbol'         => $currency->symbol,
-            'currency_decimal_places' => $currency->decimal_places,
-            'native_currency_id'      => (string) $this->default->id,
-            'native_currency_code'    => $this->default->code,
-            'native_currency_symbol'  => $this->default->symbol,
-            'native_currency_decimal' => $this->default->decimal_places,
+            'title'                          => $balance->title,
+            'native_amount'                  => $this->converter->convert($currency, $this->default, today(), $balance->balance),
+            'amount'                         => app('steam')->bcround($balance->balance, $currency->decimal_places),
+            'currency_id'                    => (string) $currency->id,
+            'currency_code'                  => $currency->code,
+            'currency_symbol'                => $currency->symbol,
+            'currency_decimal_places'        => $currency->decimal_places,
+            'native_currency_id'             => (string) $this->default->id,
+            'native_currency_code'           => $this->default->code,
+            'native_currency_symbol'         => $this->default->symbol,
+            'native_currency_decimal_places' => $this->default->decimal_places,
         ];
     }
 }

app/Api/V2/Controllers/Autocomplete/CategoryController.php

@@ -53,13 +53,7 @@ class CategoryController extends Controller
     }
 
     /**
-     *  Documentation for this endpoint:
-     *  TODO list of checks
-     *  1. use dates from ParameterBag
-     *  2. Request validates dates
-     *  3. Request includes user_group_id
-     *  4. Endpoint is documented.
-     *  5. Collector uses user_group_id
+     * Documentation: https://api-docs.firefly-iii.org/?urls.primaryName=2.1.0%20(v2)#/autocomplete/getCategoriesAC
      */
     public function categories(AutocompleteRequest $request): JsonResponse
     {

app/Api/V2/Controllers/Autocomplete/TagController.php

@@ -53,13 +53,7 @@ class TagController extends Controller
     }
 
     /**
-     *  Documentation for this endpoint:
-     *  TODO list of checks
-     *  1. use dates from ParameterBag
-     *  2. Request validates dates
-     *  3. Request includes user_group_id
-     *  4. Endpoint is documented.
-     *  5. Collector uses user_group_id
+     * Documentation: https://api-docs.firefly-iii.org/?urls.primaryName=2.1.0%20(v2)#/autocomplete/getTagsAC
      */
     public function tags(AutocompleteRequest $request): JsonResponse
     {

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

@@ -53,13 +53,7 @@ class TransactionController extends Controller
     }
 
     /**
-     *  Documentation for this endpoint:
-     *  TODO list of checks
-     *  1. use dates from ParameterBag
-     *  2. Request validates dates
-     *  3. Request includes user_group_id
-     *  4. Endpoint is documented.
-     *  5. Collector uses user_group_id
+     * Documentation: https://api-docs.firefly-iii.org/?urls.primaryName=2.1.0%20(v2)#/autocomplete/getTransactionsAC
      */
     public function transactionDescriptions(AutocompleteRequest $request): JsonResponse
     {

app/Api/V2/Controllers/Chart/AccountController.php

@@ -27,7 +27,6 @@ namespace FireflyIII\Api\V2\Controllers\Chart;
 use Carbon\Carbon;
 use FireflyIII\Api\V2\Controllers\Controller;
 use FireflyIII\Api\V2\Request\Chart\DashboardChartRequest;
-use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountType;
@@ -47,7 +46,6 @@ class AccountController extends Controller
     use ValidatesUserGroupTrait;
 
     private AccountRepositoryInterface $repository;
-    protected array                    $acceptedRoles = [UserRoleEnum::READ_ONLY];
 
     public function __construct()
     {
@@ -74,8 +72,6 @@ class AccountController extends Controller
      * TODO validate and set user_group_id from request
      *
      * @throws FireflyException
-     *
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function dashboard(DashboardChartRequest $request): JsonResponse
     {

app/Api/V2/Request/Autocomplete/AutocompleteRequest.php

@@ -23,18 +23,15 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V2\Request\Autocomplete;
 
-use Carbon\Carbon;
-use Carbon\Exceptions\InvalidFormatException;
 use FireflyIII\JsonApi\Rules\IsValidFilter;
 use FireflyIII\JsonApi\Rules\IsValidPage;
-use FireflyIII\Models\AccountType;
 use FireflyIII\Support\Http\Api\AccountFilter;
+use FireflyIII\Support\Http\Api\ParsesQueryFilters;
 use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
 use LaravelJsonApi\Core\Query\QueryParameters;
 use LaravelJsonApi\Validation\Rule as JsonApiRule;
-use Illuminate\Support\Facades\Log;
 
 /**
  * Class AutocompleteRequest
@@ -44,6 +41,7 @@ class AutocompleteRequest extends FormRequest
     use AccountFilter;
     use ChecksLogin;
     use ConvertsDataTypes;
+    use ParsesQueryFilters;
 
     /**
      * Loops over all possible query parameters (these are shared over ALL auto complete requests)
@@ -55,47 +53,14 @@ class AutocompleteRequest extends FormRequest
     {
         $queryParameters = QueryParameters::cast($this->all());
 
-        try {
-            $date = Carbon::createFromFormat('Y-m-d', $queryParameters->filter()?->value('date', date('Y-m-d')), config('app.timezone'));
-        } catch (InvalidFormatException $e) {
-            Log::debug(sprintf('Invalid date format in autocomplete request. Using today: %s', $e->getMessage()));
-            $date = today();
-        }
-        $query           = $queryParameters->filter()?->value('query', '') ?? '';
-        $size            = (int) ($queryParameters->page()['size'] ?? 50);
-        $accountTypes    = $this->getAccountTypeParameter($queryParameters->filter()?->value('account_types', '') ?? '');
-
         return [
-            'date'          => $date,
-            'query'         => $query,
-            'size'          => $size,
-            'account_types' => $accountTypes,
+            'date'          => $this->dateOrToday($queryParameters, 'date'),
+            'query'         => $this->arrayOfStrings($queryParameters, 'query'),
+            'size'          => $this->integerFromQueryParams($queryParameters, 'size', 50),
+            'account_types' => $this->getAccountTypeParameter($this->arrayOfStrings($queryParameters, 'account_types')),
         ];
     }
 
-    //    public function getData(): array
-    //    {
-    //
-    //        return [];
-    //        $types = $this->convertString('types');
-    //        $array = [];
-    //        if ('' !== $types) {
-    //            $array = explode(',', $types);
-    //        }
-    //        $limit = $this->convertInteger('limit');
-    //        $limit = 0 === $limit ? 10 : $limit;
-    //
-    //        // remove 'initial balance' and another from allowed types. its internal
-    //        $array = array_diff($array, [AccountType::INITIAL_BALANCE, AccountType::RECONCILIATION]);
-    //
-    //        return [
-    //            'types' => $array,
-    //            'query' => $this->convertString('query'),
-    //            'date'  => $this->getCarbonDate('date'),
-    //            'limit' => $limit,
-    //        ];
-    //    }
-
     public function rules(): array
     {
         return [

app/Api/V2/Request/Chart/ChartRequest.php

@@ -0,0 +1,112 @@
+<?php
+/*
+ * DashboardChartRequest.php
+ * Copyright (c) 2023 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V2\Request\Chart;
+
+use FireflyIII\Enums\UserRoleEnum;
+use FireflyIII\JsonApi\Rules\IsValidFilter;
+use FireflyIII\Support\Http\Api\ParsesQueryFilters;
+use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
+use FireflyIII\Support\Request\ChecksLogin;
+use FireflyIII\Support\Request\ConvertsDataTypes;
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Validation\Validator;
+use LaravelJsonApi\Core\Query\QueryParameters;
+use LaravelJsonApi\Validation\Rule as JsonApiRule;
+
+/**
+ * Class ChartRequest
+ */
+class ChartRequest extends FormRequest
+{
+    use ChecksLogin;
+    use ConvertsDataTypes;
+    use ParsesQueryFilters;
+    use ValidatesUserGroupTrait;
+
+    protected array $acceptedRoles = [UserRoleEnum::READ_ONLY];
+
+    public function getParameters(): array
+    {
+        $queryParameters = QueryParameters::cast($this->all());
+
+        return [
+            'start'          => $this->dateOrToday($queryParameters, 'start'),
+            'end'            => $this->dateOrToday($queryParameters, 'end'),
+
+            // preselected heeft maar een paar toegestane waardes.
+
+            //            'query'         => $this->arrayOfStrings($queryParameters, 'query'),
+            //            'size'          => $this->integerFromQueryParams($queryParameters,'size', 50),
+            //            'account_types' => $this->getAccountTypeParameter($this->arrayOfStrings($queryParameters, 'account_types')),
+        ];
+    }
+
+    //        return [
+    //            'accounts'    => $this->getAccountList(),
+    //            'preselected' => $this->convertString('preselected'),
+    //        ];
+    //    }
+
+    /**
+     * The rules that the incoming request must be matched against.
+     */
+    public function rules(): array
+    {
+        return [
+            'fields'  => JsonApiRule::notSupported(),
+            'filter'  => ['nullable', 'array', new IsValidFilter(['start', 'end', 'preselected', 'accounts'])],
+            'include' => JsonApiRule::notSupported(),
+            'page'    => JsonApiRule::notSupported(),
+            'sort'    => JsonApiRule::notSupported(),
+        ];
+
+        //        return [
+        //            'start'       => 'required|date|after:1900-01-01|before:2099-12-31',
+        //            'end'         => 'required|date|after_or_equal:start|before:2099-12-31|after:1900-01-01',
+        //            'preselected' => sprintf('in:%s', implode(',', config('firefly.preselected_accounts'))),
+        //            'accounts.*'  => 'exists:accounts,id',
+        //        ];
+    }
+
+    public function withValidator(Validator $validator): void
+    {
+        $validator->after(
+            static function (Validator $validator): void {
+                // validate transaction query data.
+                $data = $validator->getData();
+                if (!array_key_exists('accounts', $data)) {
+                    // $validator->errors()->add('accounts', trans('validation.filled', ['attribute' => 'accounts']));
+                    return;
+                }
+                if (!is_array($data['accounts'])) {
+                    $validator->errors()->add('accounts', trans('validation.filled', ['attribute' => 'accounts']));
+                }
+            }
+        );
+        if ($validator->fails()) {
+            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+        }
+    }
+}

app/JsonApi/Rules/IsValidFilter.php

@@ -31,7 +31,8 @@ class IsValidFilter implements ValidationRule
 
     public function __construct(array $keys)
     {
-        $this->allowed = $keys;
+        $this->allowed   = $keys;
+        $this->allowed[] = 'user_group_id';
     }
 
     #[\Override]
@@ -45,7 +46,7 @@ class IsValidFilter implements ValidationRule
         }
         foreach ($value as $key => $val) {
             if (!in_array($key, $this->allowed, true)) {
-                $fail('validation.bad_api_filter')->translate();
+                $fail('validation.bad_api_filter')->translate(['filter' => $key]);
             }
         }
     }

app/Repositories/UserGroups/Account/AccountRepository.php

@@ -292,7 +292,7 @@ class AccountRepository implements AccountRepositoryInterface
         return $query->get(['accounts.*']);
     }
 
-    public function searchAccount(string $query, array $types, int $limit): Collection
+    public function searchAccount(array $query, array $types, int $limit): Collection
     {
         // search by group, not by user
         $dbQuery = $this->userGroup->accounts()
@@ -302,14 +302,17 @@ class AccountRepository implements AccountRepositoryInterface
             ->orderBy('accounts.name', 'ASC')
             ->with(['accountType'])
         ;
-        if ('' !== $query) {
+        if (count($query) > 0) {
             // split query on spaces just in case:
-            // TODO this will always fail because it searches for AND.
-            $parts = explode(' ', $query);
-            foreach ($parts as $part) {
-                $search = sprintf('%%%s%%', $part);
-                $dbQuery->where('name', 'LIKE', $search);
-            }
+            $dbQuery->where(function (EloquentBuilder $q) use ($query): void {
+                foreach ($query as $line) {
+                    $parts = explode(' ', $line);
+                    foreach ($parts as $part) {
+                        $search = sprintf('%%%s%%', $part);
+                        $q->orWhere('name', 'LIKE', $search);
+                    }
+                }
+            });
         }
         if (0 !== count($types)) {
             $dbQuery->leftJoin('account_types', 'accounts.account_type_id', '=', 'account_types.id');

app/Repositories/UserGroups/Account/AccountRepositoryInterface.php

@@ -80,7 +80,7 @@ interface AccountRepositoryInterface
      */
     public function resetAccountOrder(): void;
 
-    public function searchAccount(string $query, array $types, int $limit): Collection;
+    public function searchAccount(array $query, array $types, int $limit): Collection;
 
     public function setUser(User $user): void;
 

app/Repositories/UserGroups/Category/CategoryRepository.php

@@ -24,17 +24,27 @@ declare(strict_types=1);
 namespace FireflyIII\Repositories\UserGroups\Category;
 
 use FireflyIII\Support\Repositories\UserGroup\UserGroupTrait;
+use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
 use Illuminate\Support\Collection;
 
 class CategoryRepository implements CategoryRepositoryInterface
 {
     use UserGroupTrait;
 
-    public function searchCategory(string $query, int $limit): Collection
+    public function searchCategory(array $query, int $limit): Collection
     {
         $search = $this->userGroup->categories();
-        if ('' !== $query) {
-            $search->where('name', 'LIKE', sprintf('%%%s%%', $query));
+        if (count($query) > 0) {
+            // split query on spaces just in case:
+            $search->where(function (EloquentBuilder $q) use ($query): void {
+                foreach ($query as $line) {
+                    $parts = explode(' ', $line);
+                    foreach ($parts as $part) {
+                        $search = sprintf('%%%s%%', $part);
+                        $q->orWhere('name', 'LIKE', $search);
+                    }
+                }
+            });
         }
 
         return $search->take($limit)->get();

app/Repositories/UserGroups/Category/CategoryRepositoryInterface.php

@@ -30,5 +30,5 @@ interface CategoryRepositoryInterface
     /**
      * Search for a category using wild cards. Uses the database, so case sensitive.
      */
-    public function searchCategory(string $query, int $limit): Collection;
+    public function searchCategory(array $query, int $limit): Collection;
 }

app/Repositories/UserGroups/Journal/JournalRepository.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace FireflyIII\Repositories\UserGroups\Journal;
 
 use FireflyIII\Support\Repositories\UserGroup\UserGroupTrait;
+use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
 use Illuminate\Support\Collection;
 
 /**
@@ -33,15 +34,24 @@ class JournalRepository implements JournalRepositoryInterface
 {
     use UserGroupTrait;
 
-    public function searchJournalDescriptions(string $search, int $limit): Collection
+    public function searchJournalDescriptions(array $query, int $limit): Collection
     {
-        $query = $this->userGroup->transactionJournals()
+        $search = $this->userGroup->transactionJournals()
             ->orderBy('date', 'DESC')
         ;
-        if ('' !== $search) {
-            $query->where('description', 'LIKE', sprintf('%%%s%%', $search));
+        if (count($query) > 0) {
+            // split query on spaces just in case:
+            $search->where(function (EloquentBuilder $q) use ($query): void {
+                foreach ($query as $line) {
+                    $parts = explode(' ', $line);
+                    foreach ($parts as $part) {
+                        $search = sprintf('%%%s%%', $part);
+                        $q->orWhere('description', 'LIKE', $search);
+                    }
+                }
+            });
         }
 
-        return $query->take($limit)->get();
+        return $search->take($limit)->get();
     }
 }

app/Repositories/UserGroups/Journal/JournalRepositoryInterface.php

@@ -34,7 +34,7 @@ interface JournalRepositoryInterface
     /**
      * Search in journal descriptions.
      */
-    public function searchJournalDescriptions(string $search, int $limit): Collection;
+    public function searchJournalDescriptions(array $query, int $limit): Collection;
 
     public function setUser(User $user): void;
 }

app/Repositories/UserGroups/Tag/TagRepository.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace FireflyIII\Repositories\UserGroups\Tag;
 
 use FireflyIII\Support\Repositories\UserGroup\UserGroupTrait;
+use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
 use Illuminate\Support\Collection;
 
 /**
@@ -33,11 +34,20 @@ class TagRepository implements TagRepositoryInterface
 {
     use UserGroupTrait;
 
-    public function searchTag(string $query, int $limit): Collection
+    public function searchTag(array $query, int $limit): Collection
     {
-        $search = $this->user->tags();
-        if ('' !== $query) {
-            $search->where('tag', 'LIKE', sprintf('%%%s%%', $query));
+        $search = $this->userGroup->tags();
+        if (count($query) > 0) {
+            // split query on spaces just in case:
+            $search->where(function (EloquentBuilder $q) use ($query): void {
+                foreach ($query as $line) {
+                    $parts = explode(' ', $line);
+                    foreach ($parts as $part) {
+                        $search = sprintf('%%%s%%', $part);
+                        $q->orWhere('tag', 'LIKE', $search);
+                    }
+                }
+            });
         }
 
         return $search->take($limit)->get(['tags.*']);

app/Repositories/UserGroups/Tag/TagRepositoryInterface.php

@@ -30,5 +30,5 @@ interface TagRepositoryInterface
     /**
      * Find one or more tags based on the query.
      */
-    public function searchTag(string $query, int $limit): Collection;
+    public function searchTag(array $query, int $limit): Collection;
 }

app/Support/Http/Api/ParsesQueryFilters.php

@@ -0,0 +1,57 @@
+<?php
+/*
+ * ParsesQueryFilters.php
+ * Copyright (c) 2024 james@firefly-iii.org.
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see https://www.gnu.org/licenses/.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Support\Http\Api;
+
+use Carbon\Carbon;
+use Carbon\Exceptions\InvalidFormatException;
+use Illuminate\Support\Facades\Log;
+use LaravelJsonApi\Core\Query\QueryParameters;
+
+trait ParsesQueryFilters
+{
+    private function dateOrToday(QueryParameters $parameters, string $field): Carbon
+    {
+        $date = today();
+
+        try {
+            $date = Carbon::createFromFormat('Y-m-d', $parameters->filter()?->value($field, date('Y-m-d')), config('app.timezone'));
+        } catch (InvalidFormatException $e) {
+            Log::debug(sprintf('Invalid date format in request. Using today: %s', $e->getMessage()));
+        }
+
+        return $date;
+    }
+
+    private function arrayOfStrings(QueryParameters $parameters, string $field): array
+    {
+        $array = $parameters->filter()?->value($field, []) ?? [];
+
+        return is_string($array) ? [$array] : $array;
+    }
+
+    private function integerFromQueryParams(QueryParameters $parameters, string $field, int $default): int
+    {
+        return (int) ($parameters->page()[$field] ?? $default);
+    }
+}

app/Support/Http/Api/ValidatesUserGroupTrait.php

@@ -38,6 +38,10 @@ use Illuminate\Support\Facades\Log;
 trait ValidatesUserGroupTrait
 {
     /**
+     * An "undocumented" filter
+     *
+     * TODO add this filter to the API docs.
+     *
      * @throws AuthorizationException
      * @throws AuthenticationException
      */

changelog.md

@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 6.1.16 - 2024-05-20
+
+### Added
+
+- Added [THANKS.md] to give credit to all developers who help with the development of Firefly III.
+
+### Changed
+
+- New data model for "account balance" makes it easier to calculate and use multi-currency accounts. Not yet in use.
+
+### Fixed
+
+- [Issue 8840](https://github.com/firefly-iii/firefly-iii/issues/8840) (Budget page crash) reported by @JcMinarro
+- [Issue 8863](https://github.com/firefly-iii/firefly-iii/issues/8863) (Empty webhooks page) reported by @mrahmadt
+- [Issue 8867](https://github.com/firefly-iii/firefly-iii/issues/8867) (SQL Integrity constraint violation when inserting into budget_limits) reported by @HedgehogRidingAnOwl 
+- [Issue 8858](https://github.com/firefly-iii/firefly-iii/issues/8858) (A single Account constantly loses its Account NUmber / IBAN ) reported by @ypsilonkah
+
+### API
+
+- New filters for the v2 autocomplete endpoints.
+- Various attempts to make a better v2 accounts endpoint.
+
 ## 6.1.15 - 2024-04-24
 
 ### Fixed

composer.lock

@@ -874,26 +874,26 @@
         },
         {
             "name": "firebase/php-jwt",
-            "version": "v6.10.0",
+            "version": "v6.10.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/firebase/php-jwt.git",
-                "reference": "a49db6f0a5033aef5143295342f1c95521b075ff"
+                "reference": "500501c2ce893c824c801da135d02661199f60c5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/firebase/php-jwt/zipball/a49db6f0a5033aef5143295342f1c95521b075ff",
-                "reference": "a49db6f0a5033aef5143295342f1c95521b075ff",
+                "url": "https://api.github.com/repos/firebase/php-jwt/zipball/500501c2ce893c824c801da135d02661199f60c5",
+                "reference": "500501c2ce893c824c801da135d02661199f60c5",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.4||^8.0"
+                "php": "^8.0"
             },
             "require-dev": {
-                "guzzlehttp/guzzle": "^6.5||^7.4",
+                "guzzlehttp/guzzle": "^7.4",
                 "phpspec/prophecy-phpunit": "^2.0",
                 "phpunit/phpunit": "^9.5",
-                "psr/cache": "^1.0||^2.0",
+                "psr/cache": "^2.0||^3.0",
                 "psr/http-client": "^1.0",
                 "psr/http-factory": "^1.0"
             },
@@ -931,9 +931,9 @@
             ],
             "support": {
                 "issues": "https://github.com/firebase/php-jwt/issues",
-                "source": "https://github.com/firebase/php-jwt/tree/v6.10.0"
+                "source": "https://github.com/firebase/php-jwt/tree/v6.10.1"
             },
-            "time": "2023-12-01T16:26:39+00:00"
+            "time": "2024-05-18T18:05:11+00:00"
         },
         {
             "name": "fruitcake/php-cors",

config/firefly.php

@@ -117,8 +117,8 @@ return [
         'expression_engine' => false,
         // see cer.php for exchange rates feature flag.
     ],
-    'version'                      => 'develop/2024-05-18',
-    'api_version'                  => '2.0.14',
+    'version'                      => 'develop/2024-05-19',
+    'api_version'                  => '2.1.0',
     'db_version'                   => 24,
 
     // generic settings

resources/lang/bg_BG/validation.php

@@ -34,6 +34,7 @@
 declare(strict_types=1);
 
 return [
+    'bad_api_filter'                  => 'This API endpoint does not support ":filter" as a filter.',
     'bad_type_source'                 => 'Firefly III can\'t determine the transaction type based on this source account.',
     'bad_type_destination'            => 'Firefly III can\'t determine the transaction type based on this destination account.',
     'missing_where'                   => 'Array is missing "where"-clause',

resources/lang/ca_ES/validation.php

@@ -34,6 +34,7 @@
 declare(strict_types=1);
 
 return [
+    'bad_api_filter'                  => 'This API endpoint does not support ":filter" as a filter.',
     'bad_type_source'                 => 'Firefly III no pot determinar el tipus de transacció a partir d\'aquest compte font.',
     'bad_type_destination'            => 'Firefly III no pot determinar el tipus de transacció a partir d\'aquest compte de destí.',
     'missing_where'                   => 'A l\'array li falta la clàusula "where"',

resources/lang/cs_CZ/validation.php

@@ -34,6 +34,7 @@
 declare(strict_types=1);
 
 return [
+    'bad_api_filter'                  => 'This API endpoint does not support ":filter" as a filter.',
     'bad_type_source'                 => 'Firefly III can\'t determine the transaction type based on this source account.',
     'bad_type_destination'            => 'Firefly III can\'t determine the transaction type based on this destination account.',
     'missing_where'                   => 'Array is missing "where"-clause',

resources/lang/da_DK/validation.php

@@ -34,6 +34,7 @@
 declare(strict_types=1);
 
 return [
+    'bad_api_filter'                  => 'This API endpoint does not support ":filter" as a filter.',
     'bad_type_source'                 => 'Firefly III kan ikke bestemme transaktionstypen baseret på denne kildekonto.',
     'bad_type_destination'            => 'Firefly III kan ikke bestemme transaktionstypen baseret på denne destinationskonto.',
     'missing_where'                   => 'Array mangler “Where”-sektion',

resources/lang/de_DE/validation.php

@@ -34,6 +34,7 @@
 declare(strict_types=1);
 
 return [
+    'bad_api_filter'                  => 'This API endpoint does not support ":filter" as a filter.',
     'bad_type_source'                 => 'Firefly III kann die Buchungsart anhand dieses Quellkontos nicht ermitteln.',
     'bad_type_destination'            => 'Firefly III kann die Buchungsart anhand dieses Zielkontos nicht ermitteln.',
     'missing_where'                   => 'Dem Array fehlt die „where”-Klausel',

resources/lang/el_GR/validation.php

@@ -34,6 +34,7 @@
 declare(strict_types=1);
 
 return [
+    'bad_api_filter'                  => 'This API endpoint does not support ":filter" as a filter.',
     'bad_type_source'                 => 'Το Firefly III δεν μπορεί να καθορίσει τον τύπο συναλλαγής με βάση αυτό το λογαριασμό προέλευσης.',
     'bad_type_destination'            => 'Το Firefly III δεν μπορεί να καθορίσει τον τύπο συναλλαγής με βάση αυτό το λογαριασμό προορισμού.',
     'missing_where'                   => 'Από τον πίνακα λείπει η ρήτρα "where"',

resources/lang/en_GB/validation.php

@@ -34,6 +34,7 @@
 declare(strict_types=1);
 
 return [
+    'bad_api_filter'                  => 'This API endpoint does not support ":filter" as a filter.',
     'bad_type_source'                 => 'Firefly III can\'t determine the transaction type based on this source account.',
     'bad_type_destination'            => 'Firefly III can\'t determine the transaction type based on this destination account.',
     'missing_where'                   => 'Array is missing "where"-clause',

resources/lang/en_US/validation.php

@@ -25,6 +25,7 @@
 declare(strict_types=1);
 
 return [
+    'bad_api_filter'                  => 'This API endpoint does not support ":filter" as a filter.',
     'bad_type_source'                 => 'Firefly III can\'t determine the transaction type based on this source account.',
     'bad_type_destination'            => 'Firefly III can\'t determine the transaction type based on this destination account.',
     'missing_where'                   => 'Array is missing "where"-clause',

resources/lang/es_ES/validation.php

@@ -34,6 +34,7 @@
 declare(strict_types=1);
 
 return [
+    'bad_api_filter'                  => 'This API endpoint does not support ":filter" as a filter.',
     'bad_type_source'                 => 'Firefly III no puede determinar el tipo de transacción basado en esta cuenta de origen.',
     'bad_type_destination'            => 'Firefly III no puede determinar el tipo de transacción basado en esta cuenta de destino.',
     'missing_where'                   => 'El array esperaba la cláusula "where"',

resources/lang/fi_FI/validation.php

@@ -34,6 +34,7 @@
 declare(strict_types=1);
 
 return [
+    'bad_api_filter'                  => 'This API endpoint does not support ":filter" as a filter.',
     'bad_type_source'                 => 'Firefly III can\'t determine the transaction type based on this source account.',
     'bad_type_destination'            => 'Firefly III can\'t determine the transaction type based on this destination account.',
     'missing_where'                   => 'Taulukosta puuttuu "where"-komento',

resources/lang/fr_FR/validation.php

@@ -34,6 +34,7 @@
 declare(strict_types=1);
 
 return [
+    'bad_api_filter'                  => 'This API endpoint does not support ":filter" as a filter.',
     'bad_type_source'                 => 'Firefly III ne peut pas déterminer le type de transaction basé sur ce compte source.',
     'bad_type_destination'            => 'Firefly III ne peut pas déterminer le type de transaction basé sur ce compte de destination.',
     'missing_where'                   => 'La requête ne contient pas de clause "where"',

resources/lang/hu_HU/validation.php

@@ -34,6 +34,7 @@
 declare(strict_types=1);
 
 return [
+    'bad_api_filter'                  => 'This API endpoint does not support ":filter" as a filter.',
     'bad_type_source'                 => 'A Firefly III nem tudja eldönteni a tranzakció típusát a forrásszámla alapján.',
     'bad_type_destination'            => 'A Firefly III nem tudja eldönteni a tranzakció típusát a célszámla alapján.',
     'missing_where'                   => 'Array is missing "where"-clause',

resources/lang/id_ID/validation.php

@@ -34,6 +34,7 @@
 declare(strict_types=1);
 
 return [
+    'bad_api_filter'                  => 'This API endpoint does not support ":filter" as a filter.',
     'bad_type_source'                 => 'Firefly III can\'t determine the transaction type based on this source account.',
     'bad_type_destination'            => 'Firefly III can\'t determine the transaction type based on this destination account.',
     'missing_where'                   => 'Array is missing "where"-clause',

resources/lang/it_IT/validation.php

@@ -34,6 +34,7 @@
 declare(strict_types=1);
 
 return [
+    'bad_api_filter'                  => 'This API endpoint does not support ":filter" as a filter.',
     'bad_type_source'                 => 'Firefly III non può determinare il tipo di transazione in base a questo account sorgente.',
     'bad_type_destination'            => 'Firefly III non può determinare il tipo di transazione in base a questo account di destinazione.',
     'missing_where'                   => 'Clausola "where" assente nell\'array',

resources/lang/ja_JP/validation.php

@@ -34,6 +34,7 @@
 declare(strict_types=1);
 
 return [
+    'bad_api_filter'                  => 'This API endpoint does not support ":filter" as a filter.',
     'bad_type_source'                 => 'Firefly III can\'t determine the transaction type based on this source account.',
     'bad_type_destination'            => 'Firefly III can\'t determine the transaction type based on this destination account.',
     'missing_where'                   => '配列に"where"節がありません',

resources/lang/ko_KR/validation.php

@@ -34,6 +34,7 @@
 declare(strict_types=1);
 
 return [
+    'bad_api_filter'                  => 'This API endpoint does not support ":filter" as a filter.',
     'bad_type_source'                 => 'Firefly III can\'t determine the transaction type based on this source account.',
     'bad_type_destination'            => 'Firefly III can\'t determine the transaction type based on this destination account.',
     'missing_where'                   => '배열에 "where"절이 없습니다',

resources/lang/nb_NO/validation.php

@@ -34,6 +34,7 @@
 declare(strict_types=1);
 
 return [
+    'bad_api_filter'                  => 'This API endpoint does not support ":filter" as a filter.',
     'bad_type_source'                 => 'Firefly III can\'t determine the transaction type based on this source account.',
     'bad_type_destination'            => 'Firefly III can\'t determine the transaction type based on this destination account.',
     'missing_where'                   => 'Matrise mangler "where"-klausul',

resources/lang/nl_NL/validation.php

@@ -34,6 +34,7 @@
 declare(strict_types=1);
 
 return [
+    'bad_api_filter'                  => 'This API endpoint does not support ":filter" as a filter.',
     'bad_type_source'                 => 'Firefly III kan het transactietype niet bepalen op basis van deze bronrekening.',
     'bad_type_destination'            => 'Firefly III kan het transactietype niet bepalen op basis van deze doelrekening.',
     'missing_where'                   => 'Array mist "where"-clausule',

resources/lang/nn_NO/validation.php

@@ -34,6 +34,7 @@
 declare(strict_types=1);
 
 return [
+    'bad_api_filter'                  => 'This API endpoint does not support ":filter" as a filter.',
     'bad_type_source'                 => 'Firefly III can\'t determine the transaction type based on this source account.',
     'bad_type_destination'            => 'Firefly III can\'t determine the transaction type based on this destination account.',
     'missing_where'                   => 'Matrise mangler "where"-klausul',

resources/lang/pl_PL/validation.php

@@ -34,6 +34,7 @@
 declare(strict_types=1);
 
 return [
+    'bad_api_filter'                  => 'This API endpoint does not support ":filter" as a filter.',
     'bad_type_source'                 => 'Firefly III can\'t determine the transaction type based on this source account.',
     'bad_type_destination'            => 'Firefly III can\'t determine the transaction type based on this destination account.',
     'missing_where'                   => 'Tablica nie zawiera klauzuli "where"',

resources/lang/pt_BR/validation.php

@@ -34,6 +34,7 @@
 declare(strict_types=1);
 
 return [
+    'bad_api_filter'                  => 'This API endpoint does not support ":filter" as a filter.',
     'bad_type_source'                 => 'Firefly III não conseguiu determinar o tipo de transação baseado nesta conta de origem.',
     'bad_type_destination'            => 'Firefly III não conseguiu determinar o tipo de transação baseado nesta conta destino.',
     'missing_where'                   => 'O array está sem a cláusula "where"',

resources/lang/pt_PT/validation.php

@@ -34,6 +34,7 @@
 declare(strict_types=1);
 
 return [
+    'bad_api_filter'                  => 'This API endpoint does not support ":filter" as a filter.',
     'bad_type_source'                 => 'O Firefly III não consegue determinar o tipo de transação baseado nesta conta de origem.',
     'bad_type_destination'            => 'O Firefly III não consegue determinar o tipo de transação baseado nesta conta de destino.',
     'missing_where'                   => 'A matriz tem em falta a cláusula-"onde"',

resources/lang/ro_RO/validation.php

@@ -34,6 +34,7 @@
 declare(strict_types=1);
 
 return [
+    'bad_api_filter'                  => 'This API endpoint does not support ":filter" as a filter.',
     'bad_type_source'                 => 'Firefly III nu poate determina tipul de tranzacție pe baza acestui cont sursă.',
     'bad_type_destination'            => 'Firefly III nu poate determina tipul de tranzacție bazat pe acest cont de destinație.',
     'missing_where'                   => 'Array lipseşte "unde clauza',

resources/lang/ru_RU/validation.php

@@ -34,6 +34,7 @@
 declare(strict_types=1);
 
 return [
+    'bad_api_filter'                  => 'This API endpoint does not support ":filter" as a filter.',
     'bad_type_source'                 => 'Firefly III не может определить тип транзакции на основе этого исходного счета.',
     'bad_type_destination'            => 'Firefly III не может определить тип транзакции на основе этого счета.',
     'missing_where'                   => 'В массиве отсутствует связка "where" ("где")',

resources/lang/sk_SK/validation.php

@@ -34,6 +34,7 @@
 declare(strict_types=1);
 
 return [
+    'bad_api_filter'                  => 'This API endpoint does not support ":filter" as a filter.',
     'bad_type_source'                 => 'Firefly III can\'t determine the transaction type based on this source account.',
     'bad_type_destination'            => 'Firefly III can\'t determine the transaction type based on this destination account.',
     'missing_where'                   => 'Array is missing "where"-clause',

resources/lang/sl_SI/validation.php

@@ -34,6 +34,7 @@
 declare(strict_types=1);
 
 return [
+    'bad_api_filter'                  => 'This API endpoint does not support ":filter" as a filter.',
     'bad_type_source'                 => 'Na podlagi tega izvornega računa Firefly III ne more določiti vrste transakcije.',
     'bad_type_destination'            => 'Na podlagi tega ciljnega računa Firefly III ne more določiti vrste transakcije.',
     'missing_where'                   => 'Matriki manjka člen "kjer"',

resources/lang/sv_SE/validation.php

@@ -34,6 +34,7 @@
 declare(strict_types=1);
 
 return [
+    'bad_api_filter'                  => 'This API endpoint does not support ":filter" as a filter.',
     'bad_type_source'                 => 'Firefly III kan inte avgöra transaktionstypen baserat på detta källkonto.',
     'bad_type_destination'            => 'Firefly III can\'t determine the transaction type based on this destination account.',
     'missing_where'                   => 'Array saknar "var"-klausul',

resources/lang/th_TH/validation.php

@@ -34,6 +34,7 @@
 declare(strict_types=1);
 
 return [
+    'bad_api_filter'                  => 'This API endpoint does not support ":filter" as a filter.',
     'bad_type_source'                 => 'Firefly III can\'t determine the transaction type based on this source account.',
     'bad_type_destination'            => 'Firefly III can\'t determine the transaction type based on this destination account.',
     'missing_where'                   => 'Array is missing "where"-clause',

resources/lang/tr_TR/validation.php

@@ -34,6 +34,7 @@
 declare(strict_types=1);
 
 return [
+    'bad_api_filter'                  => 'This API endpoint does not support ":filter" as a filter.',
     'bad_type_source'                 => 'Firefly III can\'t determine the transaction type based on this source account.',
     'bad_type_destination'            => 'Firefly III can\'t determine the transaction type based on this destination account.',
     'missing_where'                   => 'Array is missing "where"-clause',

resources/lang/uk_UA/validation.php

@@ -34,6 +34,7 @@
 declare(strict_types=1);
 
 return [
+    'bad_api_filter'                  => 'This API endpoint does not support ":filter" as a filter.',
     'bad_type_source'                 => 'Firefly III can\'t determine the transaction type based on this source account.',
     'bad_type_destination'            => 'Firefly III can\'t determine the transaction type based on this destination account.',
     'missing_where'                   => 'Array is missing "where"-clause',

resources/lang/vi_VN/validation.php

@@ -34,6 +34,7 @@
 declare(strict_types=1);
 
 return [
+    'bad_api_filter'                  => 'This API endpoint does not support ":filter" as a filter.',
     'bad_type_source'                 => 'Firefly III can\'t determine the transaction type based on this source account.',
     'bad_type_destination'            => 'Firefly III can\'t determine the transaction type based on this destination account.',
     'missing_where'                   => 'Mảng bị thiếu mệnh đề "where"',

resources/lang/zh_CN/validation.php

@@ -34,6 +34,7 @@
 declare(strict_types=1);
 
 return [
+    'bad_api_filter'                  => 'This API endpoint does not support ":filter" as a filter.',
     'bad_type_source'                 => 'Firefly III 无法确定基于此源账户的交易类型。',
     'bad_type_destination'            => 'Firefly III 无法确定基于此目标帐户的交易类型。',
     'missing_where'                   => '数组中缺少"where"条目',

resources/lang/zh_TW/validation.php

@@ -34,6 +34,7 @@
 declare(strict_types=1);
 
 return [
+    'bad_api_filter'                  => 'This API endpoint does not support ":filter" as a filter.',
     'bad_type_source'                 => 'Firefly III can\'t determine the transaction type based on this source account.',
     'bad_type_destination'            => 'Firefly III can\'t determine the transaction type based on this destination account.',
     'missing_where'                   => 'Array is missing "where"-clause',