Auto commit for release 'develop' on 2024-12-28

# Conflicts:
#	composer.lock
#	config/firefly.php
#	package-lock.json

.ci/php-cs-fixer/composer.lock

@@ -1369,12 +1369,12 @@
             },
             "type": "library",
             "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/contracts",
+                    "name": "symfony/contracts"
+                },
                 "branch-alias": {
                     "dev-main": "3.5-dev"
-                },
-                "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
                 }
             },
             "autoload": {
@@ -1517,12 +1517,12 @@
             },
             "type": "library",
             "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/contracts",
+                    "name": "symfony/contracts"
+                },
                 "branch-alias": {
                     "dev-main": "3.5-dev"
-                },
-                "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
                 }
             },
             "autoload": {
@@ -2329,12 +2329,12 @@
             },
             "type": "library",
             "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/contracts",
+                    "name": "symfony/contracts"
+                },
                 "branch-alias": {
                     "dev-main": "3.5-dev"
-                },
-                "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
                 }
             },
             "autoload": {

.github/workflows/release.yml

@@ -10,7 +10,7 @@ on:
       phpversion:
         description: 'PHP version'
         required: true
-        default: '8.3'
+        default: '8.4'
   schedule:
     - cron: '0 3 * * MON'
 

.github/workflows/sonarcloud.yml

@@ -19,7 +19,7 @@ jobs:
       - name: Setup PHP with Xdebug
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.3'
+          php-version: '8.4'
           coverage: xdebug
           extensions: >-
             bcmath

app/Api/V1/Controllers/Controller.php

@@ -28,6 +28,8 @@ use Carbon\Carbon;
 use Carbon\Exceptions\InvalidDateException;
 use Carbon\Exceptions\InvalidFormatException;
 use FireflyIII\Models\Preference;
+use FireflyIII\Support\Facades\Amount;
+use FireflyIII\Support\Facades\Steam;
 use FireflyIII\User;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Foundation\Bus\DispatchesJobs;
@@ -68,8 +70,8 @@ abstract class Controller extends BaseController
             function ($request, $next) {
                 $this->parameters = $this->getParameters();
                 if (auth()->check()) {
-                    $language              = app('steam')->getLanguage();
-                    $this->convertToNative = app('preferences')->get('convert_to_native', false)->data;
+                    $language              = Steam::getLanguage();
+                    $this->convertToNative = Amount::convertToNative();
                     app()->setLocale($language);
 
                 }

app/Api/V1/Controllers/Summary/BasicController.php

@@ -123,8 +123,8 @@ class BasicController extends Controller
     private function getBalanceInformation(Carbon $start, Carbon $end): array
     {
         // some config settings
-        $convertToNative = app('preferences')->get('convert_to_native', false)->data;
-        $default         = app('amount')->getDefaultCurrency();
+        $convertToNative = Amount::convertToNative();
+        $default         = Amount::getDefaultCurrency();
         // prep some arrays:
         $incomes         = [];
         $expenses        = [];

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

@@ -1,113 +0,0 @@
-<?php
-
-/*
- * AccountController.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\Api\V2\Controllers\JsonApi;
-
-use FireflyIII\Http\Controllers\Controller;
-use FireflyIII\JsonApi\V2\Accounts\AccountCollectionQuery;
-use FireflyIII\JsonApi\V2\Accounts\AccountSchema;
-use FireflyIII\JsonApi\V2\Accounts\AccountSingleQuery;
-use FireflyIII\Models\Account;
-use Illuminate\Contracts\Support\Responsable;
-use Illuminate\Http\Response;
-use Illuminate\Support\Facades\Log;
-use LaravelJsonApi\Core\Responses\DataResponse;
-use LaravelJsonApi\Laravel\Http\Controllers\Actions;
-
-/**
- * Class AccountController
- *
- * This class handles api/v2 requests for accounts.
- * Most stuff is default stuff.
- */
-class AccountController extends Controller
-{
-    use Actions\AttachRelationship;
-    use Actions\Destroy;
-    use Actions\DetachRelationship;
-
-    use Actions\FetchMany;
-
-    // use Actions\FetchOne;
-    use Actions\FetchRelated;
-    use Actions\FetchRelationship;
-    use Actions\Store;
-    use Actions\Update;
-    use Actions\UpdateRelationship;
-
-    /**
-     * Fetch zero to many JSON API resources.
-     *
-     * @return Responsable|Response
-     */
-    public function index(AccountSchema $schema, AccountCollectionQuery $request)
-    {
-        Log::debug(__METHOD__);
-        $models = $schema
-            ->repository()
-            ->queryAll()
-            ->withRequest($request)
-            ->get()
-        ;
-
-        // do something custom...
-
-        return new DataResponse($models);
-    }
-
-    /**
-     * Fetch zero to one JSON API resource by id.
-     *
-     * @return Responsable|Response
-     */
-    public function show(AccountSchema $schema, AccountSingleQuery $request, Account $account)
-    {
-        Log::debug(__METHOD__);
-        $model = $schema->repository()
-            ->queryOne($account)
-            ->withRequest($request)
-            ->first()
-        ;
-        Log::debug(sprintf('%s again!', __METHOD__));
-
-        // do something custom...
-
-        return new DataResponse($model);
-    }
-
-    //    public function readAccountBalances(AnonymousQuery $query, AccountBalanceSchema $schema, Account $account): Responsable
-    //    {
-    //        $schema = JsonApi::server()->schemas()->schemaFor('account-balances');
-    //
-    //        $models = $schema
-    //            ->repository()
-    //            ->queryAll()
-    //            ->withRequest($query)
-    //            ->withAccount($account)
-    //            ->get()
-    //        ;
-    //
-    //        return DataResponse::make($models);
-    //    }
-}

app/Console/Commands/Correction/CorrectionSkeleton.php.stub

@@ -4,10 +4,6 @@ namespace FireflyIII\Console\Commands\Correction;
 
 use Illuminate\Console\Command;
 
-/**
- * Class CorrectionSkeleton
- * TODO DONT FORGET TO ADD THIS TO THE DOCKER BUILD
- */
 class CorrectionSkeleton extends Command
 {
     use ShowsFriendlyMessages;

app/Console/Commands/Correction/CorrectsGroupAccounts.php

@@ -31,9 +31,6 @@ use FireflyIII\Models\TransactionGroup;
 use FireflyIII\Models\TransactionJournal;
 use Illuminate\Console\Command;
 
-/**
- * Class FixGroupAccounts
- */
 class CorrectsGroupAccounts extends Command
 {
     use ShowsFriendlyMessages;

app/Console/Commands/Correction/CorrectsNativeAmounts.php

@@ -59,6 +59,11 @@ class CorrectsNativeAmounts extends Command
      */
     public function handle(): int
     {
+        if (!config('cer.enabled')) {
+            $this->friendlyInfo('This command will not run because currency exchange rates are disabled.');
+
+            return 0;
+        }
         Log::debug('Will update all native amounts. This may take some time.');
         $this->friendlyWarning('Recalculating native amounts for all objects. This may take some time!');
 
@@ -102,7 +107,7 @@ class CorrectsNativeAmounts extends Command
         foreach ($set as $account) {
             $account->touch();
         }
-        Log::debug(sprintf('Recalculated %d accounts', $set->count()));
+        Log::debug(sprintf('Recalculated %d accounts for user group #%d.', $set->count(), $userGroup->id));
     }
 
     private function recalculatePiggyBanks(UserGroup $userGroup, TransactionCurrency $currency): void
@@ -124,14 +129,14 @@ class CorrectsNativeAmounts extends Command
 
             foreach ($piggyBank->accounts as $account) {
                 $account->pivot->native_current_amount = null;
-                if (0 !== bccomp($account->pivot->current_amount, '0')) {
-                    $account->pivot->native_current_amount = $converter->convert($piggyBank->transactionCurrency, $currency, today(), $account->pivot->current_amount);
+                if (0 !== bccomp((string) $account->pivot->current_amount, '0')) {
+                    $account->pivot->native_current_amount = $converter->convert($piggyBank->transactionCurrency, $currency, today(), (string) $account->pivot->current_amount);
                 }
                 $account->pivot->save();
             }
             $this->recalculatePiggyBankEvents($piggyBank);
         }
-        Log::debug(sprintf('Recalculated %d piggy banks.', $set->count()));
+        Log::debug(sprintf('Recalculated %d piggy banks for user group #%d.', $set->count(), $userGroup->id));
 
     }
 
@@ -168,7 +173,7 @@ class CorrectsNativeAmounts extends Command
             $limit->touch();
             Log::debug(sprintf('Done with touch BL #%d', $limit->id));
         }
-        Log::debug(sprintf('Recalculated %d budget limits.', $set->count()));
+        Log::debug(sprintf('Recalculated %d budget limits for budget #%d.', $set->count(), $budget->id));
     }
 
     private function recalculateAutoBudgets(Budget $budget, TransactionCurrency $currency): void
@@ -179,7 +184,7 @@ class CorrectsNativeAmounts extends Command
         foreach ($set as $autoBudget) {
             $autoBudget->touch();
         }
-        Log::debug(sprintf('Recalculated %d auto budgets.', $set->count()));
+        Log::debug(sprintf('Recalculated %d auto budgets for budget #%d.', $set->count(), $budget->id));
     }
 
     private function recalculateAvailableBudgets(UserGroup $userGroup, TransactionCurrency $currency): void

app/Console/Commands/Correction/CorrectsPiggyBanks.php

@@ -29,11 +29,6 @@ use FireflyIII\Models\PiggyBankEvent;
 use FireflyIII\Models\TransactionJournal;
 use Illuminate\Console\Command;
 
-/**
- * Report (and fix) piggy banks.
- *
- * Class FixPiggies
- */
 class CorrectsPiggyBanks extends Command
 {
     use ShowsFriendlyMessages;

app/Console/Commands/Correction/CorrectsTransferBudgets.php

@@ -29,9 +29,6 @@ use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\TransactionType;
 use Illuminate\Console\Command;
 
-/**
- * Class TransferBudgets
- */
 class CorrectsTransferBudgets extends Command
 {
     use ShowsFriendlyMessages;

app/Console/Commands/Correction/CorrectsUnevenAmount.php

@@ -33,9 +33,6 @@ use FireflyIII\Support\Models\AccountBalanceCalculator;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Log;
 
-/**
- * Class FixUnevenAmount
- */
 class CorrectsUnevenAmount extends Command
 {
     use ShowsFriendlyMessages;

app/Console/Commands/Correction/CreatesAccessTokens.php

@@ -29,9 +29,6 @@ use FireflyIII\Repositories\User\UserRepositoryInterface;
 use FireflyIII\User;
 use Illuminate\Console\Command;
 
-/**
- * Class CreateAccessTokens
- */
 class CreatesAccessTokens extends Command
 {
     use ShowsFriendlyMessages;

app/Console/Commands/Correction/CreatesLinkTypes.php

@@ -28,9 +28,6 @@ use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use FireflyIII\Models\LinkType;
 use Illuminate\Console\Command;
 
-/**
- * Class CreateLinkTypes. Created all link types in case a migration hasn't fired.
- */
 class CreatesLinkTypes extends Command
 {
     use ShowsFriendlyMessages;

app/Console/Commands/Correction/RemovesBills.php

@@ -29,9 +29,6 @@ use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\TransactionType;
 use Illuminate\Console\Command;
 
-/**
- * Class RemoveBills
- */
 class RemovesBills extends Command
 {
     use ShowsFriendlyMessages;

app/Console/Commands/Correction/RemovesEmptyGroups.php

@@ -29,9 +29,6 @@ use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use FireflyIII\Models\TransactionGroup;
 use Illuminate\Console\Command;
 
-/**
- * Class DeleteEmptyGroups
- */
 class RemovesEmptyGroups extends Command
 {
     use ShowsFriendlyMessages;

app/Console/Commands/Correction/RemovesEmptyJournals.php

@@ -30,9 +30,6 @@ use FireflyIII\Models\TransactionJournal;
 use Illuminate\Console\Command;
 use Illuminate\Database\QueryException;
 
-/**
- * Class DeleteEmptyJournals
- */
 class RemovesEmptyJournals extends Command
 {
     use ShowsFriendlyMessages;

app/Console/Commands/Correction/RestoresOAuthKeys.php

@@ -28,9 +28,6 @@ use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use FireflyIII\Support\System\OAuthKeys;
 use Illuminate\Console\Command;
 
-/**
- * Class RestoreOAuthKeys
- */
 class RestoresOAuthKeys extends Command
 {
     use ShowsFriendlyMessages;

app/Console/Commands/Export/ExportsData.php

@@ -36,10 +36,7 @@ use FireflyIII\Support\Export\ExportDataGenerator;
 use Illuminate\Console\Command;
 use Illuminate\Support\Collection;
 
-/**
- * Class ExportData
- */
-class ExportData extends Command
+class ExportsData extends Command
 {
     use ShowsFriendlyMessages;
     use VerifiesAccessToken;

app/Console/Commands/Integrity/ReportSkeleton.php.stub

@@ -4,10 +4,6 @@ namespace FireflyIII\Console\Commands\Integrity;
 
 use Illuminate\Console\Command;
 
-/**
- * Class ReportSkeleton
- * TODO DONT FORGET TO ADD THIS TO THE DOCKER BUILD
- */
 class ReportSkeleton extends Command
 {
 

app/Console/Commands/Integrity/ReportsEmptyObjects.php

@@ -31,9 +31,6 @@ use FireflyIII\Models\Category;
 use FireflyIII\Models\Tag;
 use Illuminate\Console\Command;
 
-/**
- * Class ReportEmptyObjects
- */
 class ReportsEmptyObjects extends Command
 {
     use ShowsFriendlyMessages;

app/Console/Commands/Integrity/ReportsIntegrity.php

@@ -27,9 +27,6 @@ namespace FireflyIII\Console\Commands\Integrity;
 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use Illuminate\Console\Command;
 
-/**
- * Class ReportIntegrity
- */
 class ReportsIntegrity extends Command
 {
     use ShowsFriendlyMessages;

app/Console/Commands/Integrity/ReportsSums.php

@@ -29,9 +29,6 @@ use FireflyIII\Repositories\User\UserRepositoryInterface;
 use FireflyIII\User;
 use Illuminate\Console\Command;
 
-/**
- * Class ReportSkeleton
- */
 class ReportsSums extends Command
 {
     use ShowsFriendlyMessages;

app/Console/Commands/System/CallsLaravelPassportKeys.php

@@ -28,7 +28,7 @@ use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Artisan;
 use Symfony\Component\Console\Command\Command as CommandAlias;
 
-class LaravelPassportKeys extends Command
+class CallsLaravelPassportKeys extends Command
 {
     use ShowsFriendlyMessages;
 

app/Console/Commands/System/CreatesDatabase.php

@@ -28,10 +28,7 @@ use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use Illuminate\Console\Command;
 use PDO;
 
-/**
- * Class CreateDatabase
- */
-class CreateDatabase extends Command
+class CreatesDatabase extends Command
 {
     use ShowsFriendlyMessages;
 

app/Console/Commands/System/CreatesFirstUser.php

@@ -29,16 +29,13 @@ use FireflyIII\Repositories\User\UserRepositoryInterface;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Hash;
 
-/**
- * Class CreateFirstUser
- */
-class CreateFirstUser extends Command
+class CreatesFirstUser extends Command
 {
     use ShowsFriendlyMessages;
 
     protected $description = 'Creates a new user and gives admin rights. Outputs the password on the command line. Strictly for testing.';
 
-    protected $signature   = 'firefly-iii:create-first-user {email}';
+    protected $signature   = 'system:create-first-user {email}';
     private UserRepositoryInterface $repository;
 
     /**

app/Console/Commands/System/ForcesDecimalSize.php

@@ -44,13 +44,11 @@ use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
 
 /**
- * Class ForceDecimalSize
- *
  * This command was inspired by https://github.com/elliot-gh. It will check all amount fields
  * and their values and correct them to the correct number of decimal places. This fixes issues where
  * Firefly III would store 0.01 as 0.01000000000000000020816681711721685132943093776702880859375.
  */
-class ForceDecimalSize extends Command
+class ForcesDecimalSize extends Command
 {
     use ShowsFriendlyMessages;
 

app/Console/Commands/System/ForcesMigrations.php

@@ -33,10 +33,7 @@ use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Schema;
 
-/**
- * Class ForceMigration
- */
-class ForceMigration extends Command
+class ForcesMigrations extends Command
 {
     use ShowsFriendlyMessages;
     use VerifiesAccessToken;

app/Console/Commands/System/OutputsInstructions.php

@@ -27,16 +27,13 @@ namespace FireflyIII\Console\Commands\System;
 use FireflyIII\Support\System\GeneratesInstallationId;
 use Illuminate\Console\Command;
 
-/**
- * Class UpgradeFireflyInstructions.
- */
-class UpgradeFireflyInstructions extends Command
+class OutputsInstructions extends Command
 {
     use GeneratesInstallationId;
 
     protected $description = 'Instructions in case of upgrade trouble.';
 
-    protected $signature   = 'firefly:instructions {task}';
+    protected $signature   = 'firefly-iii:instructions {task=install}';
 
     /**
      * Execute the console command.
@@ -79,7 +76,7 @@ class UpgradeFireflyInstructions extends Command
         }
 
         $prefix  = 'v';
-        if (str_starts_with($version, 'develop')) {
+        if (str_starts_with($version, 'develop') || str_starts_with($version, 'branch')) {
             $prefix = '';
         }
 
@@ -94,6 +91,8 @@ class UpgradeFireflyInstructions extends Command
             $this->boxedInfo('There are no extra upgrade instructions.');
             $this->boxed('Firefly III should be ready for use.');
             $this->boxed('');
+            $this->donationText();
+            $this->boxed('');
             $this->showLine();
 
             return;
@@ -102,6 +101,8 @@ class UpgradeFireflyInstructions extends Command
         $this->boxed(sprintf('Thank you for updating to Firefly III, %s%s!', $prefix, $version));
         $this->boxedInfo($text);
         $this->boxed('');
+        $this->donationText();
+        $this->boxed('');
         $this->showLine();
     }
 
@@ -213,6 +214,8 @@ class UpgradeFireflyInstructions extends Command
             $this->boxedInfo('There are no extra installation instructions.');
             $this->boxed('Firefly III should be ready for use.');
             $this->boxed('');
+            $this->donationText();
+            $this->boxed('');
             $this->showLine();
 
             return;
@@ -221,6 +224,15 @@ class UpgradeFireflyInstructions extends Command
         $this->boxed(sprintf('Thank you for installing Firefly III, %s%s!', $prefix, $version));
         $this->boxedInfo($text);
         $this->boxed('');
+        $this->donationText();
+        $this->boxed('');
         $this->showLine();
     }
+
+    private function donationText(): void
+    {
+        $this->boxed('Did you know you can support the development of Firefly III?');
+        $this->boxed('You can donate in many ways, like GitHub Sponsors or Patreon.');
+        $this->boxed('For more information, please visit https://bit.ly/donate-to-Firefly-III');
+    }
 }

app/Console/Commands/System/OutputsVersion.php

@@ -26,10 +26,7 @@ namespace FireflyIII\Console\Commands\System;
 
 use Illuminate\Console\Command;
 
-/**
- * Class OutputVersion
- */
-class OutputVersion extends Command
+class OutputsVersion extends Command
 {
     protected $description = 'Outputs the Firefly III version';
 

app/Console/Commands/System/ScansAttachments.php

@@ -29,10 +29,7 @@ use FireflyIII\Models\Attachment;
 use Illuminate\Console\Command;
 use Illuminate\Contracts\Encryption\DecryptException;
 
-/**
- * Class ScanAttachments.
- */
-class ScanAttachments extends Command
+class ScansAttachments extends Command
 {
     use ShowsFriendlyMessages;
 

app/Console/Commands/System/SetsLatestVersion.php

@@ -27,10 +27,7 @@ namespace FireflyIII\Console\Commands\System;
 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use Illuminate\Console\Command;
 
-/**
- * Class SetLatestVersion
- */
-class SetLatestVersion extends Command
+class SetsLatestVersion extends Command
 {
     use ShowsFriendlyMessages;
 

app/Console/Commands/System/VerifySecurityAlerts.php

@@ -29,9 +29,6 @@ use Illuminate\Console\Command;
 use Illuminate\Database\QueryException;
 use League\Flysystem\FilesystemException;
 
-/**
- * Class VerifySecurityAlerts
- */
 class VerifySecurityAlerts extends Command
 {
     use ShowsFriendlyMessages;

app/Console/Commands/Tools/ApplyRules.php

@@ -40,9 +40,6 @@ use Illuminate\Console\Command;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Log;
 
-/**
- * Class ApplyRules
- */
 class ApplyRules extends Command
 {
     use ShowsFriendlyMessages;

app/Console/Commands/Tools/Cron.php

@@ -34,9 +34,6 @@ use FireflyIII\Support\Cronjobs\RecurringCronjob;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Log;
 
-/**
- * Class Cron
- */
 class Cron extends Command
 {
     use ShowsFriendlyMessages;

app/Console/Commands/Upgrade/AddsTransactionIdentifiers.php

@@ -76,9 +76,6 @@ class AddsTransactionIdentifiers extends Command
             $this->updateJournalIdentifiers($journal);
         }
 
-        if (0 === $this->count) {
-            $this->friendlyPositive('All split journal transaction identifiers are OK.');
-        }
         if (0 !== $this->count) {
             $this->friendlyInfo(sprintf('Fixed %d split journal transaction identifier(s).', $this->count));
         }

app/Console/Commands/Upgrade/RemovesDatabaseDecryption.php

@@ -70,7 +70,6 @@ class RemovesDatabaseDecryption extends Command
     private function decryptTable(string $table, array $fields): void
     {
         if ($this->isDecrypted($table)) {
-            $this->friendlyInfo(sprintf('No decryption required for table "%s".', $table));
 
             return;
         }

app/Console/Commands/Upgrade/UpgradeSkeleton.php.stub

@@ -4,9 +4,6 @@ namespace FireflyIII\Console\Commands\Upgrade;
 
 use Illuminate\Console\Command;
 
-/**
- * Class UpgradeSkeleton.
- */
 class UpgradeSkeleton extends Command
 {
     use ShowsFriendlyMessages;

app/Console/Commands/Upgrade/UpgradesAccountCurrencies.php

@@ -62,9 +62,6 @@ class UpgradesAccountCurrencies extends Command
         }
         $this->updateAccountCurrencies();
 
-        if (0 === $this->count) {
-            $this->friendlyPositive('All account currencies are OK.');
-        }
         if (0 !== $this->count) {
             $this->friendlyInfo(sprintf('Corrected %d account(s).', $this->count));
         }

app/Console/Commands/Upgrade/UpgradesAccountMetaData.php

@@ -73,9 +73,6 @@ class UpgradesAccountMetaData extends Command
 
         $this->markAsExecuted();
 
-        if (0 === $count) {
-            $this->friendlyPositive('All account meta is OK.');
-        }
         if (0 !== $count) {
             $this->friendlyInfo(sprintf('Renamed %d account meta entries (entry).', $count));
         }

app/Console/Commands/Upgrade/UpgradesAttachments.php

@@ -79,9 +79,6 @@ class UpgradesAttachments extends Command
                 ++$count;
             }
         }
-        if (0 === $count) {
-            $this->friendlyPositive('All attachments are OK.');
-        }
         if (0 !== $count) {
             $this->friendlyInfo(sprintf('Updated %d attachment(s).', $count));
         }

app/Console/Commands/Upgrade/UpgradesBillsToRules.php

@@ -73,9 +73,6 @@ class UpgradesBillsToRules extends Command
             $this->migrateUser($user);
         }
 
-        if (0 === $this->count) {
-            $this->friendlyPositive('All bills are OK.');
-        }
         if (0 !== $this->count) {
             $this->friendlyInfo(sprintf('Verified and fixed %d bill(s).', $this->count));
         }

app/Console/Commands/Upgrade/UpgradesBudgetLimits.php

@@ -77,9 +77,6 @@ class UpgradesBudgetLimits extends Command
                 }
             }
         }
-        if (0 === $count) {
-            $this->friendlyPositive('All budget limits are OK.');
-        }
         $this->markAsExecuted();
 
         return 0;

app/Console/Commands/Upgrade/UpgradesCreditCardLiabilities.php

@@ -55,7 +55,6 @@ class UpgradesCreditCardLiabilities extends Command
         $ccType   = AccountType::where('type', AccountType::CREDITCARD)->first();
         $debtType = AccountType::where('type', AccountType::DEBT)->first();
         if (null === $ccType || null === $debtType) {
-            $this->friendlyPositive('No incorrectly stored credit card liabilities.');
             $this->markAsExecuted();
 
             return 0;
@@ -73,9 +72,6 @@ class UpgradesCreditCardLiabilities extends Command
                 'Credit card liability types are no longer supported and have been converted to generic debts. See: https://bit.ly/FF3-credit-cards'
             );
         }
-        if (0 === $accounts->count()) {
-            $this->friendlyPositive('No incorrectly stored credit card liabilities.');
-        }
         $this->markAsExecuted();
 
         return 0;

app/Console/Commands/Upgrade/UpgradesDatabase.php

@@ -57,7 +57,6 @@ class UpgradesDatabase extends Command
             'upgrade:480-account-meta',
             'upgrade:481-recurrence-meta',
             'upgrade:500-tag-locations',
-            'upgrade:550-recurrence-type',
             'upgrade:560-liabilities',
             'upgrade:600-liabilities',
             'upgrade:550-budget-limit-periods',

app/Console/Commands/Upgrade/UpgradesJournalMetaData.php

@@ -68,7 +68,7 @@ class UpgradesJournalMetaData extends Command
 
     private function isMigrated(): bool
     {
-        $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false);
+        $configVar = app('fireflyconfig')->get(UpgradesToGroups::CONFIG_NAME, false);
 
         return (bool) $configVar->data;
     }

app/Console/Commands/Upgrade/UpgradesJournalNotes.php

@@ -72,9 +72,6 @@ class UpgradesJournalNotes extends Command
             ++$count;
         }
 
-        if (0 === $count) {
-            $this->friendlyPositive('No notes to migrate.');
-        }
         if (0 !== $count) {
             $this->friendlyInfo(sprintf('Migrated %d note(s).', $count));
         }

app/Console/Commands/Upgrade/UpgradesRecurrenceMetaData.php

@@ -52,9 +52,6 @@ class UpgradesRecurrenceMetaData extends Command
         }
         $count = $this->migrateMetaData();
 
-        if (0 === $count) {
-            $this->friendlyPositive('No recurrence meta data migrated.');
-        }
         if ($count > 0) {
             $this->friendlyInfo(sprintf('Migrated %d meta data entries', $count));
         }

app/Console/Commands/Upgrade/UpgradesRecurrenceType.php

@@ -1,67 +0,0 @@
-<?php
-
-/*
- * MigrateRecurrenceType.php
- * Copyright (c) 2021 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\Console\Commands\Upgrade;
-
-use FireflyIII\Console\Commands\ShowsFriendlyMessages;
-use Illuminate\Console\Command;
-
-class UpgradesRecurrenceType extends Command
-{
-    use ShowsFriendlyMessages;
-
-    public const string CONFIG_NAME = '550_migrate_recurrence_type';
-
-    protected $description          = 'Migrate transaction type of recurring transaction.';
-
-    protected $signature            = 'upgrade:550-recurrence-type {--F|force : Force the execution of this command.}';
-
-    /**
-     * Execute the console command.
-     */
-    public function handle(): int
-    {
-        if ($this->isExecuted() && true !== $this->option('force')) {
-            $this->friendlyInfo('This command has already been executed.');
-
-            return 0;
-        }
-        $this->friendlyWarning('This command has been disabled.');
-        $this->markAsExecuted();
-
-        return 0;
-    }
-
-    private function isExecuted(): bool
-    {
-        $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false);
-
-        return (bool) $configVar?->data;
-    }
-
-    private function markAsExecuted(): void
-    {
-        app('fireflyconfig')->set(self::CONFIG_NAME, true);
-    }
-}

app/Console/Commands/Upgrade/UpgradesToGroups.php

@@ -72,9 +72,6 @@ class UpgradesToGroups extends Command
         if (0 !== $this->count) {
             $this->friendlyInfo(sprintf('Migrated %d transaction journal(s).', $this->count));
         }
-        if (0 === $this->count) {
-            $this->friendlyPositive('No journals to migrate to groups.');
-        }
         $this->markAsMigrated();
 
         return 0;
@@ -363,9 +360,6 @@ class UpgradesToGroups extends Command
                 $this->giveGroup($array);
             }
         }
-        if (0 === $total) {
-            $this->friendlyPositive('No need to convert transaction journals.');
-        }
     }
 
     private function giveGroup(array $array): void

app/Console/Commands/Upgrade/UpgradesTransferCurrencies.php

@@ -68,15 +68,10 @@ class UpgradesTransferCurrencies extends Command
 
         $this->startUpdateRoutine();
         $this->markAsExecuted();
-
-        if (0 === $this->count) {
-            $this->friendlyPositive('All transfers have correct currency information.');
-
-            return 0;
+        if ($this->count > 0) {
+            $this->friendlyInfo(sprintf('Verified currency information of %d transfer(s).', $this->count));
         }
 
-        $this->friendlyInfo(sprintf('Verified currency information of %d transfer(s).', $this->count));
-
         return 0;
     }
 

app/Exceptions/Handler.php

@@ -36,8 +36,6 @@ use Illuminate\Session\TokenMismatchException;
 use Illuminate\Support\Arr;
 use Illuminate\Validation\ValidationException as LaravelValidationException;
 use Laravel\Passport\Exceptions\OAuthServerException as LaravelOAuthException;
-use LaravelJsonApi\Core\Exceptions\JsonApiException;
-use LaravelJsonApi\Exceptions\ExceptionParser;
 use League\OAuth2\Server\Exception\OAuthServerException;
 use Symfony\Component\HttpFoundation\Exception\SuspiciousOperationException;
 use Symfony\Component\HttpFoundation\Response;
@@ -65,18 +63,12 @@ class Handler extends ExceptionHandler
             HttpException::class,
             SuspiciousOperationException::class,
             BadHttpHeaderException::class,
-            JsonApiException::class,
         ];
 
     /**
      * Register the exception handling callbacks for the application.
      */
-    public function register(): void
-    {
-        $this->renderable(
-            ExceptionParser::make()->renderable()
-        );
-    }
+    public function register(): void {}
 
     /**
      * Render an exception into an HTTP response. It's complex but lucky for us, we never use it because

app/Factory/PiggyBankFactory.php

@@ -231,8 +231,8 @@ class PiggyBankFactory
             foreach ($accounts as $info) {
                 if ($account->id === $info['account_id']) {
                     if (array_key_exists($account->id, $accounts)) {
-                        $toBeLinked[$account->id] = ['current_amount' => $account->pivot->current_amount];
-                        Log::debug(sprintf('Prefilled for account #%d with amount %s', $account->id, $account->pivot->current_amount));
+                        $toBeLinked[$account->id] = ['current_amount' => $account->pivot?->current_amount ?? '0'];
+                        Log::debug(sprintf('Prefilled for account #%d with amount %s', $account->id, $account->pivot?->current_amount ?? '0'));
                     }
                 }
             }
@@ -247,7 +247,7 @@ class PiggyBankFactory
             }
             if (array_key_exists('current_amount', $info)) {
                 $toBeLinked[$account->id] = ['current_amount' => $info['current_amount']];
-                Log::debug(sprintf('Will link account #%d with amount %s', $account->id, $account->pivot->current_amount));
+                Log::debug(sprintf('Will link account #%d with amount %s', $account->id, $account->pivot?->current_amount ?? '0'));
             }
             if (!array_key_exists('current_amount', $info)) {
                 $toBeLinked[$account->id] ??= [];

app/Handlers/Observer/AccountObserver.php

@@ -27,6 +27,7 @@ namespace FireflyIII\Handlers\Observer;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\PiggyBank;
 use FireflyIII\Repositories\UserGroups\Account\AccountRepositoryInterface;
+use FireflyIII\Support\Facades\Amount;
 use FireflyIII\Support\Http\Api\ExchangeRateConverter;
 use Illuminate\Support\Facades\Log;
 
@@ -37,12 +38,15 @@ class AccountObserver
 {
     public function created(Account $account): void
     {
-        Log::debug('Observe "created" of an account.');
+        //        Log::debug('Observe "created" of an account.');
         $this->updateNativeAmount($account);
     }
 
     private function updateNativeAmount(Account $account): void
     {
+        if (!Amount::convertToNative($account->user)) {
+            return;
+        }
         $userCurrency = app('amount')->getDefaultCurrencyByUserGroup($account->user->userGroup);
         $repository   = app(AccountRepositoryInterface::class);
         $currency     = $repository->getAccountCurrency($account);
@@ -57,7 +61,7 @@ class AccountObserver
             $account->native_virtual_balance = null;
         }
         $account->saveQuietly();
-        Log::debug('Account native virtual balance is updated.');
+        // Log::debug('Account native virtual balance is updated.');
     }
 
     /**
@@ -65,7 +69,7 @@ class AccountObserver
      */
     public function deleting(Account $account): void
     {
-        app('log')->debug('Observe "deleting" of an account.');
+        //        app('log')->debug('Observe "deleting" of an account.');
         $account->accountMeta()->delete();
 
         /** @var PiggyBank $piggy */
@@ -84,7 +88,7 @@ class AccountObserver
 
     public function updated(Account $account): void
     {
-        Log::debug('Observe "updated" of an account.');
+        //        Log::debug('Observe "updated" of an account.');
         $this->updateNativeAmount($account);
     }
 }

app/Handlers/Observer/AutoBudgetObserver.php

@@ -25,6 +25,7 @@ declare(strict_types=1);
 namespace FireflyIII\Handlers\Observer;
 
 use FireflyIII\Models\AutoBudget;
+use FireflyIII\Support\Facades\Amount;
 use FireflyIII\Support\Http\Api\ExchangeRateConverter;
 use Illuminate\Support\Facades\Log;
 
@@ -44,6 +45,9 @@ class AutoBudgetObserver
 
     private function updateNativeAmount(AutoBudget $autoBudget): void
     {
+        if (!Amount::convertToNative($autoBudget->budget->user)) {
+            return;
+        }
         $userCurrency              = app('amount')->getDefaultCurrencyByUserGroup($autoBudget->budget->user->userGroup);
         $autoBudget->native_amount = null;
         if ($autoBudget->transactionCurrency->id !== $userCurrency->id) {

app/Handlers/Observer/AvailableBudgetObserver.php

@@ -25,6 +25,7 @@ declare(strict_types=1);
 namespace FireflyIII\Handlers\Observer;
 
 use FireflyIII\Models\AvailableBudget;
+use FireflyIII\Support\Facades\Amount;
 use FireflyIII\Support\Http\Api\ExchangeRateConverter;
 use Illuminate\Support\Facades\Log;
 
@@ -44,6 +45,9 @@ class AvailableBudgetObserver
 
     private function updateNativeAmount(AvailableBudget $availableBudget): void
     {
+        if (!Amount::convertToNative($availableBudget->user)) {
+            return;
+        }
         $userCurrency                   = app('amount')->getDefaultCurrencyByUserGroup($availableBudget->user->userGroup);
         $availableBudget->native_amount = null;
         if ($availableBudget->transactionCurrency->id !== $userCurrency->id) {

app/Handlers/Observer/BillObserver.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace FireflyIII\Handlers\Observer;
 
 use FireflyIII\Models\Bill;
+use FireflyIII\Support\Facades\Amount;
 use FireflyIII\Support\Http\Api\ExchangeRateConverter;
 use Illuminate\Support\Facades\Log;
 
@@ -55,6 +56,9 @@ class BillObserver
 
     private function updateNativeAmount(Bill $bill): void
     {
+        if (!Amount::convertToNative($bill->user)) {
+            return;
+        }
         $userCurrency            = app('amount')->getDefaultCurrencyByUserGroup($bill->user->userGroup);
         $bill->native_amount_min = null;
         $bill->native_amount_max = null;

app/Handlers/Observer/BudgetLimitObserver.php

@@ -25,6 +25,7 @@ declare(strict_types=1);
 namespace FireflyIII\Handlers\Observer;
 
 use FireflyIII\Models\BudgetLimit;
+use FireflyIII\Support\Facades\Amount;
 use FireflyIII\Support\Http\Api\ExchangeRateConverter;
 use Illuminate\Support\Facades\Log;
 
@@ -44,6 +45,9 @@ class BudgetLimitObserver
 
     private function updateNativeAmount(BudgetLimit $budgetLimit): void
     {
+        if (!Amount::convertToNative($budgetLimit->budget->user)) {
+            return;
+        }
         $userCurrency               = app('amount')->getDefaultCurrencyByUserGroup($budgetLimit->budget->user->userGroup);
         $budgetLimit->native_amount = null;
         if ($budgetLimit->transactionCurrency->id !== $userCurrency->id) {

app/Handlers/Observer/PiggyBankEventObserver.php

@@ -25,6 +25,7 @@ declare(strict_types=1);
 namespace FireflyIII\Handlers\Observer;
 
 use FireflyIII\Models\PiggyBankEvent;
+use FireflyIII\Support\Facades\Amount;
 use FireflyIII\Support\Http\Api\ExchangeRateConverter;
 use Illuminate\Support\Facades\Log;
 
@@ -44,6 +45,9 @@ class PiggyBankEventObserver
 
     private function updateNativeAmount(PiggyBankEvent $event): void
     {
+        if (!Amount::convertToNative($event->piggyBank->accounts()->first()->user)) {
+            return;
+        }
         $userCurrency         = app('amount')->getDefaultCurrencyByUserGroup($event->piggyBank->accounts()->first()->user->userGroup);
         $event->native_amount = null;
         if ($event->piggyBank->transactionCurrency->id !== $userCurrency->id) {

app/Handlers/Observer/PiggyBankObserver.php

@@ -78,6 +78,7 @@ class PiggyBankObserver
         if ($piggyBank->transactionCurrency->id !== $userCurrency->id) {
             $converter                       = new ExchangeRateConverter();
             $converter->setIgnoreSettings(true);
+            $converter->setUserGroup($group);
             $piggyBank->native_target_amount = $converter->convert($piggyBank->transactionCurrency, $userCurrency, today(), $piggyBank->target_amount);
         }
         $piggyBank->saveQuietly();

app/Handlers/Observer/TransactionObserver.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace FireflyIII\Handlers\Observer;
 
 use FireflyIII\Models\Transaction;
+use FireflyIII\Support\Facades\Amount;
 use FireflyIII\Support\Http\Api\ExchangeRateConverter;
 use FireflyIII\Support\Models\AccountBalanceCalculator;
 use Illuminate\Support\Facades\Log;
@@ -55,7 +56,7 @@ class TransactionObserver
 
     public function updated(Transaction $transaction): void
     {
-        Log::debug('Observe "updated" of a transaction.');
+        //        Log::debug('Observe "updated" of a transaction.');
         if (config('firefly.feature_flags.running_balance_column') && self::$recalculate) {
             if (1 === bccomp($transaction->amount, '0')) {
                 Log::debug('Trigger recalculateForJournal');
@@ -67,6 +68,9 @@ class TransactionObserver
 
     private function updateNativeAmount(Transaction $transaction): void
     {
+        if (!Amount::convertToNative($transaction->transactionJournal->user)) {
+            return;
+        }
         $userCurrency                       = app('amount')->getDefaultCurrencyByUserGroup($transaction->transactionJournal->user->userGroup);
         $transaction->native_amount         = null;
         $transaction->native_foreign_amount = null;

app/Helpers/Report/NetWorth.php

@@ -66,7 +66,7 @@ class NetWorth implements NetWorthInterface
     public function byAccounts(Collection $accounts, Carbon $date): array
     {
         // start in the past, end in the future? use $date
-        $convertToNative = app('preferences')->get('convert_to_native', false)->data;
+        $convertToNative = Amount::convertToNative();
         $ids             = implode(',', $accounts->pluck('id')->toArray());
         $cache           = new CacheProperties();
         $cache->addProperty($date);
@@ -74,7 +74,7 @@ class NetWorth implements NetWorthInterface
         $cache->addProperty('net-worth-by-accounts');
         $cache->addProperty($ids);
         if ($cache->has()) {
-            // return $cache->get();
+            return $cache->get();
         }
         Log::debug(sprintf('Now in byAccounts("%s", "%s")', $ids, $date->format('Y-m-d H:i:s')));
         $default         = Amount::getDefaultCurrency();

app/Http/Controllers/Account/EditController.php

@@ -90,6 +90,7 @@ class EditController extends Controller
         $latitude             = null !== $location ? $location->latitude : config('firefly.default_location.latitude');
         $longitude            = null !== $location ? $location->longitude : config('firefly.default_location.longitude');
         $zoomLevel            = null !== $location ? $location->zoom_level : config('firefly.default_location.zoom_level');
+        $canEditCurrency      = 0 === $account->piggyBanks()->count();
         $hasLocation          = null !== $location;
         $locations            = [
             'location' => [
@@ -162,7 +163,7 @@ class EditController extends Controller
 
         $request->session()->flash('preFilled', $preFilled);
 
-        return view('accounts.edit', compact('account', 'currency', 'showNetWorth', 'subTitle', 'subTitleIcon', 'locations', 'liabilityDirections', 'objectType', 'roles', 'preFilled', 'liabilityTypes', 'interestPeriods'));
+        return view('accounts.edit', compact('account', 'currency', 'canEditCurrency', 'showNetWorth', 'subTitle', 'subTitleIcon', 'locations', 'liabilityDirections', 'objectType', 'roles', 'preFilled', 'liabilityTypes', 'interestPeriods'));
     }
 
     /**

app/Http/Controllers/Budget/IndexController.php

@@ -36,6 +36,7 @@ use FireflyIII\Repositories\Budget\BudgetLimitRepositoryInterface;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use FireflyIII\Repositories\Budget\OperationsRepositoryInterface;
 use FireflyIII\Repositories\UserGroups\Currency\CurrencyRepositoryInterface;
+use FireflyIII\Support\Http\Api\ExchangeRateConverter;
 use FireflyIII\Support\Http\Controllers\DateCalculation;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\JsonResponse;
@@ -161,6 +162,7 @@ class IndexController extends Controller
 
     private function getAllAvailableBudgets(Carbon $start, Carbon $end): array
     {
+        $converter        = new ExchangeRateConverter();
         // get all available budgets.
         $ab               = $this->abRepository->get($start, $end);
         $availableBudgets = [];
@@ -168,18 +170,22 @@ class IndexController extends Controller
         // for each, complement with spent amount:
         /** @var AvailableBudget $entry */
         foreach ($ab as $entry) {
-            $array               = $entry->toArray();
-            $array['start_date'] = $entry->start_date;
-            $array['end_date']   = $entry->end_date;
+            $array                    = $entry->toArray();
+            $array['start_date']      = $entry->start_date;
+            $array['end_date']        = $entry->end_date;
 
             // spent in period:
-            $spentArr            = $this->opsRepository->sumExpenses($entry->start_date, $entry->end_date, null, null, $entry->transactionCurrency);
-            $array['spent']      = $spentArr[$entry->transaction_currency_id]['sum'] ?? '0';
-
+            $spentArr                 = $this->opsRepository->sumExpenses($entry->start_date, $entry->end_date, null, null, $entry->transactionCurrency);
+            $array['spent']           = $spentArr[$entry->transaction_currency_id]['sum'] ?? '0';
+            $array['native_spent']    = $this->convertToNative && $entry->transaction_currency_id !== $this->defaultCurrency->id ? $converter->convert($entry->transactionCurrency, $this->defaultCurrency, $entry->start_date, $array['spent']) : null;
             // budgeted in period:
-            $budgeted            = $this->blRepository->budgeted($entry->start_date, $entry->end_date, $entry->transactionCurrency);
-            $array['budgeted']   = $budgeted;
-            $availableBudgets[]  = $array;
+            $budgeted                 = $this->blRepository->budgeted($entry->start_date, $entry->end_date, $entry->transactionCurrency);
+            $array['budgeted']        = $budgeted;
+            $array['native_budgeted'] = $this->convertToNative && $entry->transaction_currency_id !== $this->defaultCurrency->id ? $converter->convert($entry->transactionCurrency, $this->defaultCurrency, $entry->start_date, $budgeted) : null;
+            // this time, because of complex sums, use the currency converter.
+
+
+            $availableBudgets[]       = $array;
             unset($spentArr);
         }
 

app/Http/Controllers/Chart/AccountController.php

@@ -426,7 +426,7 @@ class AccountController extends Controller
         $cache->addProperty($this->convertToNative);
         $cache->addProperty($account->id);
         if ($cache->has()) {
-            // return response()->json($cache->get());
+            return response()->json($cache->get());
         }
 
         // collect and filter balances for the entire period.

app/Http/Controllers/Chart/BillController.php

@@ -111,7 +111,7 @@ class BillController extends Controller
         $cache->addProperty($bill->id);
         $cache->addProperty($this->convertToNative);
         if ($cache->has()) {
-            // return response()->json($cache->get());
+            return response()->json($cache->get());
         }
         $locale     = app('steam')->getLocale();
 

app/Http/Controllers/Chart/BudgetController.php

@@ -92,6 +92,7 @@ class BudgetController extends Controller
         $cache          = new CacheProperties();
         $cache->addProperty($start);
         $cache->addProperty($end);
+        $cache->addProperty($this->convertToNative);
         $cache->addProperty('chart.budget.budget');
         $cache->addProperty($budget->id);
 
@@ -108,7 +109,7 @@ class BudgetController extends Controller
         while ($end >= $loopStart) {
             /** @var Carbon $loopEnd */
             $loopEnd                = app('navigation')->endOfPeriod($loopStart, $step);
-            $spent                  = $this->opsRepository->sumExpenses($loopStart, $loopEnd, null, $collection);
+            $spent                  = $this->opsRepository->sumExpenses($loopStart, $loopEnd, null, $collection); // this method already converts to native.
             $label                  = trim(app('navigation')->periodShow($loopStart, $step));
 
             foreach ($spent as $row) {
@@ -157,6 +158,7 @@ class BudgetController extends Controller
         $cache                                  = new CacheProperties();
         $cache->addProperty($start);
         $cache->addProperty($end);
+        $cache->addProperty($this->convertToNative);
         $cache->addProperty('chart.budget.budget.limit');
         $cache->addProperty($budgetLimit->id);
         $cache->addProperty($budget->id);
@@ -169,9 +171,15 @@ class BudgetController extends Controller
         $amount                                 = $budgetLimit->amount;
         $budgetCollection                       = new Collection([$budget]);
         $currency                               = $budgetLimit->transactionCurrency;
+        if ($this->convertToNative) {
+            $amount   = $budgetLimit->native_amount;
+            $currency = $this->defaultCurrency;
+        }
+
+
         while ($start <= $end) {
             $current          = clone $start;
-            $expenses         = $this->opsRepository->sumExpenses($current, $current, null, $budgetCollection, $currency);
+            $expenses         = $this->opsRepository->sumExpenses($current, $current, null, $budgetCollection, $budgetLimit->transactionCurrency);
             $spent            = $expenses[$currency->id]['sum'] ?? '0';
             $amount           = bcadd($amount, $spent);
             $format           = $start->isoFormat((string) trans('config.month_and_day_js', [], $locale));
@@ -181,8 +189,8 @@ class BudgetController extends Controller
         }
         $data                                   = $this->generator->singleSet((string) trans('firefly.left'), $entries);
         // add currency symbol from budget limit:
-        $data['datasets'][0]['currency_symbol'] = $budgetLimit->transactionCurrency->symbol;
-        $data['datasets'][0]['currency_code']   = $budgetLimit->transactionCurrency->code;
+        $data['datasets'][0]['currency_symbol'] = $currency->symbol;
+        $data['datasets'][0]['currency_code']   = $currency->code;
         $cache->store($data);
 
         return response()->json($data);
@@ -198,6 +206,7 @@ class BudgetController extends Controller
         $budgetLimitId = null === $budgetLimit ? 0 : $budgetLimit->id;
         $cache         = new CacheProperties();
         $cache->addProperty($budget->id);
+        $cache->addProperty($this->convertToNative);
         $cache->addProperty($budgetLimitId);
         $cache->addProperty('chart.budget.expense-asset');
         $start         = session('first', today(config('app.timezone'))->startOfYear());
@@ -222,14 +231,33 @@ class BudgetController extends Controller
 
         // group by asset account ID:
         foreach ($journals as $journal) {
-            $key                    = sprintf('%d-%d', (int) $journal['source_account_id'], $journal['currency_id']);
+            $key                    = sprintf('%d-%d', $journal['source_account_id'], $journal['currency_id']);
+            $amount                 = $journal['amount'];
+
+            // if convert to native, use the native things, unless it's the foreign amount which is in the native currency.
+            if ($this->convertToNative && $journal['currency_id'] !== $this->defaultCurrency->id && $journal['foreign_currency_id'] !== $this->defaultCurrency->id) {
+                $key    = sprintf('%d-%d', $journal['source_account_id'], $this->defaultCurrency->id);
+                $symbol = $this->defaultCurrency->symbol;
+                $code   = $this->defaultCurrency->code;
+                $name   = $this->defaultCurrency->name;
+                $amount = $journal['native_amount'];
+            }
+
+            if ($this->convertToNative && $journal['currency_id'] !== $this->defaultCurrency->id && $journal['foreign_currency_id'] === $this->defaultCurrency->id) {
+                $key    = sprintf('%d-%d', $journal['source_account_id'], $this->defaultCurrency->id);
+                $symbol = $this->defaultCurrency->symbol;
+                $code   = $this->defaultCurrency->code;
+                $name   = $this->defaultCurrency->name;
+                $amount = $journal['foreign_amount'];
+            }
+
             $result[$key] ??= [
                 'amount'          => '0',
-                'currency_symbol' => $journal['currency_symbol'],
-                'currency_code'   => $journal['currency_code'],
-                'currency_name'   => $journal['currency_name'],
+                'currency_symbol' => $symbol,
+                'currency_code'   => $code,
+                'currency_name'   => $name,
             ];
-            $result[$key]['amount'] = bcadd($journal['amount'], $result[$key]['amount']);
+            $result[$key]['amount'] = bcadd($amount, $result[$key]['amount']);
         }
 
         $names         = $this->getAccountNames(array_keys($result));
@@ -261,6 +289,7 @@ class BudgetController extends Controller
         $budgetLimitId = null === $budgetLimit ? 0 : $budgetLimit->id;
         $cache         = new CacheProperties();
         $cache->addProperty($budget->id);
+        $cache->addProperty($this->convertToNative);
         $cache->addProperty($budgetLimitId);
         $cache->addProperty('chart.budget.expense-category');
         $start         = session('first', today(config('app.timezone'))->startOfYear());
@@ -283,13 +312,36 @@ class BudgetController extends Controller
         $chartData     = [];
         foreach ($journals as $journal) {
             $key                    = sprintf('%d-%d', $journal['category_id'], $journal['currency_id']);
+            $symbol                 = $journal['currency_symbol'];
+            $code                   = $journal['currency_code'];
+            $name                   = $journal['currency_name'];
+            $amount                 = $journal['amount'];
+            // if convert to native, use the native things, unless it's the foreign amount which is in the native currency.
+            if ($this->convertToNative && $journal['currency_id'] !== $this->defaultCurrency->id && $journal['foreign_currency_id'] !== $this->defaultCurrency->id
+            ) {
+                $key    = sprintf('%d-%d', $journal['category_id'], $this->defaultCurrency->id);
+                $symbol = $this->defaultCurrency->symbol;
+                $code   = $this->defaultCurrency->code;
+                $name   = $this->defaultCurrency->name;
+                $amount = $journal['native_amount'];
+            }
+
+            if ($this->convertToNative && $journal['currency_id'] !== $this->defaultCurrency->id && $journal['foreign_currency_id'] === $this->defaultCurrency->id
+            ) {
+                $key    = sprintf('%d-%d', $journal['category_id'], $this->defaultCurrency->id);
+                $symbol = $this->defaultCurrency->symbol;
+                $code   = $this->defaultCurrency->code;
+                $name   = $this->defaultCurrency->name;
+                $amount = $journal['foreign_amount'];
+            }
+
             $result[$key] ??= [
                 'amount'          => '0',
-                'currency_symbol' => $journal['currency_symbol'],
-                'currency_code'   => $journal['currency_code'],
-                'currency_name'   => $journal['currency_name'],
+                'currency_symbol' => $symbol,
+                'currency_code'   => $code,
+                'currency_name'   => $name,
             ];
-            $result[$key]['amount'] = bcadd($journal['amount'], $result[$key]['amount']);
+            $result[$key]['amount'] = bcadd($amount, $result[$key]['amount']);
         }
 
         $names         = $this->getCategoryNames(array_keys($result));
@@ -320,6 +372,7 @@ class BudgetController extends Controller
         $cache         = new CacheProperties();
         $cache->addProperty($budget->id);
         $cache->addProperty($budgetLimitId);
+        $cache->addProperty($this->convertToNative);
         $cache->addProperty('chart.budget.expense-expense');
         $start         = session('first', today(config('app.timezone'))->startOfYear());
         $end           = today();
@@ -343,13 +396,32 @@ class BudgetController extends Controller
         /** @var array $journal */
         foreach ($journals as $journal) {
             $key                    = sprintf('%d-%d', $journal['destination_account_id'], $journal['currency_id']);
+            $amount                 = $journal['amount'];
+
+            // if convert to native, use the native things, unless it's the foreign amount which is in the native currency.
+            if ($this->convertToNative && $journal['currency_id'] !== $this->defaultCurrency->id && $journal['foreign_currency_id'] !== $this->defaultCurrency->id) {
+                $key    = sprintf('%d-%d', $journal['destination_account_id'], $this->defaultCurrency->id);
+                $symbol = $this->defaultCurrency->symbol;
+                $code   = $this->defaultCurrency->code;
+                $name   = $this->defaultCurrency->name;
+                $amount = $journal['native_amount'];
+            }
+
+            if ($this->convertToNative && $journal['currency_id'] !== $this->defaultCurrency->id && $journal['foreign_currency_id'] === $this->defaultCurrency->id) {
+                $key    = sprintf('%d-%d', $journal['destination_account_id'], $this->defaultCurrency->id);
+                $symbol = $this->defaultCurrency->symbol;
+                $code   = $this->defaultCurrency->code;
+                $name   = $this->defaultCurrency->name;
+                $amount = $journal['foreign_amount'];
+            }
+
             $result[$key] ??= [
                 'amount'          => '0',
-                'currency_symbol' => $journal['currency_symbol'],
-                'currency_code'   => $journal['currency_code'],
-                'currency_name'   => $journal['currency_name'],
+                'currency_symbol' => $symbol,
+                'currency_code'   => $code,
+                'currency_name'   => $name,
             ];
-            $result[$key]['amount'] = bcadd($journal['amount'], $result[$key]['amount']);
+            $result[$key]['amount'] = bcadd($amount, $result[$key]['amount']);
         }
 
         $names         = $this->getAccountNames(array_keys($result));
@@ -385,7 +457,7 @@ class BudgetController extends Controller
         $cache->addProperty($this->convertToNative);
         $cache->addProperty('chart.budget.frontpage');
         if ($cache->has()) {
-            // return response()->json($cache->get());
+            return response()->json($cache->get());
         }
         Log::debug('Regenerate frontpage chart from scratch.');
         $chartGenerator                  = app(FrontpageChartGenerator::class);

app/Http/Controllers/Chart/CategoryController.php

@@ -70,24 +70,27 @@ class CategoryController extends Controller
     public function all(Category $category): JsonResponse
     {
         // cache results:
-        $cache          = new CacheProperties();
+        $cache                           = new CacheProperties();
         $cache->addProperty('chart.category.all');
         $cache->addProperty($category->id);
+        $cache->addProperty($this->convertToNative);
         if ($cache->has()) {
             return response()->json($cache->get());
         }
 
         /** @var CategoryRepositoryInterface $repository */
-        $repository     = app(CategoryRepositoryInterface::class);
-        $start          = $repository->firstUseDate($category) ?? $this->getDate();
-        $range          = app('navigation')->getViewRange(false);
-        $start          = app('navigation')->startOfPeriod($start, $range);
-        $end            = $this->getDate();
+        $repository                      = app(CategoryRepositoryInterface::class);
+        $start                           = $repository->firstUseDate($category) ?? $this->getDate();
+        $range                           = app('navigation')->getViewRange(false);
+        $start                           = app('navigation')->startOfPeriod($start, $range);
+        $end                             = $this->getDate();
 
         /** @var WholePeriodChartGenerator $chartGenerator */
-        $chartGenerator = app(WholePeriodChartGenerator::class);
-        $chartData      = $chartGenerator->generate($category, $start, $end);
-        $data           = $this->generator->multiSet($chartData);
+        $chartGenerator                  = app(WholePeriodChartGenerator::class);
+        $chartGenerator->convertToNative = $this->convertToNative;
+
+        $chartData                       = $chartGenerator->generate($category, $start, $end);
+        $data                            = $this->generator->multiSet($chartData);
         $cache->store($data);
 
         return response()->json($data);
@@ -113,7 +116,7 @@ class CategoryController extends Controller
         $cache->addProperty($this->convertToNative);
         $cache->addProperty('chart.category.frontpage');
         if ($cache->has()) {
-            // return response()->json($cache->get());
+            return response()->json($cache->get());
         }
 
         $frontpageGenerator = new FrontpageChartGenerator($start, $end);
@@ -136,6 +139,7 @@ class CategoryController extends Controller
         $cache->addProperty('chart.category.period');
         $cache->addProperty($accounts->pluck('id')->toArray());
         $cache->addProperty($category);
+        $cache->addProperty($this->convertToNative);
         if ($cache->has()) {
             return response()->json($cache->get());
         }

app/Http/Controllers/Chart/ReportController.php

@@ -145,7 +145,7 @@ class ReportController extends Controller
         $cache->addProperty($accounts);
         $cache->addProperty($end);
         if ($cache->has()) {
-            // return response()->json($cache->get());
+            return response()->json($cache->get());
         }
 
         Log::debug('Going to do operations for accounts ', $accounts->pluck('id')->toArray());

app/Http/Controllers/Controller.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace FireflyIII\Http\Controllers;
 
 use FireflyIII\Models\TransactionCurrency;
+use FireflyIII\Support\Facades\Amount;
 use FireflyIII\Support\Facades\Steam;
 use FireflyIII\Support\Http\Controllers\RequestInformation;
 use FireflyIII\Support\Http\Controllers\UserNavigation;
@@ -121,7 +122,7 @@ abstract class Controller extends BaseController
                     $language  = Steam::getLanguage();
                     $locale    = Steam::getLocale();
                     $darkMode  = app('preferences')->get('darkMode', 'browser')->data;
-                    $this->convertToNative =app('preferences')->get('convert_to_native', false)->data;
+                    $this->convertToNative =Amount::convertToNative();
                     $page      = $this->getPageName();
                     $shownDemo = $this->hasSeenDemo();
                     View::share('language', $language);

app/Http/Controllers/DebugController.php

@@ -76,6 +76,10 @@ class DebugController extends Controller
                 || str_starts_with($route->uri(), '_debugbar')
                 || str_starts_with($route->uri(), '_ignition')
                 || str_starts_with($route->uri(), 'oauth')
+                || str_starts_with($route->uri(), 'chart')
+                || str_starts_with($route->uri(), 'v1/jscript')
+                || str_starts_with($route->uri(), 'v2/jscript')
+                || str_starts_with($route->uri(), 'json')
                 || str_starts_with($route->uri(), 'sanctum')
             ) {
                 continue;

app/Http/Controllers/ExchangeRates/IndexController.php

@@ -27,6 +27,7 @@ namespace FireflyIII\Http\Controllers\ExchangeRates;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\TransactionCurrency;
 use Illuminate\View\View;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 class IndexController extends Controller
 {
@@ -46,6 +47,9 @@ class IndexController extends Controller
                 return $next($request);
             }
         );
+        if (!config('cer.enabled')) {
+            throw new NotFoundHttpException();
+        }
     }
 
     public function index(): View

app/Http/Controllers/JavascriptController.php

@@ -49,14 +49,13 @@ class JavascriptController extends Controller
         $accounts = $repository->getAccountsByType(
             [AccountType::DEFAULT, AccountType::ASSET, AccountType::DEBT, AccountType::LOAN, AccountType::MORTGAGE, AccountType::CREDITCARD]
         );
-        $default  = app('amount')->getDefaultCurrency();
         $data     = ['accounts' => []];
 
         /** @var Account $account */
         foreach ($accounts as $account) {
             $accountId                    = $account->id;
             $currency                     = (int) $repository->getMetaValue($account, 'currency_id');
-            $currency                     = 0 === $currency ? $default->id : $currency;
+            $currency                     = 0 === $currency ? $this->defaultCurrency->id : $currency;
             $entry                        = ['preferredCurrency' => $currency, 'name' => $account->name];
             $data['accounts'][$accountId] = $entry;
         }
@@ -96,9 +95,9 @@ class JavascriptController extends Controller
     public function variables(Request $request, AccountRepositoryInterface $repository): Response
     {
         $account                   = $repository->find((int) $request->get('account'));
-        $currency                  = app('amount')->getDefaultCurrency();
+        $currency                  = $this->defaultCurrency;
         if (null !== $account) {
-            $currency = $repository->getAccountCurrency($account) ?? $currency;
+            $currency = $repository->getAccountCurrency($account) ?? $this->defaultCurrency;
         }
         $locale                    = app('steam')->getLocale();
         $accounting                = app('amount')->getJsConfig();

app/JsonApi/Rules/IsValidFilter.php

@@ -1,54 +0,0 @@
-<?php
-
-/*
- * IsValidFilter.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\JsonApi\Rules;
-
-use Illuminate\Contracts\Validation\ValidationRule;
-
-class IsValidFilter implements ValidationRule
-{
-    private array $allowed;
-
-    public function __construct(array $keys)
-    {
-        $this->allowed   = $keys;
-        $this->allowed[] = 'user_group_id';
-    }
-
-    #[\Override]
-    public function validate(string $attribute, mixed $value, \Closure $fail): void
-    {
-        if ('filter' !== $attribute) {
-            $fail('validation.bad_api_filter')->translate();
-        }
-        if (!is_array($value)) {
-            $value = explode(',', $value);
-        }
-        foreach ($value as $key => $val) {
-            if (!in_array($key, $this->allowed, true)) {
-                $fail('validation.bad_api_filter')->translate(['filter' => $key]);
-            }
-        }
-    }
-}

app/JsonApi/Rules/IsValidPage.php

@@ -1,53 +0,0 @@
-<?php
-
-/*
- * IsValidFilter.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\JsonApi\Rules;
-
-use Illuminate\Contracts\Validation\ValidationRule;
-
-class IsValidPage implements ValidationRule
-{
-    private array $allowed;
-
-    public function __construct(array $keys)
-    {
-        $this->allowed = $keys;
-    }
-
-    #[\Override]
-    public function validate(string $attribute, mixed $value, \Closure $fail): void
-    {
-        if ('page' !== $attribute) {
-            $fail('validation.bad_api_filter')->translate();
-        }
-        if (!is_array($value)) {
-            $value = explode(',', $value);
-        }
-        foreach ($value as $key => $val) {
-            if (!in_array($key, $this->allowed, true)) {
-                $fail('validation.bad_api_page')->translate();
-            }
-        }
-    }
-}

app/JsonApi/V2/AccountBalances/AccountBalanceRepository.php

@@ -1,46 +0,0 @@
-<?php
-
-/*
- * AccountBalanceRepository.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\JsonApi\V2\AccountBalances;
-
-use FireflyIII\Entities\AccountBalance;
-use LaravelJsonApi\Contracts\Store\QueriesAll;
-use LaravelJsonApi\NonEloquent\AbstractRepository;
-
-class AccountBalanceRepository extends AbstractRepository implements QueriesAll
-{
-    #[\Override]
-    public function find(string $resourceId): ?object
-    {
-        return AccountBalance::fromArray();
-    }
-
-    public function queryAll(): Capabilities\AccountBalanceQuery
-    {
-        return Capabilities\AccountBalanceQuery::make()
-            ->withServer($this->server)
-            ->withSchema($this->schema)
-        ;
-    }
-}

app/JsonApi/V2/AccountBalances/AccountBalanceResource.php

@@ -1,44 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace FireflyIII\JsonApi\V2\AccountBalances;
-
-use Illuminate\Http\Request;
-use LaravelJsonApi\Core\Resources\JsonApiResource;
-
-class AccountBalanceResource extends JsonApiResource
-{
-    /**
-     * Get the resource's attributes.
-     *
-     * @param null|Request $request
-     */
-    public function attributes($request): iterable
-    {
-        return [
-            'name'   => $this->resource->amount,
-            'amount' => $this->resource->amount,
-        ];
-    }
-
-    /**
-     * Get the resource id.
-     */
-    public function id(): string
-    {
-        return $this->resource->id;
-    }
-
-    /**
-     * Get the resource's relationships.
-     *
-     * @param null|Request $request
-     */
-    public function relationships($request): iterable
-    {
-        return [
-            $this->relation('account')->withData($this->resource->getAccount()),
-        ];
-    }
-}

app/JsonApi/V2/AccountBalances/AccountBalanceSchema.php

@@ -1,50 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace FireflyIII\JsonApi\V2\AccountBalances;
-
-use FireflyIII\Entities\AccountBalance;
-use LaravelJsonApi\Core\Schema\Schema;
-use LaravelJsonApi\Eloquent\Fields\Relations\HasOne;
-use LaravelJsonApi\NonEloquent\Fields\Attribute;
-use LaravelJsonApi\NonEloquent\Fields\ID;
-
-class AccountBalanceSchema extends Schema
-{
-    /**
-     * The model the schema corresponds to.
-     */
-    public static string $model = AccountBalance::class;
-
-    /**
-     * Get the resource fields.
-     */
-    public function fields(): array
-    {
-        return [
-            ID::make(),
-            Attribute::make('name'),
-            Attribute::make('amount'),
-            HasOne::make('account'),
-        ];
-    }
-
-    /**
-     * Get the resource filters.
-     */
-    public function filters(): array
-    {
-        return [
-            // Filter::make('id'),
-        ];
-    }
-
-    public function repository(): AccountBalanceRepository
-    {
-        return AccountBalanceRepository::make()
-            ->withServer($this->server)
-            ->withSchema($this)
-        ;
-    }
-}

app/JsonApi/V2/AccountBalances/Capabilities/AccountBalanceQuery.php

@@ -1,59 +0,0 @@
-<?php
-
-/*
- * AccountBalanceQuery.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\JsonApi\V2\AccountBalances\Capabilities;
-
-use FireflyIII\Entities\AccountBalance;
-use FireflyIII\Models\Account;
-use LaravelJsonApi\NonEloquent\Capabilities\QueryAll;
-
-class AccountBalanceQuery extends QueryAll
-{
-    private Account $account;
-
-    /**
-     * QuerySites constructor.
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    public function get(): iterable
-    {
-        return [
-            AccountBalance::fromArray(),
-            AccountBalance::fromArray(),
-            AccountBalance::fromArray(),
-            AccountBalance::fromArray(),
-        ];
-    }
-
-    public function withAccount(Account $account): self
-    {
-        $this->account = $account;
-
-        return $this;
-    }
-}

app/JsonApi/V2/Accounts/AccountCollectionQuery.php

@@ -1,77 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace FireflyIII\JsonApi\V2\Accounts;
-
-use FireflyIII\Models\Account;
-use FireflyIII\Rules\Account\IsValidAccountType;
-use FireflyIII\Rules\IsAllowedGroupAction;
-use FireflyIII\Rules\IsDateOrTime;
-use FireflyIII\Rules\IsValidDateRange;
-use Illuminate\Support\Facades\Log;
-use LaravelJsonApi\Laravel\Http\Requests\ResourceQuery;
-use LaravelJsonApi\Validation\Rule as JsonApiRule;
-
-class AccountCollectionQuery extends ResourceQuery
-{
-    /**
-     * Get the validation rules that apply to the request query parameters.
-     */
-    public function rules(): array
-    {
-        Log::debug(__METHOD__);
-        $validFilters = config('api.valid_api_filters')[Account::class];
-
-        return [
-            'fields'      => [
-                'nullable',
-                'array',
-                JsonApiRule::fieldSets(),
-            ],
-            'userGroupId' => [
-                'nullable',
-                'integer',
-                new IsAllowedGroupAction(Account::class, request()->method()),
-            ],
-            'startPeriod' => [
-                'nullable',
-                'date',
-                new IsDateOrTime(),
-                new IsValidDateRange(),
-            ],
-            'endPeriod'   => [
-                'nullable',
-                'date',
-                new IsDateOrTime(),
-                new IsValidDateRange(),
-            ],
-            'filter'      => [
-                'nullable',
-                'array',
-                JsonApiRule::filter($validFilters),
-                new IsValidAccountType(),
-            ],
-            'include'     => [
-                'nullable',
-                'string',
-                JsonApiRule::includePaths(),
-            ],
-            'page'        => [
-                'nullable',
-                'array',
-                JsonApiRule::page(),
-            ],
-            'sort'        => [
-                'nullable',
-                'string',
-                JsonApiRule::sort(),
-            ],
-            'withCount'   => [
-                'nullable',
-                'string',
-                JsonApiRule::countable(),
-            ],
-        ];
-    }
-}

app/JsonApi/V2/Accounts/AccountRepository.php

@@ -1,113 +0,0 @@
-<?php
-
-/*
- * AccountRepository.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\JsonApi\V2\Accounts;
-
-use FireflyIII\Models\Account;
-use FireflyIII\Support\JsonApi\Concerns\UsergroupAware;
-use FireflyIII\Support\JsonApi\Enrichments\AccountEnrichment;
-use Illuminate\Support\Facades\Log;
-use LaravelJsonApi\Contracts\Store\CreatesResources;
-use LaravelJsonApi\Contracts\Store\QueriesAll;
-use LaravelJsonApi\NonEloquent\AbstractRepository;
-use LaravelJsonApi\NonEloquent\Capabilities\CrudRelations;
-use LaravelJsonApi\NonEloquent\Concerns\HasCrudCapability;
-use LaravelJsonApi\NonEloquent\Concerns\HasRelationsCapability;
-
-/**
- * Class AccountRepository
- *
- * The repository collects a single or many (account) objects from the database and returns them to the
- * account resource. The account resource links all account properties to the JSON properties.
- *
- * For the queryAll thing, a separate query is constructed that does the actual querying of the database.
- * This is necessary because the user can't just query all accounts (it would return other user's data)
- * and because we also need to collect all kinds of metadata, like the currency and user info.
- */
-class AccountRepository extends AbstractRepository implements QueriesAll, CreatesResources
-{
-    use HasCrudCapability;
-    use HasRelationsCapability;
-    use UsergroupAware;
-
-    /**
-     * SiteRepository constructor.
-     */
-    public function __construct()
-    {
-        Log::debug(__METHOD__);
-    }
-
-    public function exists(string $resourceId): bool
-    {
-        $result = null !== Account::find((int) $resourceId);
-        Log::debug(sprintf('%s: %s', __METHOD__, var_export($result, true)));
-
-        return $result;
-    }
-
-    public function find(string $resourceId): ?object
-    {
-        exit(__METHOD__);
-        Log::debug(__METHOD__);
-        //        throw new \RuntimeException('trace me');
-        $account    = Account::find((int) $resourceId);
-        if (null === $account) {
-            return null;
-        }
-        // enrich the collected data
-        $enrichment = new AccountEnrichment();
-
-        return $enrichment->enrichSingle($account);
-    }
-
-    public function queryAll(): Capabilities\AccountQuery
-    {
-        Log::debug(__METHOD__);
-
-        return Capabilities\AccountQuery::make()
-            ->withUserGroup($this->userGroup)
-            ->withServer($this->server)
-            ->withSchema($this->schema)
-        ;
-    }
-
-    protected function crud(): Capabilities\CrudAccount
-    {
-        Log::debug(__METHOD__);
-
-        return Capabilities\CrudAccount::make();
-    }
-
-    /**
-     * TODO piggy banks
-     * TODO transactions
-     */
-    protected function relations(): CrudRelations
-    {
-        Log::debug(__METHOD__);
-
-        return Capabilities\CrudAccountRelations::make();
-    }
-}

app/JsonApi/V2/Accounts/AccountRequest.php

@@ -1,53 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace FireflyIII\JsonApi\V2\Accounts;
-
-use FireflyIII\Support\Request\ConvertsDataTypes;
-use Illuminate\Support\Facades\Log;
-use LaravelJsonApi\Laravel\Http\Requests\ResourceRequest;
-
-class AccountRequest extends ResourceRequest
-{
-    use ConvertsDataTypes;
-
-    /**
-     * Get the validation rules for the resource.
-     */
-    public function rules(): array
-    {
-        Log::debug(__METHOD__);
-        $accountRoles   = implode(',', config('firefly.accountRoles'));
-        $ccPaymentTypes = implode(',', array_keys(config('firefly.ccTypes')));
-        $types          = implode(',', array_keys(config('firefly.subTitlesByIdentifier')));
-        $type           = $this->convertString('type');
-        // var_dump($types);exit;
-
-        return [
-            'name'         => ['required', 'max:1024', 'min:1'], // , new IsUniqueAccount()
-            'account_type' => ['required', 'max:1024', 'min:1', sprintf('in:%s', $types)],
-            //            'iban'                 => ['iban', 'nullable', new UniqueIban(null, $type)],
-            //            'bic'                  => 'bic|nullable',
-            //            'account_number'       => ['min:1', 'max:255', 'nullable', new UniqueAccountNumber(null, $type)],
-            //            'opening_balance'      => 'numeric|required_with:opening_balance_date|nullable',
-            //            'opening_balance_date' => 'date|required_with:opening_balance|nullable',
-            //            'virtual_balance'      => 'numeric|nullable',
-            //            'order'                => 'numeric|nullable',
-            //            'currency_id'          => 'numeric|exists:transaction_currencies,id',
-            //            'currency_code'        => 'min:3|max:3|exists:transaction_currencies,code',
-            //            'active'               => [new IsBoolean()],
-            //            'include_net_worth'    => [new IsBoolean()],
-            //            'account_role'         => sprintf('nullable|in:%s|required_if:type,asset', $accountRoles),
-            //            'credit_card_type'     => sprintf('nullable|in:%s|required_if:account_role,ccAsset', $ccPaymentTypes),
-            //            'monthly_payment_date' => 'nullable|date|required_if:account_role,ccAsset|required_if:credit_card_type,monthlyFull',
-            //            'liability_type'       => 'nullable|required_if:type,liability|required_if:type,liabilities|in:loan,debt,mortgage',
-            //            'liability_amount'     => ['required_with:liability_start_date', new IsValidPositiveAmount()],
-            //            'liability_start_date' => 'required_with:liability_amount|date',
-            //            'liability_direction'  => 'nullable|required_if:type,liability|required_if:type,liabilities|in:credit,debit',
-            //            'interest'             => 'min:0|max:100|numeric',
-            //            'interest_period'      => sprintf('nullable|in:%s', implode(',', config('firefly.interest_periods'))),
-            //            'notes'                => 'min:0|max:32768',
-        ];
-    }
-}

app/JsonApi/V2/Accounts/AccountResource.php

@@ -1,83 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace FireflyIII\JsonApi\V2\Accounts;
-
-use FireflyIII\Models\Account;
-use Illuminate\Http\Request;
-use LaravelJsonApi\Core\Resources\JsonApiResource;
-
-/**
- * @property Account $resource
- */
-class AccountResource extends JsonApiResource
-{
-    /**
-     * Get the resource's attributes.
-     *
-     * @param null|Request $request
-     */
-    public function attributes($request): iterable
-    {
-        // Log::debug(__METHOD__);
-
-        return [
-            'created_at'              => $this->resource->created_at,
-            'updated_at'              => $this->resource->updated_at,
-            'name'                    => $this->resource->name,
-            'active'                  => $this->resource->active,
-            'order'                   => $this->resource->order,
-            'iban'                    => $this->resource->iban,
-            'account_type'            => $this->resource->account_type_string,
-            'account_role'            => $this->resource->account_role,
-            'account_number'          => '' === $this->resource->account_number ? null : $this->resource->account_number,
-
-            // currency (if the account has a currency setting, otherwise NULL).
-            'currency_id'             => $this->resource->currency_id,
-            'currency_name'           => $this->resource->currency_name,
-            'currency_code'           => $this->resource->currency_code,
-            'currency_symbol'         => $this->resource->currency_symbol,
-            'currency_decimal_places' => $this->resource->currency_decimal_places,
-            'is_multi_currency'       => '1' === $this->resource->is_multi_currency,
-
-            // balances
-            'balance'                 => $this->resource->balance,
-            'native_balance'          => $this->resource->native_balance,
-
-            // liability things
-            'liability_direction'     => $this->resource->liability_direction,
-            'interest'                => $this->resource->interest,
-            'interest_period'         => $this->resource->interest_period,
-            'current_debt'            => $this->resource->current_debt, // TODO may be removed in the future.
-
-            // other things
-            'last_activity'           => $this->resource->last_activity,
-
-            // object group
-            'object_group_id'         => $this->resource->object_group_id,
-            'object_group_title'      => $this->resource->object_group_title,
-            'object_group_order'      => $this->resource->object_group_order,
-        ];
-    }
-
-    /**
-     * Get the resource id.
-     */
-    public function id(): string
-    {
-        return (string) $this->resource->id;
-    }
-
-    /**
-     * Get the resource's relationships.
-     *
-     * @param null|Request $request
-     */
-    public function relationships($request): iterable
-    {
-        return [
-            $this->relation('user')->withData($this->resource->user),
-        ];
-    }
-}

app/JsonApi/V2/Accounts/AccountResourceOld.php

@@ -1,115 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace FireflyIII\JsonApi\V2\Accounts;
-
-use FireflyIII\Models\Account;
-use Illuminate\Http\Request;
-use LaravelJsonApi\Core\Resources\JsonApiResource;
-
-/**
- * @property Account $resource
- *
- * This class collects the resources attributes, the account in this case.
- * Generally speaking, each property here is directly related to a property on the account object itself.
- * However, many properties are collected from other sources, like the user or the currency.
- * As a result, the account repository is where it's at, which is where the collection takes place and is optimised.
- */
-class AccountResourceOld extends JsonApiResource
-{
-    /**
-     * Get the resource's attributes.
-     *
-     * @param null|Request $request
-     */
-    public function attributes($request): iterable
-    {
-        // fields removed here have been migrated.
-        return [
-            'created_at' => $this->resource->created_at,
-            'updated_at' => $this->resource->updated_at,
-            'name'       => $this->resource->name,
-
-            //            'virtual_balance' => $this->resource->virtual_balance,
-            //            'native_balance'  => $this->resource->native_balance,
-            // 'user' => $this->resource->user_array,
-            //            'balances' => []
-            //
-
-            // balance (in currency, on date)
-            //            'current_balance'         => $this->resource->current_balance,
-            //            'current_balance'         => app('steam')->bcround(app('steam')->balance($account, $date), $decimalPlaces),
-            //            'current_balance_date'    => $date->toAtomString(),
-
-            //            'notes'                   => $this->repository->getNoteText($account),
-            //            'monthly_payment_date'    => $monthlyPaymentDate,
-            //            'credit_card_type'        => $creditCardType,
-            //            'account_number'          => $this->repository->getMetaValue($account, 'account_number'),
-            //            'bic'                     => $this->repository->getMetaValue($account, 'BIC'),
-            //            'opening_balance'         => $openingBalance,
-            //            'opening_balance_date'    => $openingBalanceDate,
-            //            'liability_type'          => $liabilityType,
-            //            'liability_direction'     => $liabilityDirection,
-            //            'interest'                => $interest,
-            //            'interest_period'         => $interestPeriod,
-            //            'current_debt'            => $this->repository->getMetaValue($account, 'current_debt'),
-            //            'include_net_worth'       => $includeNetWorth,
-            //            'longitude'               => $longitude,
-            //            'latitude'                => $latitude,
-            //            'zoom_level'              => $zoomLevel,
-
-            //            'order'                          => $order,
-
-            //            '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,
-            //
-            //            // balance:
-            //            'current_balance'                => $balance,
-            //            'native_current_balance'         => $nativeBalance,
-            //            'current_balance_date'           => $this->getDate()->endOfDay()->toAtomString(),
-            //
-            //            // balance difference
-            //            'balance_difference'             => $balanceDiff,
-            //            'native_balance_difference'      => $nativeBalanceDiff,
-            //            'balance_difference_start'       => $diffStart,
-            //            'balance_difference_end'         => $diffEnd,
-            //
-            //
-            //            // liability stuff
-            //            'liability_type'                 => $liabilityType,
-            //
-            //            // object group
-            //            'object_group_id'                => null !== $objectGroupId ? (string) $objectGroupId : null,
-            //            'object_group_order'             => $objectGroupOrder,
-            //            'object_group_title'             => $objectGroupTitle,
-            //            'notes'                   => $this->repository->getNoteText($account),
-            //            'monthly_payment_date'    => $monthlyPaymentDate,
-            //            'credit_card_type'        => $creditCardType,
-            //            'bic'                     => $this->repository->getMetaValue($account, 'BIC'),
-            //            'virtual_balance'         => number_format((float) $account->virtual_balance, $decimalPlaces, '.', ''),
-            //            'opening_balance'         => $openingBalance,
-            //            'opening_balance_date'    => $openingBalanceDate,
-            //            'include_net_worth'       => $includeNetWorth,
-            //            'longitude'               => $longitude,
-            //            'latitude'                => $latitude,
-            //            'zoom_level'              => $zoomLevel,
-        ];
-    }
-
-    /**
-     * Get the resource's relationships.
-     *
-     * @param null|Request $request
-     */
-    public function relationships($request): iterable
-    {
-        return [
-            $this->relation('user')->withData($this->resource->user),
-            $this->relation('currency')->withData($this->resource->transactionCurrency),
-            // $this->relation('account_balances')->withData($this->resource->balances),
-        ];
-    }
-}

app/JsonApi/V2/Accounts/AccountSchema.php

@@ -1,112 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace FireflyIII\JsonApi\V2\Accounts;
-
-use FireflyIII\Models\Account;
-use FireflyIII\Support\JsonApi\Concerns\UsergroupAware;
-use Illuminate\Support\Facades\Log;
-use LaravelJsonApi\Core\Schema\Schema;
-use LaravelJsonApi\Eloquent\Fields\Relations\HasOne;
-use LaravelJsonApi\NonEloquent\Fields\Attribute;
-use LaravelJsonApi\NonEloquent\Fields\ID;
-use LaravelJsonApi\NonEloquent\Filters\Filter;
-use LaravelJsonApi\NonEloquent\Pagination\EnumerablePagination;
-
-class AccountSchema extends Schema
-{
-    use UsergroupAware;
-
-    /**
-     * The model the schema corresponds to.
-     */
-    public static string $model = Account::class;
-
-    /**
-     * Get the resource fields.
-     */
-    public function fields(): array
-    {
-        return [
-            ID::make(),
-            Attribute::make('created_at'),
-            Attribute::make('updated_at'),
-
-            // basic info and meta data
-            Attribute::make('name')->sortable(),
-            Attribute::make('active')->sortable(),
-            Attribute::make('order')->sortable(),
-            Attribute::make('iban')->sortable(),
-            Attribute::make('account_type'),
-            Attribute::make('account_role'),
-            Attribute::make('account_number')->sortable(),
-
-            // currency
-            Attribute::make('currency_id'),
-            Attribute::make('currency_name'),
-            Attribute::make('currency_code'),
-            Attribute::make('currency_symbol'),
-            Attribute::make('currency_decimal_places'),
-            Attribute::make('is_multi_currency'),
-
-            // balance
-            Attribute::make('balance')->sortable(),
-            Attribute::make('native_balance')->sortable(),
-
-            // liability things
-            Attribute::make('liability_direction'),
-            Attribute::make('interest'),
-            Attribute::make('interest_period'),
-            // Attribute::make('current_debt')->sortable(),
-
-            // TODO credit card fields.
-
-            // dynamic data
-            Attribute::make('last_activity')->sortable(),
-            Attribute::make('balance_difference')->sortable(), // only used for sort.
-
-            // group
-            Attribute::make('object_group_id'),
-            Attribute::make('object_group_title'),
-            Attribute::make('object_group_order'),
-
-            // relations.
-            HasOne::make('user')->readOnly(),
-        ];
-    }
-
-    /**
-     * Get the resource filters.
-     */
-    public function filters(): array
-    {
-        Log::debug(__METHOD__);
-        $array  = [];
-        $config = config('api.valid_api_filters')[Account::class];
-        foreach ($config as $entry) {
-            $array[] = Filter::make($entry);
-        }
-
-        return $array;
-    }
-
-    public function pagination(): EnumerablePagination
-    {
-        Log::debug(__METHOD__);
-
-        return EnumerablePagination::make();
-    }
-
-    public function repository(): AccountRepository
-    {
-        Log::debug(__METHOD__);
-        $this->setUserGroup($this->server->getUsergroup());
-
-        return AccountRepository::make()
-            ->withServer($this->server)
-            ->withSchema($this)
-            ->withUserGroup($this->userGroup)
-        ;
-    }
-}

app/JsonApi/V2/Accounts/AccountSchemaOld.php

@@ -1,69 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace FireflyIII\JsonApi\V2\Accounts;
-
-use FireflyIII\Models\Account;
-use LaravelJsonApi\Eloquent\Contracts\Paginator;
-use LaravelJsonApi\Eloquent\Fields\DateTime;
-use LaravelJsonApi\Eloquent\Fields\ID;
-use LaravelJsonApi\Eloquent\Fields\Relations\HasOne;
-use LaravelJsonApi\Eloquent\Fields\Str;
-use LaravelJsonApi\Eloquent\Filters\WhereIdIn;
-use LaravelJsonApi\Eloquent\Pagination\PagePagination;
-use LaravelJsonApi\Eloquent\Schema;
-
-/**
- * Class AccountSchema
- *
- * This is the schema of all fields that an account exposes to the world.
- * Fields do not have to have a relation to the actual model.
- * Fields mentioned here still need to be filled in by the AccountResource.
- */
-class AccountSchemaOld extends Schema
-{
-    /**
-     * The model the schema corresponds to.
-     */
-    public static string $model = Account::class;
-
-    /**
-     * Get the resource fields.
-     */
-    public function fields(): array
-    {
-        return [
-            ID::make(),
-            DateTime::make('created_at')->sortable()->readOnly(),
-            DateTime::make('updated_at')->sortable()->readOnly(),
-            Str::make('name')->sortable(),
-            //            Str::make('account_type'),
-            //            Str::make('virtual_balance'),
-            //            Str::make('iban'),
-            //            Boolean::make('active'),
-            //            Number::make('order'),
-            HasOne::make('user')->readOnly(),
-            // HasMany::make('account_balances'),
-        ];
-    }
-
-    /**
-     * Filters mentioned here can be used to filter the results.
-     * TODO write down exactly how this works.
-     */
-    public function filters(): array
-    {
-        return [
-            WhereIdIn::make($this),
-        ];
-    }
-
-    /**
-     * Get the resource paginator.
-     */
-    public function pagination(): ?Paginator
-    {
-        return PagePagination::make();
-    }
-}

app/JsonApi/V2/Accounts/AccountSingleQuery.php

@@ -1,45 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace FireflyIII\JsonApi\V2\Accounts;
-
-use Illuminate\Support\Facades\Log;
-use LaravelJsonApi\Laravel\Http\Requests\ResourceQuery;
-use LaravelJsonApi\Validation\Rule as JsonApiRule;
-
-class AccountSingleQuery extends ResourceQuery
-{
-    /**
-     * Get the validation rules that apply to the request query parameters.
-     */
-    public function rules(): array
-    {
-        Log::debug(__METHOD__);
-
-        return [
-            'fields'    => [
-                'nullable',
-                'array',
-                JsonApiRule::fieldSets(),
-            ],
-            'filter'    => [
-                'nullable',
-                'array',
-                JsonApiRule::filter()->forget('id'),
-            ],
-            'include'   => [
-                'nullable',
-                'string',
-                JsonApiRule::includePaths(),
-            ],
-            'page'      => JsonApiRule::notSupported(),
-            'sort'      => JsonApiRule::notSupported(),
-            'withCount' => [
-                'nullable',
-                'string',
-                JsonApiRule::countable(),
-            ],
-        ];
-    }
-}

app/JsonApi/V2/Accounts/Capabilities/AccountQuery.php

@@ -1,142 +0,0 @@
-<?php
-
-/*
- * AccountQuery.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\JsonApi\V2\Accounts\Capabilities;
-
-use FireflyIII\Models\Account;
-use FireflyIII\Support\Http\Api\AccountFilter;
-use FireflyIII\Support\JsonApi\CollectsCustomParameters;
-use FireflyIII\Support\JsonApi\Concerns\UsergroupAware;
-use FireflyIII\Support\JsonApi\Enrichments\AccountEnrichment;
-use FireflyIII\Support\JsonApi\ExpandsQuery;
-use FireflyIII\Support\JsonApi\FiltersPagination;
-use FireflyIII\Support\JsonApi\SortsCollection;
-use FireflyIII\Support\JsonApi\SortsQueryResults;
-use FireflyIII\Support\JsonApi\ValidateSortParameters;
-use Illuminate\Pagination\LengthAwarePaginator;
-use Illuminate\Support\Facades\Log;
-use LaravelJsonApi\Contracts\Pagination\Page;
-use LaravelJsonApi\Contracts\Store\HasPagination;
-use LaravelJsonApi\NonEloquent\Capabilities\QueryAll;
-
-class AccountQuery extends QueryAll implements HasPagination
-{
-    use AccountFilter;
-    use CollectsCustomParameters;
-    use ExpandsQuery;
-    use FiltersPagination;
-    use SortsCollection;
-    use SortsQueryResults;
-    use UsergroupAware;
-    use ValidateSortParameters;
-
-    // use PaginatesEnumerables;
-
-    #[\Override]
-    /**
-     * This method returns all accounts, given a bunch of filters and sort fields, together with pagination.
-     *
-     * It is only used on the index, and nowhere else.
-     */
-    public function get(): iterable
-    {
-        Log::debug(__METHOD__);
-        // collect sort options
-        $sort        = $this->queryParameters->sortFields();
-
-        // collect pagination based on the page
-        $pagination  = $this->filtersPagination($this->queryParameters->page());
-
-        // check if we need all accounts, regardless of pagination
-        // This is necessary when the user wants to sort on specific params.
-        $needsAll    = $this->needsFullDataset(Account::class, $sort);
-
-        // params that were not recognised, may be my own custom stuff.
-        $otherParams = $this->getOtherParams($this->queryParameters->unrecognisedParameters());
-
-        // start the query
-        $query       = $this->userGroup->accounts();
-
-        // add sort and filter parameters to the query.
-        $query       = $this->addSortParams(Account::class, $query, $sort);
-        $query       = $this->addFilterParams(Account::class, $query, $this->queryParameters->filter());
-
-        // collect the result.
-        $collection  = $query->get(['accounts.*']);
-        // sort the data after the query, and return it right away.
-        $collection  = $this->sortCollection(Account::class, $collection, $sort);
-
-        // if the entire collection needs to be enriched and sorted, do so now:
-        $totalCount  = $collection->count();
-        Log::debug(sprintf('Total is %d', $totalCount));
-        if ($needsAll) {
-            Log::debug('Needs the entire collection');
-            // enrich the entire collection
-            $enrichment  = new AccountEnrichment();
-            $enrichment->setStart($otherParams['start'] ?? null);
-            $enrichment->setEnd($otherParams['end'] ?? null);
-            $collection  = $enrichment->enrich($collection);
-
-            // TODO sort the set based on post-query sort options:
-            $collection  = $this->postQuerySort(Account::class, $collection, $sort);
-
-            // take the current page from the enriched set.
-            $currentPage = $collection->skip(($pagination['number'] - 1) * $pagination['size'])->take($pagination['size']);
-        }
-        if (!$needsAll) {
-            Log::debug('Needs only partial collection');
-            // take from the collection the filtered page + page number:
-            $currentPage = $collection->skip(($pagination['number'] - 1) * $pagination['size'])->take($pagination['size']);
-
-            // enrich only the current page.
-            $enrichment  = new AccountEnrichment();
-            $enrichment->setStart($otherParams['start'] ?? null);
-            $enrichment->setEnd($otherParams['end'] ?? null);
-            $currentPage = $enrichment->enrich($currentPage);
-        }
-        // get current page?
-        Log::debug(sprintf('Skip %d, take %d', ($pagination['number'] - 1) * $pagination['size'], $pagination['size']));
-        // $currentPage = $collection->skip(($pagination['number'] - 1) * $pagination['size'])->take($pagination['size']);
-        Log::debug(sprintf('New collection size: %d', $currentPage->count()));
-
-        // TODO add filters after the query, if there are filters that cannot be applied to the database
-        // TODO same for sort things.
-
-        return new LengthAwarePaginator($currentPage, $totalCount, $pagination['size'], $pagination['number']);
-    }
-
-    #[\Override]
-    public function getOrPaginate(?array $page): iterable
-    {
-        exit('here weare');
-        // TODO: Implement getOrPaginate() method.
-    }
-
-    #[\Override]
-    public function paginate(array $page): Page
-    {
-        exit('here weare');
-        // TODO: Implement paginate() method.
-    }
-}

app/JsonApi/V2/Accounts/Capabilities/CrudAccount.php

@@ -1,61 +0,0 @@
-<?php
-
-/*
- * CrudAccount.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\JsonApi\V2\Accounts\Capabilities;
-
-use FireflyIII\Models\Account;
-use FireflyIII\Support\JsonApi\CollectsCustomParameters;
-use FireflyIII\Support\JsonApi\Enrichments\AccountEnrichment;
-use Illuminate\Support\Facades\Log;
-use LaravelJsonApi\NonEloquent\Capabilities\CrudResource;
-
-class CrudAccount extends CrudResource
-{
-    use CollectsCustomParameters;
-
-    public function create(array $validatedData): Account
-    {
-        var_dump($validatedData);
-
-        exit;
-    }
-
-    /**
-     * Read the supplied site.
-     */
-    public function read(Account $account): ?Account
-    {
-        $otherParams = $this->getOtherParams($this->request->query->all());
-
-        Log::debug(__METHOD__);
-        // enrich the collected data
-        $enrichment  = new AccountEnrichment();
-
-        // set start and date, if present.
-        $enrichment->setStart($otherParams['start'] ?? null);
-        $enrichment->setEnd($otherParams['end'] ?? null);
-
-        return $enrichment->enrichSingle($account);
-    }
-}

app/JsonApi/V2/Accounts/Capabilities/CrudAccountRelations.php

@@ -1,29 +0,0 @@
-<?php
-
-/*
- * CrudAccountRelations.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\JsonApi\V2\Accounts\Capabilities;
-
-use LaravelJsonApi\NonEloquent\Capabilities\CrudRelations;
-
-class CrudAccountRelations extends CrudRelations {}

app/JsonApi/V2/Server.php

@@ -1,53 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace FireflyIII\JsonApi\V2;
-
-use FireflyIII\JsonApi\V2\Accounts\AccountSchema;
-use FireflyIII\JsonApi\V2\Users\UserSchema;
-use FireflyIII\Support\JsonApi\Concerns\UsergroupAware;
-use FireflyIII\Support\JsonApi\Concerns\UserGroupDetectable;
-use Illuminate\Support\Facades\Log;
-use LaravelJsonApi\Core\Server\Server as BaseServer;
-
-/**
- * Class Server
- *
- * This class serves as a generic class for the v2 API "server".
- */
-class Server extends BaseServer
-{
-    use UsergroupAware;
-    use UserGroupDetectable;
-
-    /**
-     * The base URI namespace for this server.
-     */
-    protected string $baseUri = '/api/v2';
-
-    /**
-     * Bootstrap the server when it is handling an HTTP request.
-     */
-    public function serving(): void
-    {
-        Log::debug(__METHOD__);
-        // at this point the user may not actually have access to this user group.
-        $res = $this->detectUserGroup();
-        $this->setUserGroup($res);
-    }
-
-    /**
-     * Get the server's list of schemas.
-     */
-    protected function allSchemas(): array
-    {
-        // Log::debug(__METHOD__);
-
-        return [
-            AccountSchema::class,
-            UserSchema::class,
-            // AccountBalanceSchema::class,
-        ];
-    }
-}

app/JsonApi/V2/Users/UserResource.php

@@ -1,41 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace FireflyIII\JsonApi\V2\Users;
-
-use FireflyIII\Models\User;
-use Illuminate\Http\Request;
-use LaravelJsonApi\Core\Resources\JsonApiResource;
-
-/**
- * @property User $resource
- */
-class UserResource extends JsonApiResource
-{
-    /**
-     * Get the resource's attributes.
-     *
-     * @param null|Request $request
-     */
-    public function attributes($request): iterable
-    {
-        return [
-            'created_at' => $this->resource->created_at,
-            'updated_at' => $this->resource->updated_at,
-            'email'      => $this->resource->email,
-        ];
-    }
-
-    /**
-     * Get the resource's relationships.
-     *
-     * @param null|Request $request
-     */
-    public function relationships($request): iterable
-    {
-        return [
-            // @TODO
-        ];
-    }
-}

app/JsonApi/V2/Users/UserSchema.php

@@ -1,55 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace FireflyIII\JsonApi\V2\Users;
-
-use FireflyIII\User;
-use LaravelJsonApi\Eloquent\Contracts\Paginator;
-use LaravelJsonApi\Eloquent\Fields\DateTime;
-use LaravelJsonApi\Eloquent\Fields\ID;
-use LaravelJsonApi\Eloquent\Fields\Relations\HasMany;
-use LaravelJsonApi\Eloquent\Fields\Str;
-use LaravelJsonApi\Eloquent\Filters\WhereIdIn;
-use LaravelJsonApi\Eloquent\Pagination\PagePagination;
-use LaravelJsonApi\Eloquent\Schema;
-
-class UserSchema extends Schema
-{
-    /**
-     * The model the schema corresponds to.
-     */
-    public static string $model = User::class;
-
-    /**
-     * Get the resource fields.
-     */
-    public function fields(): array
-    {
-        return [
-            ID::make(),
-            DateTime::make('created_at')->sortable()->readOnly(),
-            DateTime::make('updated_at')->sortable()->readOnly(),
-            Str::make('email'),
-            HasMany::make('accounts'),
-        ];
-    }
-
-    /**
-     * Get the resource filters.
-     */
-    public function filters(): array
-    {
-        return [
-            WhereIdIn::make($this),
-        ];
-    }
-
-    /**
-     * Get the resource paginator.
-     */
-    public function pagination(): ?Paginator
-    {
-        return PagePagination::make();
-    }
-}

app/Models/Account.php

@@ -26,7 +26,6 @@ namespace FireflyIII\Models;
 use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 use FireflyIII\Support\Models\ReturnsIntegerUserIdTrait;
 use FireflyIII\User;
-use GeneaLabs\LaravelModelCaching\Traits\Cachable;
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
@@ -44,7 +43,6 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
  */
 class Account extends Model
 {
-    use Cachable;
     use HasFactory;
     use ReturnsIntegerIdTrait;
     use ReturnsIntegerUserIdTrait;

app/Models/Transaction.php

@@ -25,7 +25,6 @@ namespace FireflyIII\Models;
 
 use Carbon\Carbon;
 use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
-use GeneaLabs\LaravelModelCaching\Traits\Cachable;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
@@ -39,7 +38,6 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  */
 class Transaction extends Model
 {
-    use Cachable;
     use HasFactory;
     use ReturnsIntegerIdTrait;
     use SoftDeletes;

app/Repositories/Bill/BillRepository.php

@@ -527,7 +527,7 @@ class BillRepository implements BillRepositoryInterface
         Log::debug(sprintf('sumPaidInRange from %s to %s', $start->toW3cString(), $end->toW3cString()));
         $bills           = $this->getActiveBills();
         $return          = [];
-        $convertToNative = app('preferences')->getForUser($this->user, 'convert_to_native', false)->data;
+        $convertToNative = Amount::convertToNative($this->user);
         $default         = app('amount')->getDefaultCurrency();
 
         /** @var Bill $bill */
@@ -572,7 +572,7 @@ class BillRepository implements BillRepositoryInterface
         app('log')->debug(sprintf('Now in sumUnpaidInRange("%s", "%s")', $start->format('Y-m-d'), $end->format('Y-m-d')));
         $bills           = $this->getActiveBills();
         $return          = [];
-        $convertToNative = app('preferences')->getForUser($this->user, 'convert_to_native', false)->data;
+        $convertToNative = Amount::convertToNative($this->user);
         $default         = app('amount')->getDefaultCurrency();
 
         /** @var Bill $bill */

app/Repositories/Budget/AvailableBudgetRepository.php

@@ -27,6 +27,7 @@ namespace FireflyIII\Repositories\Budget;
 use Carbon\Carbon;
 use FireflyIII\Models\AvailableBudget;
 use FireflyIII\Models\TransactionCurrency;
+use FireflyIII\Support\Facades\Amount;
 use FireflyIII\User;
 use Illuminate\Contracts\Auth\Authenticatable;
 use Illuminate\Database\Eloquent\Builder;
@@ -134,8 +135,8 @@ class AvailableBudgetRepository implements AvailableBudgetRepositoryInterface
         ;
 
         // use native amount if necessary?
-        $convertToNative  = app('preferences')->getForUser($this->user, 'convert_to_native', false)->data;
-        $default          = app('amount')->getDefaultCurrency();
+        $convertToNative  = Amount::convertToNative($this->user);
+        $default          = Amount::getDefaultCurrency();
 
         /** @var AvailableBudget $availableBudget */
         foreach ($availableBudgets as $availableBudget) {

app/Repositories/Budget/OperationsRepository.php

@@ -214,7 +214,6 @@ class OperationsRepository implements OperationsRepositoryInterface
         Log::debug('Start of sumExpenses.');
         // this collector excludes all transfers TO liabilities (which are also withdrawals)
         // because those expenses only become expenses once they move from the liability to the friend.
-        // TODO this filter must be somewhere in AccountRepositoryInterface because I suspect its needed more often (A113)
 
         // 2024-12-24 disable the exclusion for now.
 
@@ -224,8 +223,8 @@ class OperationsRepository implements OperationsRepositoryInterface
         $selection       = new Collection();
 
         // default currency information for native stuff.
-        $convertToNative = app('preferences')->get('convert_to_native', false)->data;
-        $default         = app('amount')->getDefaultCurrency();
+        $convertToNative = Amount::convertToNative($this->user);
+        $default         = Amount::getDefaultCurrency();
 
         /** @var Account $account */
         foreach ($subset as $account) {
@@ -258,30 +257,10 @@ class OperationsRepository implements OperationsRepositoryInterface
         // same but for transactions in the foreign currency:
         if (null !== $currency) {
             Log::debug('STOP looking for transactions in the foreign currency.');
-
-            //            Log::debug(sprintf('Look for transactions with foreign currency %s', $currency->code));
-            //            // app('log')->debug(sprintf('Currency is "%s".', $currency->name));
-            //            /** @var GroupCollectorInterface $collector */
-            //            $collector = app(GroupCollectorInterface::class);
-            //            $collector->setUser($this->user)->setRange($start, $end)->setTypes([TransactionTypeEnum::WITHDRAWAL->value])->setForeignCurrency($currency)->setBudgets($budgets);
-            //
-            //            if (null !== $accounts) {
-            //                $collector->setAccounts($accounts);
-            //            }
-            //            $result = $collector->getExtractedJournals();
-            //            // app('log')->debug(sprintf('Found %d journals with currency %s.', count($result), $currency->code));
-            //            // do not use array_merge because you want keys to overwrite (otherwise you get double results):
-            //            Log::debug(sprintf('Found %d extra journals in foreign currency.', count($result)));
-            //            $journals = $result + $journals;
         }
         $array           = [];
 
         foreach ($journals as $journal) {
-            //            Log::debug(sprintf('Journal #%d.', $journal['transaction_journal_id']));
-            //            Log::debug(sprintf('Amounts: %1$s %2$s (amount), %3$s %4$s (foreign_amount), %5$s %6$s (native_amount) %5$s %7$s (foreign native amount)',
-            //                               $journal['currency_code'], $journal['amount'], $journal['foreign_currency_code'], $journal['foreign_amount'],
-            //                               $default->code, $journal['native_amount'], $journal['native_foreign_amount'])
-            //            );
             // TODO same as in category::sumexpenses
             $amount                    = '0';
             $currencyId                = (int) $journal['currency_id'];

app/Repositories/Category/NoCategoryRepository.php

@@ -154,8 +154,8 @@ class NoCategoryRepository implements NoCategoryRepositoryInterface
         $journals        = $collector->getExtractedJournals();
         $array           = [];
         // default currency information for native stuff.
-        $convertToNative = app('preferences')->get('convert_to_native', false)->data;
-        $default         = app('amount')->getDefaultCurrency();
+        $convertToNative = Amount::convertToNative($this->user);
+        $default         = Amount::getDefaultCurrency();
 
         foreach ($journals as $journal) {
             // Almost the same as in \FireflyIII\Repositories\Budget\OperationsRepository::sumExpenses

app/Repositories/Category/OperationsRepository.php

@@ -331,8 +331,8 @@ class OperationsRepository implements OperationsRepositoryInterface
         $collector->setUser($this->user)->setRange($start, $end)->setTypes([TransactionTypeEnum::WITHDRAWAL->value]);
 
         // default currency information for native stuff.
-        $convertToNative = app('preferences')->get('convert_to_native', false)->data;
-        $default         = app('amount')->getDefaultCurrency();
+        $convertToNative = Amount::convertToNative($this->user);
+        $default         = Amount::getDefaultCurrency();
         if (null !== $accounts && $accounts->count() > 0) {
             $collector->setAccounts($accounts);
         }
@@ -355,15 +355,21 @@ class OperationsRepository implements OperationsRepositoryInterface
             $currencyCode              = $journal['currency_code'];
             $currencyDecimalPlaces     = $journal['currency_decimal_places'];
             if ($convertToNative) {
-                $useNative = $default->id !== (int) $journal['currency_id'];
-                $amount    = Amount::getAmountFromJournal($journal);
-                if ($useNative) {
+                $amount = Amount::getAmountFromJournal($journal);
+                if ($default->id !== (int) $journal['currency_id'] && $default->id !== (int) $journal['foreign_currency_id']) {
                     $currencyId            = $default->id;
                     $currencyName          = $default->name;
                     $currencySymbol        = $default->symbol;
                     $currencyCode          = $default->code;
                     $currencyDecimalPlaces = $default->decimal_places;
                 }
+                if ($default->id !== (int) $journal['currency_id'] && $default->id === (int) $journal['foreign_currency_id']) {
+                    $currencyId            = $journal['foreign_currency_id'];
+                    $currencyName          = $journal['foreign_currency_name'];
+                    $currencySymbol        = $journal['foreign_currency_symbol'];
+                    $currencyCode          = $journal['foreign_currency_code'];
+                    $currencyDecimalPlaces = $journal['foreign_currency_decimal_places'];
+                }
                 Log::debug(sprintf('[a] Add amount %s %s', $currencyCode, $amount));
             }
             if (!$convertToNative) {
@@ -372,7 +378,6 @@ class OperationsRepository implements OperationsRepositoryInterface
                 $amount = $journal['amount'];
             }
 
-
             $array[$currencyId] ??= [
                 'sum'                     => '0',
                 'currency_id'             => (string) $currencyId,
@@ -393,9 +398,9 @@ class OperationsRepository implements OperationsRepositoryInterface
     public function sumIncome(Carbon $start, Carbon $end, ?Collection $accounts = null, ?Collection $categories = null): array
     {
         /** @var GroupCollectorInterface $collector */
-        $collector = app(GroupCollectorInterface::class);
+        $collector       = app(GroupCollectorInterface::class);
         $collector->setUser($this->user)->setRange($start, $end)
-            ->setTypes([TransactionType::DEPOSIT])
+            ->setTypes([TransactionTypeEnum::DEPOSIT->value])
         ;
 
         if (null !== $accounts && $accounts->count() > 0) {
@@ -405,20 +410,52 @@ class OperationsRepository implements OperationsRepositoryInterface
             $categories = $this->getCategories();
         }
         $collector->setCategories($categories);
-        $journals  = $collector->getExtractedJournals();
-        $array     = [];
+        $journals        = $collector->getExtractedJournals();
+        $convertToNative = Amount::convertToNative($this->user);
+        $default         = Amount::getDefaultCurrency();
+        $array           = [];
 
         foreach ($journals as $journal) {
+            // Almost the same as in \FireflyIII\Repositories\Budget\OperationsRepository::sumExpenses
+            $amount                    = '0';
             $currencyId                = (int) $journal['currency_id'];
+            $currencyName              = $journal['currency_name'];
+            $currencySymbol            = $journal['currency_symbol'];
+            $currencyCode              = $journal['currency_code'];
+            $currencyDecimalPlaces     = $journal['currency_decimal_places'];
+            if ($convertToNative) {
+                $amount = Amount::getAmountFromJournal($journal);
+                if ($default->id !== (int) $journal['currency_id'] && $default->id !== (int) $journal['foreign_currency_id']) {
+                    $currencyId            = $default->id;
+                    $currencyName          = $default->name;
+                    $currencySymbol        = $default->symbol;
+                    $currencyCode          = $default->code;
+                    $currencyDecimalPlaces = $default->decimal_places;
+                }
+                if ($default->id !== (int) $journal['currency_id'] && $default->id === (int) $journal['foreign_currency_id']) {
+                    $currencyId            = $journal['foreign_currency_id'];
+                    $currencyName          = $journal['foreign_currency_name'];
+                    $currencySymbol        = $journal['foreign_currency_symbol'];
+                    $currencyCode          = $journal['foreign_currency_code'];
+                    $currencyDecimalPlaces = $journal['foreign_currency_decimal_places'];
+                }
+                Log::debug(sprintf('[a] Add amount %s %s', $currencyCode, $amount));
+            }
+            if (!$convertToNative) {
+                // ignore the amount in foreign currency.
+                Log::debug(sprintf('[b] Add amount %s %s', $currencyCode, $journal['amount']));
+                $amount = $journal['amount'];
+            }
+
             $array[$currencyId] ??= [
                 'sum'                     => '0',
                 'currency_id'             => (string) $currencyId,
-                'currency_name'           => $journal['currency_name'],
-                'currency_symbol'         => $journal['currency_symbol'],
-                'currency_code'           => $journal['currency_code'],
-                'currency_decimal_places' => $journal['currency_decimal_places'],
+                'currency_name'           => $currencyName,
+                'currency_symbol'         => $currencySymbol,
+                'currency_code'           => $currencyCode,
+                'currency_decimal_places' => $currencyDecimalPlaces,
             ];
-            $array[$currencyId]['sum'] = bcadd($array[$currencyId]['sum'], app('steam')->positive($journal['amount']));
+            $array[$currencyId]['sum'] = bcadd($array[$currencyId]['sum'], app('steam')->positive($amount));
         }
 
         return $array;