Update, rebuild, and add a new API endpoint.

app/Api/V2/Controllers/Model/Transaction/UpdateController.php

@@ -0,0 +1,93 @@
+<?php
+/*
+ * UpdateController.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\Model\Transaction;
+
+use FireflyIII\Api\V2\Controllers\Controller;
+use FireflyIII\Api\V2\Request\Model\Transaction\UpdateRequest;
+use FireflyIII\Events\UpdatedTransactionGroup;
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Helpers\Collector\GroupCollectorInterface;
+use FireflyIII\Models\TransactionGroup;
+use FireflyIII\Repositories\TransactionGroup\TransactionGroupRepositoryInterface;
+use FireflyIII\Transformers\V2\TransactionGroupTransformer;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+
+class UpdateController extends Controller
+{
+    private TransactionGroupRepositoryInterface $groupRepository;
+
+    /**
+     * TransactionController constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $this->groupRepository = app(TransactionGroupRepositoryInterface::class);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * This endpoint is documented at:
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/transactions/updateTransaction
+     *
+     * Update a transaction.
+     *
+     * @throws FireflyException
+     */
+    public function update(UpdateRequest $request, TransactionGroup $transactionGroup): JsonResponse
+    {
+        app('log')->debug('Now in update routine for transaction group [v2]!');
+        $data             = $request->getAll();
+        $transactionGroup = $this->groupRepository->update($transactionGroup, $data);
+        $applyRules       = $data['apply_rules'] ?? true;
+        $fireWebhooks     = $data['fire_webhooks'] ?? true;
+
+        event(new UpdatedTransactionGroup($transactionGroup, $applyRules, $fireWebhooks));
+        app('preferences')->mark();
+
+        /** @var User $admin */
+        $admin            = auth()->user();
+
+        // use new group collector:
+        /** @var GroupCollectorInterface $collector */
+        $collector        = app(GroupCollectorInterface::class);
+        $collector->setUser($admin)->setTransactionGroup($transactionGroup);
+
+        $selectedGroup    = $collector->getGroups()->first();
+        if (null === $selectedGroup) {
+            throw new FireflyException('200032: Cannot find transaction. Possibly, a rule deleted this transaction after its creation.');
+        }
+
+        $transformer      = new TransactionGroupTransformer();
+        $transformer->setParameters($this->parameters);
+
+        return response()->api($this->jsonApiObject('transactions', $selectedGroup, $transformer))->header('Content-Type', self::CONTENT_TYPE);
+    }
+}

app/Api/V2/Request/Model/Transaction/UpdateRequest.php

@@ -0,0 +1,366 @@
+<?php
+/*
+ * UpdateRequest.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\Request\Model\Transaction;
+
+use FireflyIII\Api\V1\Requests\Models\AvailableBudget\Request;
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Models\TransactionGroup;
+use FireflyIII\Rules\BelongsUser;
+use FireflyIII\Rules\IsBoolean;
+use FireflyIII\Rules\IsDateOrTime;
+use FireflyIII\Rules\IsValidPositiveAmount;
+use FireflyIII\Rules\IsValidZeroOrMoreAmount;
+use FireflyIII\Support\Request\ChecksLogin;
+use FireflyIII\Support\Request\ConvertsDataTypes;
+use FireflyIII\Validation\GroupValidation;
+use FireflyIII\Validation\TransactionValidation;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Validation\Validator;
+
+/**
+ * Class UpdateRequest
+ *
+ * TODO it's the same as the v1
+ */
+class UpdateRequest extends Request
+{
+    use ChecksLogin;
+    use ConvertsDataTypes;
+    use GroupValidation;
+    use TransactionValidation;
+
+    private array $arrayFields;
+    private array $booleanFields;
+    private array $dateFields;
+    private array $floatFields;
+    private array $integerFields;
+    private array $stringFields;
+    private array $textareaFields;
+
+    /**
+     * Get all data. Is pretty complex because of all the ??-statements.
+     *
+     * @throws FireflyException
+     */
+    public function getAll(): array
+    {
+        app('log')->debug(sprintf('Now in %s', __METHOD__));
+        $this->integerFields  = ['order', 'currency_id', 'foreign_currency_id', 'transaction_journal_id', 'source_id', 'destination_id', 'budget_id', 'category_id', 'bill_id', 'recurrence_id'];
+        $this->dateFields     = ['date', 'interest_date', 'book_date', 'process_date', 'due_date', 'payment_date', 'invoice_date'];
+        $this->textareaFields = ['notes'];
+        // not really floats, for validation.
+        $this->floatFields    = ['amount', 'foreign_amount'];
+        $this->stringFields   = ['type', 'currency_code', 'foreign_currency_code', 'description', 'source_name', 'source_iban', 'source_number', 'source_bic', 'destination_name', 'destination_iban', 'destination_number', 'destination_bic', 'budget_name', 'category_name', 'bill_name', 'internal_reference', 'external_id', 'bunq_payment_id', 'sepa_cc', 'sepa_ct_op', 'sepa_ct_id', 'sepa_db', 'sepa_country', 'sepa_ep', 'sepa_ci', 'sepa_batch_id', 'external_url'];
+        $this->booleanFields  = ['reconciled'];
+        $this->arrayFields    = ['tags'];
+        $data                 = [];
+        if ($this->has('transactions')) {
+            $data['transactions'] = $this->getTransactionData();
+        }
+        if ($this->has('apply_rules')) {
+            $data['apply_rules'] = $this->boolean('apply_rules', true);
+        }
+        if ($this->has('fire_webhooks')) {
+            $data['fire_webhooks'] = $this->boolean('fire_webhooks', true);
+        }
+        if ($this->has('group_title')) {
+            $data['group_title'] = $this->convertString('group_title');
+        }
+
+        return $data;
+    }
+
+    /**
+     * The rules that the incoming request must be matched against.
+     */
+    public function rules(): array
+    {
+        app('log')->debug(sprintf('Now in %s', __METHOD__));
+        $validProtocols = config('firefly.valid_url_protocols');
+
+        return [
+            // basic fields for group:
+            'group_title'                            => 'min:1|max:1000|nullable',
+            'apply_rules'                            => [new IsBoolean()],
+
+            // transaction rules (in array for splits):
+            'transactions.*.type'                    => 'in:withdrawal,deposit,transfer,opening-balance,reconciliation',
+            'transactions.*.date'                    => [new IsDateOrTime()],
+            'transactions.*.order'                   => 'numeric|min:0',
+
+            // group id:
+            'transactions.*.transaction_journal_id'  => ['nullable', 'numeric', new BelongsUser()],
+
+            // currency info
+            'transactions.*.currency_id'             => 'numeric|exists:transaction_currencies,id|nullable',
+            'transactions.*.currency_code'           => 'min:3|max:51|exists:transaction_currencies,code|nullable',
+            'transactions.*.foreign_currency_id'     => 'nullable|numeric|exists:transaction_currencies,id',
+            'transactions.*.foreign_currency_code'   => 'nullable|min:3|max:51|exists:transaction_currencies,code',
+
+            // amount
+            'transactions.*.amount'                  => ['nullable', new IsValidPositiveAmount()],
+            'transactions.*.foreign_amount'          => ['nullable', new IsValidZeroOrMoreAmount()],
+
+            // description
+            'transactions.*.description'             => 'nullable|min:1|max:1000',
+
+            // source of transaction
+            'transactions.*.source_id'               => ['numeric', 'nullable', new BelongsUser()],
+            'transactions.*.source_name'             => 'min:1|max:255|nullable',
+
+            // destination of transaction
+            'transactions.*.destination_id'          => ['numeric', 'nullable', new BelongsUser()],
+            'transactions.*.destination_name'        => 'min:1|max:255|nullable',
+
+            // budget, category, bill and piggy
+            'transactions.*.budget_id'               => ['mustExist:budgets,id', new BelongsUser(), 'nullable'],
+            'transactions.*.budget_name'             => ['min:1', 'max:255', 'nullable', new BelongsUser()],
+            'transactions.*.category_id'             => ['mustExist:categories,id', new BelongsUser(), 'nullable'],
+            'transactions.*.category_name'           => 'min:1|max:255|nullable',
+            'transactions.*.bill_id'                 => ['numeric', 'nullable', 'mustExist:bills,id', new BelongsUser()],
+            'transactions.*.bill_name'               => ['min:1', 'max:255', 'nullable', new BelongsUser()],
+
+            // other interesting fields
+            'transactions.*.reconciled'              => [new IsBoolean()],
+            'transactions.*.notes'                   => 'min:1|max:32768|nullable',
+            'transactions.*.tags'                    => 'min:0|max:255|nullable',
+            'transactions.*.tags.*'                  => 'min:0|max:255',
+
+            // meta info fields
+            'transactions.*.internal_reference'      => 'min:1|max:255|nullable',
+            'transactions.*.external_id'             => 'min:1|max:255|nullable',
+            'transactions.*.recurrence_id'           => 'min:1|max:255|nullable',
+            'transactions.*.bunq_payment_id'         => 'min:1|max:255|nullable',
+            'transactions.*.external_url'            => sprintf('min:1|max:255|nullable|url:%s', $validProtocols),
+
+            // SEPA fields:
+            'transactions.*.sepa_cc'                 => 'min:1|max:255|nullable',
+            'transactions.*.sepa_ct_op'              => 'min:1|max:255|nullable',
+            'transactions.*.sepa_ct_id'              => 'min:1|max:255|nullable',
+            'transactions.*.sepa_db'                 => 'min:1|max:255|nullable',
+            'transactions.*.sepa_country'            => 'min:1|max:255|nullable',
+            'transactions.*.sepa_ep'                 => 'min:1|max:255|nullable',
+            'transactions.*.sepa_ci'                 => 'min:1|max:255|nullable',
+            'transactions.*.sepa_batch_id'           => 'min:1|max:255|nullable',
+
+            // dates
+            'transactions.*.interest_date'           => 'date|nullable',
+            'transactions.*.book_date'               => 'date|nullable',
+            'transactions.*.process_date'            => 'date|nullable',
+            'transactions.*.due_date'                => 'date|nullable',
+            'transactions.*.payment_date'            => 'date|nullable',
+            'transactions.*.invoice_date'            => 'date|nullable',
+        ];
+    }
+
+    /**
+     * Configure the validator instance.
+     */
+    public function withValidator(Validator $validator): void
+    {
+        app('log')->debug('Now in withValidator');
+
+        /** @var TransactionGroup $transactionGroup */
+        $transactionGroup = $this->route()->parameter('userGroupTransaction');
+        $validator->after(
+            function (Validator $validator) use ($transactionGroup): void {
+                // if more than one, verify that there are journal ID's present.
+                $this->validateJournalIds($validator, $transactionGroup);
+
+                // all transaction types must be equal:
+                $this->validateTransactionTypesForUpdate($validator);
+
+                // user wants to update a reconciled transaction.
+                // source, destination, amount + foreign_amount cannot be changed
+                // and must be omitted from the request.
+                $this->preventUpdateReconciled($validator, $transactionGroup);
+
+                // validate source/destination is equal, depending on the transaction journal type.
+                $this->validateEqualAccountsForUpdate($validator, $transactionGroup);
+
+                // see method:
+                // $this->preventNoAccountInfo($validator, );
+
+                // validate that the currency fits the source and/or destination account.
+                // validate all account info
+                $this->validateAccountInformationUpdate($validator, $transactionGroup);
+            }
+        );
+        if($validator->fails()) {
+            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+        }
+    }
+
+    /**
+     * Get transaction data.
+     *
+     * @throws FireflyException
+     */
+    private function getTransactionData(): array
+    {
+        app('log')->debug(sprintf('Now in %s', __METHOD__));
+        $return       = [];
+
+        /** @var null|array $transactions */
+        $transactions = $this->get('transactions');
+
+        if (!is_countable($transactions)) {
+            return $return;
+        }
+
+        /** @var null|array $transaction */
+        foreach ($transactions as $transaction) {
+            if (!is_array($transaction)) {
+                throw new FireflyException('Invalid data submitted: transaction is not array.');
+            }
+            // default response is to update nothing in the transaction:
+            $current  = [];
+            $current  = $this->getIntegerData($current, $transaction);
+            $current  = $this->getStringData($current, $transaction);
+            $current  = $this->getNlStringData($current, $transaction);
+            $current  = $this->getDateData($current, $transaction);
+            $current  = $this->getBooleanData($current, $transaction);
+            $current  = $this->getArrayData($current, $transaction);
+            $current  = $this->getFloatData($current, $transaction);
+            $return[] = $current;
+        }
+
+        return $return;
+    }
+
+    /**
+     * For each field, add it to the array if a reference is present in the request:
+     *
+     * @param array<string, string> $current
+     * @param array<string, mixed>  $transaction
+     */
+    private function getIntegerData(array $current, array $transaction): array
+    {
+        foreach ($this->integerFields as $fieldName) {
+            if (array_key_exists($fieldName, $transaction)) {
+                $current[$fieldName] = $this->integerFromValue((string) $transaction[$fieldName]);
+            }
+        }
+
+        return $current;
+    }
+
+    /**
+     * @param array<string, string> $current
+     * @param array<string, mixed>  $transaction
+     */
+    private function getStringData(array $current, array $transaction): array
+    {
+        foreach ($this->stringFields as $fieldName) {
+            if (array_key_exists($fieldName, $transaction)) {
+                $current[$fieldName] = $this->clearString((string) $transaction[$fieldName]);
+            }
+        }
+
+        return $current;
+    }
+
+    /**
+     * @param array<string, string> $current
+     * @param array<string, mixed>  $transaction
+     */
+    private function getNlStringData(array $current, array $transaction): array
+    {
+        foreach ($this->textareaFields as $fieldName) {
+            if (array_key_exists($fieldName, $transaction)) {
+                $current[$fieldName] = $this->clearStringKeepNewlines((string) $transaction[$fieldName]); // keep newlines
+            }
+        }
+
+        return $current;
+    }
+
+    /**
+     * @param array<string, string> $current
+     * @param array<string, mixed>  $transaction
+     */
+    private function getDateData(array $current, array $transaction): array
+    {
+        foreach ($this->dateFields as $fieldName) {
+            app('log')->debug(sprintf('Now at date field %s', $fieldName));
+            if (array_key_exists($fieldName, $transaction)) {
+                app('log')->debug(sprintf('New value: "%s"', (string) $transaction[$fieldName]));
+                $current[$fieldName] = $this->dateFromValue((string) $transaction[$fieldName]);
+            }
+        }
+
+        return $current;
+    }
+
+    /**
+     * @param array<string, string> $current
+     * @param array<string, mixed>  $transaction
+     */
+    private function getBooleanData(array $current, array $transaction): array
+    {
+        foreach ($this->booleanFields as $fieldName) {
+            if (array_key_exists($fieldName, $transaction)) {
+                $current[$fieldName] = $this->convertBoolean((string) $transaction[$fieldName]);
+            }
+        }
+
+        return $current;
+    }
+
+    /**
+     * @param array<string, string> $current
+     * @param array<string, mixed>  $transaction
+     */
+    private function getArrayData(array $current, array $transaction): array
+    {
+        foreach ($this->arrayFields as $fieldName) {
+            if (array_key_exists($fieldName, $transaction)) {
+                $current[$fieldName] = $this->arrayFromValue($transaction[$fieldName]);
+            }
+        }
+
+        return $current;
+    }
+
+    /**
+     * @param array<string, string> $current
+     * @param array<string, mixed>  $transaction
+     */
+    private function getFloatData(array $current, array $transaction): array
+    {
+        foreach ($this->floatFields as $fieldName) {
+            if (array_key_exists($fieldName, $transaction)) {
+                $value = $transaction[$fieldName];
+                if (is_float($value)) {
+                    $current[$fieldName] = sprintf('%.12f', $value);
+                }
+                if (!is_float($value)) {
+                    $current[$fieldName] = (string) $value;
+                }
+            }
+        }
+
+        return $current;
+    }
+}

app/Http/Controllers/Transaction/IndexController.php

@@ -76,12 +76,12 @@ class IndexController extends Controller
         }
 
         // add a split for the (future) v2 release.
-        $periods  = [];
-        $groups   = [];
-        $subTitle = 'TODO page subtitle in v2';
+        $periods      = [];
+        $groups       = [];
+        $subTitle     = 'TODO page subtitle in v2';
 
-        $subTitleIcon = config('firefly.transactionIconsByType.' . $objectType);
-        $types        = config('firefly.transactionTypesByType.' . $objectType);
+        $subTitleIcon = config('firefly.transactionIconsByType.'.$objectType);
+        $types        = config('firefly.transactionTypesByType.'.$objectType);
         $page         = (int)$request->get('page');
         $pageSize     = (int)app('preferences')->get('listPageSize', 50)->data;
 
@@ -97,31 +97,31 @@ class IndexController extends Controller
             }
 
             [$start, $end] = $end < $start ? [$end, $start] : [$start, $end];
-            $startStr     = $start->isoFormat($this->monthAndDayFormat);
-            $endStr       = $end->isoFormat($this->monthAndDayFormat);
-            $subTitle     = (string)trans(sprintf('firefly.title_%s_between', $objectType), ['start' => $startStr, 'end' => $endStr]);
-            $path         = route('transactions.index', [$objectType, $start->format('Y-m-d'), $end->format('Y-m-d')]);
-            $firstJournal = $this->repository->firstNull();
-            $startPeriod  = null === $firstJournal ? new Carbon() : $firstJournal->date;
-            $endPeriod    = clone $end;
-            $periods      = $this->getTransactionPeriodOverview($objectType, $startPeriod, $endPeriod);
+            $startStr      = $start->isoFormat($this->monthAndDayFormat);
+            $endStr        = $end->isoFormat($this->monthAndDayFormat);
+            $subTitle      = (string)trans(sprintf('firefly.title_%s_between', $objectType), ['start' => $startStr, 'end' => $endStr]);
+            $path          = route('transactions.index', [$objectType, $start->format('Y-m-d'), $end->format('Y-m-d')]);
+            $firstJournal  = $this->repository->firstNull();
+            $startPeriod   = null === $firstJournal ? new Carbon() : $firstJournal->date;
+            $endPeriod     = clone $end;
+            $periods       = $this->getTransactionPeriodOverview($objectType, $startPeriod, $endPeriod);
 
             /** @var GroupCollectorInterface $collector */
-            $collector = app(GroupCollectorInterface::class);
+            $collector     = app(GroupCollectorInterface::class);
 
             $collector->setRange($start, $end)
-                      ->setTypes($types)
-                      ->setLimit($pageSize)
-                      ->setPage($page)
-                      ->withBudgetInformation()
-                      ->withCategoryInformation()
-                      ->withAccountInformation()
-                      ->withAttachmentInformation();
-            $groups = $collector->getPaginatedGroups();
+                ->setTypes($types)
+                ->setLimit($pageSize)
+                ->setPage($page)
+                ->withBudgetInformation()
+                ->withCategoryInformation()
+                ->withAccountInformation()
+                ->withAttachmentInformation()
+            ;
+            $groups        = $collector->getPaginatedGroups();
             $groups->setPath($path);
         }
 
-
         return view('transactions.index', compact('subTitle', 'objectType', 'subTitleIcon', 'groups', 'periods', 'start', 'end'));
     }
 
@@ -132,8 +132,8 @@ class IndexController extends Controller
      */
     public function indexAll(Request $request, string $objectType)
     {
-        $subTitleIcon = config('firefly.transactionIconsByType.' . $objectType);
-        $types        = config('firefly.transactionTypesByType.' . $objectType);
+        $subTitleIcon = config('firefly.transactionIconsByType.'.$objectType);
+        $types        = config('firefly.transactionTypesByType.'.$objectType);
         $page         = (int)$request->get('page');
         $pageSize     = (int)app('preferences')->get('listPageSize', 50)->data;
         $path         = route('transactions.index.all', [$objectType]);
@@ -141,20 +141,21 @@ class IndexController extends Controller
         $start        = null === $first ? new Carbon() : $first->date;
         $last         = $this->repository->getLast();
         $end          = null !== $last ? $last->date : today(config('app.timezone'));
-        $subTitle     = (string)trans('firefly.all_' . $objectType);
+        $subTitle     = (string)trans('firefly.all_'.$objectType);
 
         /** @var GroupCollectorInterface $collector */
-        $collector = app(GroupCollectorInterface::class);
+        $collector    = app(GroupCollectorInterface::class);
 
         $collector->setRange($start, $end)
-                  ->setTypes($types)
-                  ->setLimit($pageSize)
-                  ->setPage($page)
-                  ->withAccountInformation()
-                  ->withBudgetInformation()
-                  ->withCategoryInformation()
-                  ->withAttachmentInformation();
-        $groups = $collector->getPaginatedGroups();
+            ->setTypes($types)
+            ->setLimit($pageSize)
+            ->setPage($page)
+            ->withAccountInformation()
+            ->withBudgetInformation()
+            ->withCategoryInformation()
+            ->withAttachmentInformation()
+        ;
+        $groups       = $collector->getPaginatedGroups();
         $groups->setPath($path);
 
         return view('transactions.index', compact('subTitle', 'objectType', 'subTitleIcon', 'groups', 'start', 'end'));

app/Providers/AppServiceProvider.php

@@ -23,12 +23,12 @@ declare(strict_types=1);
 
 namespace FireflyIII\Providers;
 
+use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\Facades\Response;
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Support\ServiceProvider;
 use Laravel\Passport\Passport;
 use Laravel\Sanctum\Sanctum;
-use Illuminate\Support\Facades\Blade;
 
 /**
  * Class AppServiceProvider
@@ -52,12 +52,13 @@ class AppServiceProvider extends ServiceProvider
 
             return response()
                 ->json($value)
-                ->withHeaders($headers);
+                ->withHeaders($headers)
+            ;
         });
 
         // blade extension
         Blade::directive('activeXRoutePartial', function (string $route) {
-            $name  = \Route::getCurrentRoute()->getName() ?? '';
+            $name = \Route::getCurrentRoute()->getName() ?? '';
             if (str_contains($name, $route)) {
                 return 'menu-open';
             }
@@ -65,7 +66,7 @@ class AppServiceProvider extends ServiceProvider
             return '';
         });
         Blade::if('partialroute', function (string $route) {
-            $name  = \Route::getCurrentRoute()->getName() ?? '';
+            $name = \Route::getCurrentRoute()->getName() ?? '';
             if (str_contains($name, $route)) {
                 return true;
             }

app/Repositories/TransactionGroup/TransactionGroupRepository.php

@@ -123,7 +123,7 @@ class TransactionGroupRepository implements TransactionGroupRepositoryInterface
 
     public function setUser(null|Authenticatable|User $user): void
     {
-        if ($user instanceof user) {
+        if ($user instanceof User) {
             $this->user = $user;
         }
     }

app/Support/Models/BillDateCalculator.php

@@ -29,6 +29,10 @@ use Illuminate\Support\Facades\Log;
 
 class BillDateCalculator
 {
+    // #8401 we start keeping track of the diff in periods, because if it can't jump over a period (happens often in February)
+    // we can force the process along.
+    private int $diffInMonths = 0;
+
     /**
      * Returns the dates a bill needs to be paid.
      *
@@ -43,12 +47,16 @@ class BillDateCalculator
         Log::debug(sprintf('Dates must be between %s and %s.', $earliest->format('Y-m-d'), $latest->format('Y-m-d')));
         Log::debug(sprintf('Bill started on %s, period is "%s", skip is %d, last paid = "%s".', $billStart->format('Y-m-d'), $period, $skip, $lastPaid?->format('Y-m-d')));
 
+        $daysUntilEOM = app('navigation')->daysUntilEndOfMonth($billStart);
+        Log::debug(sprintf('For bill start, days until end of month is %d', $daysUntilEOM));
+
         $set          = new Collection();
         $currentStart = clone $earliest;
 
         // 2023-06-23 subDay to fix 7655
         $currentStart->subDay();
         $loop         = 0;
+
         Log::debug('Start of loop');
         while ($currentStart <= $latest) {
             Log::debug(sprintf('Current start is %s', $currentStart->format('Y-m-d')));
@@ -79,8 +87,23 @@ class BillDateCalculator
                 $set->push(clone $nextExpectedMatch);
             }
 
+            // #8401
+            // a little check for when the day of the bill (ie 30th of the month) is not possible in
+            // the next expected month because that month has only 28 days (i.e. february).
+            // this applies to leap years as well.
+            if ($daysUntilEOM < 4) {
+                $nextUntilEOM = app('navigation')->daysUntilEndOfMonth($nextExpectedMatch);
+                $diffEOM      = $daysUntilEOM - $nextUntilEOM;
+                if ($diffEOM > 0) {
+                    Log::debug(sprintf('Bill start is %d days from the end of the month. nextExceptedMatch is %d days from the end of the month.', $daysUntilEOM, $nextUntilEOM));
+                    $nextExpectedMatch->subDays(1);
+                    Log::debug(sprintf('Subtract %d days from next expected match, which is now %s', $diffEOM, $nextExpectedMatch->format('Y-m-d')));
+                }
+            }
+
             // 2023-10
             // for the next loop, go to end of period, THEN add day.
+            Log::debug('Add one day to nextExpectedMatch/currentStart.');
             $nextExpectedMatch->addDay();
             $currentStart      = clone $nextExpectedMatch;
 
@@ -117,8 +140,13 @@ class BillDateCalculator
             return $billStartDate;
         }
 
-        $steps  = app('navigation')->diffInPeriods($period, $skip, $earliest, $billStartDate);
-        $result = clone $billStartDate;
+        $steps              = app('navigation')->diffInPeriods($period, $skip, $earliest, $billStartDate);
+        if ($steps === $this->diffInMonths) {
+            Log::debug(sprintf('Steps is %d, which is the same as diffInMonths (%d), so we add another 1.', $steps, $this->diffInMonths));
+            ++$steps;
+        }
+        $this->diffInMonths = $steps;
+        $result             = clone $billStartDate;
         if ($steps > 0) {
             --$steps;
             Log::debug(sprintf('Steps is %d, because addPeriod already adds 1.', $steps));

app/Support/Navigation.php

@@ -302,6 +302,13 @@ class Navigation
         return $currentEnd;
     }
 
+    public function daysUntilEndOfMonth(Carbon $date): int
+    {
+        $endOfMonth = $date->copy()->endOfMonth();
+
+        return $date->diffInDays($endOfMonth);
+    }
+
     public function diffInPeriods(string $period, int $skip, Carbon $beginning, Carbon $end): int
     {
         Log::debug(sprintf(

app/TransactionRules/Actions/SetNotes.php

@@ -33,7 +33,7 @@ use FireflyIII\Models\TransactionJournal;
  */
 class SetNotes implements ActionInterface
 {
-    private RuleACtion $action;
+    private RuleAction $action;
 
     /**
      * TriggerInterface constructor.