Clean up code.

2025-10-15 08:35:00 +00:00 · 2023-12-10 06:51:59 +01:00
parent c2b22a2bac
commit 46e130fdfe
195 changed files with 973 additions and 984 deletions
--- a/app/Models/Account.php
+++ b/app/Models/Account.php
@@ -49,13 +49,13 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 * @property Carbon|null                   $updated_at
 * @property Carbon|null                   $deleted_at
 * @property int                           $user_id
- * @property int                    $account_type_id
+ * @property int                           $account_type_id
 * @property string                        $name
 * @property string                        $virtual_balance
 * @property string|null                   $iban
 * @property bool                          $active
 * @property bool                          $encrypted
- * @property int                    $order
+ * @property int                           $order
 * @property-read Collection|AccountMeta[] $accountMeta
 * @property-read int|null                 $account_meta_count
 * @property AccountType                   $accountType
@@ -103,7 +103,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 * @property Location                      $location
 * @property string                        $liability_direction
 * @property string                        $current_debt
- * @property int                      $user_group_id
+ * @property int                           $user_group_id
 * @method static EloquentBuilder|Account whereUserGroupId($value)
 * @property-read UserGroup|null           $userGroup
 * @mixin Eloquent
@@ -127,7 +127,7 @@ class Account extends Model

    protected $fillable = ['user_id', 'user_group_id', 'account_type_id', 'name', 'active', 'virtual_balance', 'iban'];

-    protected $hidden             = ['encrypted'];
+    protected    $hidden             = ['encrypted'];
    private bool $joinedAccountTypes = false;

    /**
@@ -292,22 +292,9 @@ class Account extends Model
    }

    /**
-     * Get the virtual balance
-     *
     * @return Attribute
     */
-    protected function virtualBalance(): Attribute
-    {
-        return Attribute::make(
-            get: static fn($value) => (string)$value,
-        );
-    }
-    /**
-     * Get the user ID
-     *
-     * @return Attribute
-     */
-    protected function accountTypeId(): Attribute
+    protected function accountId(): Attribute
    {
        return Attribute::make(
            get: static fn($value) => (int)$value,
@@ -315,9 +302,11 @@ class Account extends Model
    }

    /**
+     * Get the user ID
+     *
     * @return Attribute
     */
-    protected function accountId(): Attribute
+    protected function accountTypeId(): Attribute
    {
        return Attribute::make(
            get: static fn($value) => (int)$value,
@@ -334,4 +323,16 @@ class Account extends Model
        );
    }

+    /**
+     * Get the virtual balance
+     *
+     * @return Attribute
+     */
+    protected function virtualBalance(): Attribute
+    {
+        return Attribute::make(
+            get: static fn($value) => (string)$value,
+        );
+    }
+
 }
--- a/app/Models/AccountMeta.php
+++ b/app/Models/AccountMeta.php
@@ -36,7 +36,7 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
 * @property int          $id
 * @property Carbon|null  $created_at
 * @property Carbon|null  $updated_at
- * @property int   $account_id
+ * @property int          $account_id
 * @property string       $name
 * @property mixed        $data
 * @property-read Account $account
--- a/app/Models/Attachment.php
+++ b/app/Models/Attachment.php
@@ -45,8 +45,8 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 * @property Carbon|null         $created_at
 * @property Carbon|null         $updated_at
 * @property Carbon|null         $deleted_at
- * @property int          $user_id
- * @property int          $attachable_id
+ * @property int                 $user_id
+ * @property int                 $attachable_id
 * @property string              $attachable_type
 * @property bool                $file_exists
 * @property string              $md5
@@ -81,7 +81,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 * @method static \Illuminate\Database\Eloquent\Builder|Attachment whereUserId($value)
 * @method static Builder|Attachment withTrashed()
 * @method static Builder|Attachment withoutTrashed()
- * @property int            $user_group_id
+ * @property int                 $user_group_id
 * @method static \Illuminate\Database\Eloquent\Builder|Attachment whereUserGroupId($value)
 * @mixin Eloquent
 */
--- a/app/Models/AuditLogEntry.php
+++ b/app/Models/AuditLogEntry.php
@@ -48,9 +48,9 @@ use Illuminate\Database\Eloquent\SoftDeletes;
 * @property Carbon|null         $created_at
 * @property Carbon|null         $updated_at
 * @property Carbon|null         $deleted_at
- * @property int          $auditable_id
+ * @property int                 $auditable_id
 * @property string              $auditable_type
- * @property int          $changer_id
+ * @property int                 $changer_id
 * @property string              $changer_type
 * @property string              $action
 * @property array|null          $before
--- a/app/Models/AutoBudget.php
+++ b/app/Models/AutoBudget.php
@@ -24,6 +24,7 @@ declare(strict_types=1);

 namespace FireflyIII\Models;

+use Carbon\Carbon;
 use Eloquent;
 use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 use Illuminate\Database\Eloquent\Casts\Attribute;
@@ -31,7 +32,6 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Query\Builder;
-use Carbon\Carbon;

 /**
 * FireflyIII\Models\AutoBudget
@@ -40,8 +40,8 @@ use Carbon\Carbon;
 * @property Carbon|null              $created_at
 * @property Carbon|null              $updated_at
 * @property Carbon|null              $deleted_at
- * @property int               $budget_id
- * @property int               $transaction_currency_id
+ * @property int                      $budget_id
+ * @property int                      $transaction_currency_id
 * @property int|string               $auto_budget_type
 * @property string                   $amount
 * @property string                   $period
@@ -96,7 +96,7 @@ class AutoBudget extends Model
    protected function amount(): Attribute
    {
        return Attribute::make(
-            get: static fn ($value) => (string)$value,
+            get: static fn($value) => (string)$value,
        );
    }

--- a/app/Models/AvailableBudget.php
+++ b/app/Models/AvailableBudget.php
@@ -23,6 +23,7 @@ declare(strict_types=1);

 namespace FireflyIII\Models;

+use Carbon\Carbon;
 use Eloquent;
 use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 use FireflyIII\Support\Models\ReturnsIntegerUserIdTrait;
@@ -32,7 +33,6 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Query\Builder;
-use Carbon\Carbon;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;

 /**
@@ -42,8 +42,8 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 * @property Carbon|null              $created_at
 * @property Carbon|null              $updated_at
 * @property Carbon|null              $deleted_at
- * @property int               $user_id
- * @property int               $transaction_currency_id
+ * @property int                      $user_id
+ * @property int                      $transaction_currency_id
 * @property string                   $amount
 * @property Carbon                   $start_date
 * @property Carbon                   $end_date
@@ -64,7 +64,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 * @method static \Illuminate\Database\Eloquent\Builder|AvailableBudget whereUserId($value)
 * @method static Builder|AvailableBudget withTrashed()
 * @method static Builder|AvailableBudget withoutTrashed()
- * @property int                 $user_group_id
+ * @property int                      $user_group_id
 * @method static \Illuminate\Database\Eloquent\Builder|AvailableBudget whereUserGroupId($value)
 * @mixin Eloquent
 */
@@ -131,9 +131,10 @@ class AvailableBudget extends Model
    protected function amount(): Attribute
    {
        return Attribute::make(
-            get: static fn ($value) => (string)$value,
+            get: static fn($value) => (string)$value,
        );
    }
+
    /**
     * @return Attribute
     */
--- a/app/Models/Bill.php
+++ b/app/Models/Bill.php
@@ -242,19 +242,7 @@ class Bill extends Model
    protected function amountMax(): Attribute
    {
        return Attribute::make(
-            get: static fn ($value) => (string)$value,
-        );
-    }
-
-    /**
-     * Get the skip
-     *
-     * @return Attribute
-     */
-    protected function skip(): Attribute
-    {
-        return Attribute::make(
-            get: static fn ($value) => (int)$value,
+            get: static fn($value) => (string)$value,
        );
    }

@@ -266,17 +254,7 @@ class Bill extends Model
    protected function amountMin(): Attribute
    {
        return Attribute::make(
-            get: static fn ($value) => (string)$value,
-        );
-    }
-
-    /**
-     * @return Attribute
-     */
-    protected function transactionCurrencyId(): Attribute
-    {
-        return Attribute::make(
-            get: static fn ($value) => (int)$value,
+            get: static fn($value) => (string)$value,
        );
    }

@@ -286,7 +264,29 @@ class Bill extends Model
    protected function order(): Attribute
    {
        return Attribute::make(
-            get: static fn ($value) => (int)$value,
+            get: static fn($value) => (int)$value,
+        );
+    }
+
+    /**
+     * Get the skip
+     *
+     * @return Attribute
+     */
+    protected function skip(): Attribute
+    {
+        return Attribute::make(
+            get: static fn($value) => (int)$value,
+        );
+    }
+
+    /**
+     * @return Attribute
+     */
+    protected function transactionCurrencyId(): Attribute
+    {
+        return Attribute::make(
+            get: static fn($value) => (int)$value,
        );
    }

--- a/app/Models/Budget.php
+++ b/app/Models/Budget.php
@@ -46,11 +46,11 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 * @property Carbon|null                          $created_at
 * @property Carbon|null                          $updated_at
 * @property Carbon|null                          $deleted_at
- * @property int                           $user_id
+ * @property int                                  $user_id
 * @property string                               $name
 * @property bool                                 $active
 * @property bool                                 $encrypted
- * @property int                           $order
+ * @property int                                  $order
 * @property-read Collection|Attachment[]         $attachments
 * @property-read int|null                        $attachments_count
 * @property-read Collection|AutoBudget[]         $autoBudgets
@@ -78,7 +78,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 * @method static Builder|Budget withTrashed()
 * @method static Builder|Budget withoutTrashed()
 * @property string                               $email
- * @property int                             $user_group_id
+ * @property int                                  $user_group_id
 * @method static \Illuminate\Database\Eloquent\Builder|Budget whereUserGroupId($value)
 * @property-read Collection|Note[]               $notes
 * @property-read int|null                        $notes_count
@@ -181,6 +181,7 @@ class Budget extends Model
    {
        return $this->belongsToMany(Transaction::class, 'budget_transaction', 'budget_id');
    }
+
    /**
     * @return Attribute
     */
--- a/app/Models/BudgetLimit.php
+++ b/app/Models/BudgetLimit.php
@@ -41,8 +41,8 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 * @property int                           $id
 * @property Carbon|null                   $created_at
 * @property Carbon|null                   $updated_at
- * @property int                    $budget_id
- * @property int                      $transaction_currency_id
+ * @property int                           $budget_id
+ * @property int                           $transaction_currency_id
 * @property Carbon                        $start_date
 * @property Carbon|null                   $end_date
 * @property string                        $amount
@@ -134,7 +134,7 @@ class BudgetLimit extends Model
    protected function amount(): Attribute
    {
        return Attribute::make(
-            get: static fn ($value) => (string)$value,
+            get: static fn($value) => (string)$value,
        );
    }

--- a/app/Models/Category.php
+++ b/app/Models/Category.php
@@ -25,6 +25,7 @@ namespace FireflyIII\Models;

 use Carbon\Carbon;
 use Eloquent;
+use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 use FireflyIII\Support\Models\ReturnsIntegerUserIdTrait;
 use FireflyIII\User;
 use Illuminate\Database\Eloquent\Collection;
@@ -35,7 +36,7 @@ use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Query\Builder;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
+
 /**
 * FireflyIII\Models\Category
 *
@@ -43,7 +44,7 @@ use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 * @property Carbon|null                          $created_at
 * @property Carbon|null                          $updated_at
 * @property Carbon|null                          $deleted_at
- * @property int                           $user_id
+ * @property int                                  $user_id
 * @property string                               $name
 * @property Carbon                               $lastActivity
 * @property bool                                 $encrypted
@@ -69,7 +70,7 @@ use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 * @method static \Illuminate\Database\Eloquent\Builder|Category whereUserId($value)
 * @method static Builder|Category withTrashed()
 * @method static Builder|Category withoutTrashed()
- * @property int                             $user_group_id
+ * @property int                                  $user_group_id
 * @method static \Illuminate\Database\Eloquent\Builder|Category whereUserGroupId($value)
 * @mixin Eloquent
 */
--- a/app/Models/Configuration.php
+++ b/app/Models/Configuration.php
@@ -25,10 +25,11 @@ namespace FireflyIII\Models;

 use Carbon\Carbon;
 use Eloquent;
+use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Query\Builder;
-use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
+
 /**
 * FireflyIII\Models\Configuration
 *
--- a/app/Models/CurrencyExchangeRate.php
+++ b/app/Models/CurrencyExchangeRate.php
@@ -22,8 +22,10 @@
 declare(strict_types=1);

 namespace FireflyIII\Models;
-use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
+
+use Carbon\Carbon;
 use Eloquent;
+use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 use FireflyIII\Support\Models\ReturnsIntegerUserIdTrait;
 use FireflyIII\User;
 use Illuminate\Database\Eloquent\Builder;
@@ -31,7 +33,6 @@ use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\SoftDeletes;
-use Carbon\Carbon;

 /**
 * Class CurrencyExchangeRate
@@ -40,9 +41,9 @@ use Carbon\Carbon;
 * @property Carbon|null              $created_at
 * @property Carbon|null              $updated_at
 * @property string|null              $deleted_at
- * @property int               $user_id
- * @property int               $from_currency_id
- * @property int               $to_currency_id
+ * @property int                      $user_id
+ * @property int                      $from_currency_id
+ * @property int                      $to_currency_id
 * @property Carbon                   $date
 * @property string                   $rate
 * @property string                   $user_rate
@@ -62,7 +63,7 @@ use Carbon\Carbon;
 * @method static Builder|CurrencyExchangeRate whereUpdatedAt($value)
 * @method static Builder|CurrencyExchangeRate whereUserId($value)
 * @method static Builder|CurrencyExchangeRate whereUserRate($value)
- * @property int                 $user_group_id
+ * @property int                      $user_group_id
 * @method static Builder|CurrencyExchangeRate whereUserGroupId($value)
 * @method static Builder|CurrencyExchangeRate onlyTrashed()
 * @method static Builder|CurrencyExchangeRate withTrashed()
@@ -111,26 +112,6 @@ class CurrencyExchangeRate extends Model
        return $this->belongsTo(User::class);
    }

-    /**
-     * @return Attribute
-     */
-    protected function rate(): Attribute
-    {
-        return Attribute::make(
-            get: static fn ($value) => (string)$value,
-        );
-    }
-
-    /**
-     * @return Attribute
-     */
-    protected function userRate(): Attribute
-    {
-        return Attribute::make(
-            get: static fn ($value) => (string)$value,
-        );
-    }
-
    /**
     * @return Attribute
     */
@@ -141,6 +122,16 @@ class CurrencyExchangeRate extends Model
        );
    }

+    /**
+     * @return Attribute
+     */
+    protected function rate(): Attribute
+    {
+        return Attribute::make(
+            get: static fn($value) => (string)$value,
+        );
+    }
+
    /**
     * @return Attribute
     */
@@ -151,5 +142,15 @@ class CurrencyExchangeRate extends Model
        );
    }

+    /**
+     * @return Attribute
+     */
+    protected function userRate(): Attribute
+    {
+        return Attribute::make(
+            get: static fn($value) => (string)$value,
+        );
+    }
+

 }
--- a/app/Models/GroupMembership.php
+++ b/app/Models/GroupMembership.php
@@ -26,13 +26,14 @@ namespace FireflyIII\Models;

 use Carbon\Carbon;
 use Eloquent;
+use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 use FireflyIII\Support\Models\ReturnsIntegerUserIdTrait;
 use FireflyIII\User;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
+
 /**
 * Class GroupMembership
 *
@@ -40,9 +41,9 @@ use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 * @property Carbon|null    $created_at
 * @property Carbon|null    $updated_at
 * @property string|null    $deleted_at
- * @property int     $user_id
- * @property int     $user_group_id
- * @property int     $user_role_id
+ * @property int            $user_id
+ * @property int            $user_group_id
+ * @property int            $user_role_id
 * @property-read User      $user
 * @property-read UserGroup $userGroup
 * @property-read UserRole  $userRole
--- a/app/Models/InvitedUser.php
+++ b/app/Models/InvitedUser.php
@@ -26,13 +26,14 @@ namespace FireflyIII\Models;

 use Carbon\Carbon;
 use Eloquent;
+use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 use FireflyIII\Support\Models\ReturnsIntegerUserIdTrait;
 use FireflyIII\User;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
+
 /**
 * Class InvitedUser
 *
@@ -43,7 +44,7 @@ use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 * @property int         $id
 * @property Carbon|null $created_at
 * @property Carbon|null $updated_at
- * @property int  $user_id
+ * @property int         $user_id
 * @property string      $email
 * @property string      $invite_code
 * @property Carbon      $expires
--- a/app/Models/LinkType.php
+++ b/app/Models/LinkType.php
@@ -25,13 +25,14 @@ namespace FireflyIII\Models;

 use Carbon\Carbon;
 use Eloquent;
+use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Query\Builder;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
+
 /**
 * FireflyIII\Models\LinkType
 *
--- a/app/Models/Location.php
+++ b/app/Models/Location.php
@@ -26,13 +26,14 @@ namespace FireflyIII\Models;

 use Carbon\Carbon;
 use Eloquent;
+use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
-use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
+
 /**
 * FireflyIII\Models\Location
 *
@@ -40,7 +41,7 @@ use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 * @property Carbon|null               $created_at
 * @property Carbon|null               $updated_at
 * @property Carbon|null               $deleted_at
- * @property int                $locatable_id
+ * @property int                       $locatable_id
 * @property string                    $locatable_type
 * @property float|null                $latitude
 * @property float|null                $longitude
--- a/app/Models/Note.php
+++ b/app/Models/Note.php
@@ -25,12 +25,13 @@ namespace FireflyIII\Models;

 use Carbon\Carbon;
 use Eloquent;
+use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Query\Builder;
-use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
+
 /**
 * FireflyIII\Models\Note
 *
@@ -38,7 +39,7 @@ use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 * @property Carbon|null         $created_at
 * @property Carbon|null         $updated_at
 * @property Carbon|null         $deleted_at
- * @property int          $noteable_id
+ * @property int                 $noteable_id
 * @property string              $noteable_type
 * @property string|null         $title
 * @property string|null         $text
--- a/app/Models/ObjectGroup.php
+++ b/app/Models/ObjectGroup.php
@@ -26,6 +26,7 @@ namespace FireflyIII\Models;

 use Carbon\Carbon;
 use Eloquent;
+use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 use FireflyIII\Support\Models\ReturnsIntegerUserIdTrait;
 use FireflyIII\User;
 use Illuminate\Database\Eloquent\Builder;
@@ -35,17 +36,17 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\MorphToMany;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
+
 /**
 * FireflyIII\Models\ObjectGroup
 *
 * @property int                         $id
- * @property int                  $user_id
+ * @property int                         $user_id
 * @property Carbon|null                 $created_at
 * @property Carbon|null                 $updated_at
 * @property Carbon|null                 $deleted_at
 * @property string                      $title
- * @property int                  $order
+ * @property int                         $order
 * @property-read Collection|Account[]   $accounts
 * @property-read int|null               $accounts_count
 * @property-read Collection|Bill[]      $bills
@@ -63,7 +64,7 @@ use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 * @method static Builder|ObjectGroup whereTitle($value)
 * @method static Builder|ObjectGroup whereUpdatedAt($value)
 * @method static Builder|ObjectGroup whereUserId($value)
- * @property int                    $user_group_id
+ * @property int                         $user_group_id
 * @method static Builder|ObjectGroup whereUserGroupId($value)
 * @mixin Eloquent
 */
--- a/app/Models/PiggyBank.php
+++ b/app/Models/PiggyBank.php
@@ -23,7 +23,9 @@ declare(strict_types=1);

 namespace FireflyIII\Models;

+use Carbon\Carbon;
 use Eloquent;
+use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
@@ -33,9 +35,8 @@ use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Database\Eloquent\Relations\MorphToMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Query\Builder;
-use Carbon\Carbon;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
+
 /**
 * FireflyIII\Models\PiggyBank
 *
@@ -43,12 +44,12 @@ use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 * @property Carbon|null                           $created_at
 * @property Carbon|null                           $updated_at
 * @property Carbon|null                           $deleted_at
- * @property int                            $account_id
+ * @property int                                   $account_id
 * @property string                                $name
 * @property string                                $targetamount
 * @property Carbon|null                           $startdate
 * @property Carbon|null                           $targetdate
- * @property int                            $order
+ * @property int                                   $order
 * @property bool                                  $active
 * @property bool                                  $encrypted
 * @property-read Account                          $account
@@ -182,18 +183,6 @@ class PiggyBank extends Model
        $this->attributes['targetamount'] = (string)$value;
    }

-    /**
-     * Get the max amount
-     *
-     * @return Attribute
-     */
-    protected function targetamount(): Attribute
-    {
-        return Attribute::make(
-            get: static fn ($value) => (string)$value,
-        );
-    }
-
    /**
     * @return Attribute
     */
@@ -214,4 +203,16 @@ class PiggyBank extends Model
        );
    }

+    /**
+     * Get the max amount
+     *
+     * @return Attribute
+     */
+    protected function targetamount(): Attribute
+    {
+        return Attribute::make(
+            get: static fn($value) => (string)$value,
+        );
+    }
+
 }
--- a/app/Models/PiggyBankEvent.php
+++ b/app/Models/PiggyBankEvent.php
@@ -23,20 +23,21 @@ declare(strict_types=1);

 namespace FireflyIII\Models;

+use Carbon\Carbon;
 use Eloquent;
+use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use Carbon\Carbon;
-use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
+
 /**
 * FireflyIII\Models\PiggyBankEvent
 *
 * @property int                          $id
 * @property Carbon|null                  $created_at
 * @property Carbon|null                  $updated_at
- * @property int                   $piggy_bank_id
+ * @property int                          $piggy_bank_id
 * @property int|null                     $transaction_journal_id
 * @property Carbon                       $date
 * @property string                       $amount
@@ -102,7 +103,7 @@ class PiggyBankEvent extends Model
    protected function amount(): Attribute
    {
        return Attribute::make(
-            get: static fn ($value) => (string)$value,
+            get: static fn($value) => (string)$value,
        );
    }

--- a/app/Models/PiggyBankRepetition.php
+++ b/app/Models/PiggyBankRepetition.php
@@ -25,18 +25,19 @@ namespace FireflyIII\Models;

 use Carbon\Carbon;
 use Eloquent;
+use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
+
 /**
 * FireflyIII\Models\PiggyBankRepetition
 *
 * @property int            $id
 * @property Carbon|null    $created_at
 * @property Carbon|null    $updated_at
- * @property int     $piggy_bank_id
+ * @property int            $piggy_bank_id
 * @property Carbon|null    $startdate
 * @property Carbon|null    $targetdate
 * @property string         $currentamount
@@ -130,7 +131,7 @@ class PiggyBankRepetition extends Model
    protected function currentamount(): Attribute
    {
        return Attribute::make(
-            get: static fn ($value) => (string)$value,
+            get: static fn($value) => (string)$value,
        );
    }

--- a/app/Models/Preference.php
+++ b/app/Models/Preference.php
@@ -25,20 +25,21 @@ namespace FireflyIII\Models;

 use Carbon\Carbon;
 use Eloquent;
+use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 use FireflyIII\Support\Models\ReturnsIntegerUserIdTrait;
 use FireflyIII\User;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
+
 /**
 * FireflyIII\Models\Preference
 *
 * @property int                   $id
 * @property Carbon|null           $created_at
 * @property Carbon|null           $updated_at
- * @property int            $user_id
+ * @property int                   $user_id
 * @property string                $name
 * @property int|string|array|null $data
 * @property-read User             $user
@@ -94,7 +95,7 @@ class Preference extends Model
                $preference          = new self();
                $preference->name    = $value;
                $preference->data    = $default[$value];
-                $preference->user_id = (int) $user->id;
+                $preference->user_id = (int)$user->id;
                $preference->save();

                return $preference;
--- a/app/Models/Recurrence.php
+++ b/app/Models/Recurrence.php
@@ -25,6 +25,7 @@ namespace FireflyIII\Models;

 use Carbon\Carbon;
 use Eloquent;
+use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 use FireflyIII\Support\Models\ReturnsIntegerUserIdTrait;
 use FireflyIII\User;
 use Illuminate\Database\Eloquent\Casts\Attribute;
@@ -36,7 +37,7 @@ use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Query\Builder;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
+
 /**
 * FireflyIII\Models\Recurrence
 *
@@ -44,8 +45,8 @@ use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 * @property Carbon|null                             $created_at
 * @property Carbon|null                             $updated_at
 * @property Carbon|null                             $deleted_at
- * @property int                              $user_id
- * @property int                              $transaction_type_id
+ * @property int                                     $user_id
+ * @property int                                     $transaction_type_id
 * @property string                                  $title
 * @property string                                  $description
 * @property Carbon|null                             $first_date
@@ -87,7 +88,7 @@ use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 * @method static \Illuminate\Database\Eloquent\Builder|Recurrence whereUserId($value)
 * @method static Builder|Recurrence withTrashed()
 * @method static Builder|Recurrence withoutTrashed()
- * @property int                                $user_group_id
+ * @property int                                     $user_group_id
 * @method static \Illuminate\Database\Eloquent\Builder|Recurrence whereUserGroupId($value)
 * @mixin Eloquent
 */
--- a/app/Models/RecurrenceMeta.php
+++ b/app/Models/RecurrenceMeta.php
@@ -25,12 +25,13 @@ namespace FireflyIII\Models;

 use Carbon\Carbon;
 use Eloquent;
+use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Query\Builder;
-use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
+
 /**
 * FireflyIII\Models\RecurrenceMeta
 *
@@ -38,7 +39,7 @@ use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 * @property Carbon|null     $created_at
 * @property Carbon|null     $updated_at
 * @property Carbon|null     $deleted_at
- * @property int      $recurrence_id
+ * @property int             $recurrence_id
 * @property string          $name
 * @property mixed           $value
 * @property-read Recurrence $recurrence
--- a/app/Models/RecurrenceTransaction.php
+++ b/app/Models/RecurrenceTransaction.php
@@ -23,7 +23,9 @@ declare(strict_types=1);

 namespace FireflyIII\Models;

+use Carbon\Carbon;
 use Eloquent;
+use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
@@ -31,8 +33,7 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Query\Builder;
-use Carbon\Carbon;
-use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
+
 /**
 * FireflyIII\Models\RecurrenceTransaction
 *
@@ -40,11 +41,11 @@ use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 * @property Carbon|null                                 $created_at
 * @property Carbon|null                                 $updated_at
 * @property Carbon|null                                 $deleted_at
- * @property int                                  $recurrence_id
- * @property int                                  $transaction_currency_id
+ * @property int                                         $recurrence_id
+ * @property int                                         $transaction_currency_id
 * @property int|string|null                             $foreign_currency_id
- * @property int                                  $source_id
- * @property int                                  $destination_id
+ * @property int                                         $source_id
+ * @property int                                         $destination_id
 * @property string                                      $amount
 * @property string                                      $foreign_amount
 * @property string                                      $description
@@ -170,25 +171,14 @@ class RecurrenceTransaction extends Model
    protected function amount(): Attribute
    {
        return Attribute::make(
-            get: static fn ($value) => (string)$value,
+            get: static fn($value) => (string)$value,
        );
    }

    /**
     * @return Attribute
     */
-    protected function foreignAmount(): Attribute
-    {
-        return Attribute::make(
-            get: static fn ($value) => (string)$value,
-        );
-
-    }
-
-    /**
-     * @return Attribute
-     */
-    protected function recurrenceId(): Attribute
+    protected function destinationId(): Attribute
    {
        return Attribute::make(
            get: static fn($value) => (int)$value,
@@ -198,7 +188,18 @@ class RecurrenceTransaction extends Model
    /**
     * @return Attribute
     */
-    protected function transactionCurrencyId(): Attribute
+    protected function foreignAmount(): Attribute
+    {
+        return Attribute::make(
+            get: static fn($value) => (string)$value,
+        );
+
+    }
+
+    /**
+     * @return Attribute
+     */
+    protected function recurrenceId(): Attribute
    {
        return Attribute::make(
            get: static fn($value) => (int)$value,
@@ -218,7 +219,7 @@ class RecurrenceTransaction extends Model
    /**
     * @return Attribute
     */
-    protected function destinationId(): Attribute
+    protected function transactionCurrencyId(): Attribute
    {
        return Attribute::make(
            get: static fn($value) => (int)$value,
--- a/app/Models/RecurrenceTransactionMeta.php
+++ b/app/Models/RecurrenceTransactionMeta.php
@@ -25,12 +25,13 @@ namespace FireflyIII\Models;

 use Carbon\Carbon;
 use Eloquent;
+use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Query\Builder;
-use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
+
 /**
 * FireflyIII\Models\RecurrenceTransactionMeta
 *
--- a/app/Models/Role.php
+++ b/app/Models/Role.php
@@ -23,9 +23,9 @@ declare(strict_types=1);

 namespace FireflyIII\Models;

-use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 use Carbon\Carbon;
 use Eloquent;
+use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 use FireflyIII\User;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
--- a/app/Models/Rule.php
+++ b/app/Models/Rule.php
@@ -25,6 +25,7 @@ namespace FireflyIII\Models;

 use Carbon\Carbon;
 use Eloquent;
+use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 use FireflyIII\Support\Models\ReturnsIntegerUserIdTrait;
 use FireflyIII\User;
 use Illuminate\Database\Eloquent\Casts\Attribute;
@@ -35,7 +36,7 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Query\Builder;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
+
 /**
 * FireflyIII\Models\Rule
 *
@@ -43,11 +44,11 @@ use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 * @property Carbon|null                  $created_at
 * @property Carbon|null                  $updated_at
 * @property Carbon|null                  $deleted_at
- * @property int                   $user_id
- * @property int                   $rule_group_id
+ * @property int                          $user_id
+ * @property int                          $rule_group_id
 * @property string                       $title
 * @property string|null                  $description
- * @property int                   $order
+ * @property int                          $order
 * @property bool                         $active
 * @property bool                         $stop_processing
 * @property bool                         $strict
@@ -76,7 +77,7 @@ use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 * @method static \Illuminate\Database\Eloquent\Builder|Rule whereUserId($value)
 * @method static Builder|Rule withTrashed()
 * @method static Builder|Rule withoutTrashed()
- * @property int                     $user_group_id
+ * @property int                          $user_group_id
 * @method static \Illuminate\Database\Eloquent\Builder|Rule whereUserGroupId($value)
 * @property-read UserGroup|null          $userGroup
 * @mixin Eloquent
@@ -178,7 +179,7 @@ class Rule extends Model
    /**
     * @return Attribute
     */
-    protected function ruleGroupId(): Attribute
+    protected function order(): Attribute
    {
        return Attribute::make(
            get: static fn($value) => (int)$value,
@@ -188,7 +189,7 @@ class Rule extends Model
    /**
     * @return Attribute
     */
-    protected function order(): Attribute
+    protected function ruleGroupId(): Attribute
    {
        return Attribute::make(
            get: static fn($value) => (int)$value,
--- a/app/Models/RuleAction.php
+++ b/app/Models/RuleAction.php
@@ -25,21 +25,22 @@ namespace FireflyIII\Models;

 use Carbon\Carbon;
 use Eloquent;
+use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
+
 /**
 * FireflyIII\Models\RuleAction
 *
 * @property int         $id
 * @property Carbon|null $created_at
 * @property Carbon|null $updated_at
- * @property int  $rule_id
+ * @property int         $rule_id
 * @property string|null $action_type
 * @property string|null $action_value
- * @property int  $order
+ * @property int         $order
 * @property bool        $active
 * @property bool        $stop_processing
 * @property-read Rule   $rule
@@ -84,7 +85,7 @@ class RuleAction extends Model
    /**
     * @return Attribute
     */
-    protected function ruleId(): Attribute
+    protected function order(): Attribute
    {
        return Attribute::make(
            get: static fn($value) => (int)$value,
@@ -94,7 +95,7 @@ class RuleAction extends Model
    /**
     * @return Attribute
     */
-    protected function order(): Attribute
+    protected function ruleId(): Attribute
    {
        return Attribute::make(
            get: static fn($value) => (int)$value,
--- a/app/Models/RuleGroup.php
+++ b/app/Models/RuleGroup.php
@@ -25,6 +25,7 @@ namespace FireflyIII\Models;

 use Carbon\Carbon;
 use Eloquent;
+use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 use FireflyIII\Support\Models\ReturnsIntegerUserIdTrait;
 use FireflyIII\User;
 use Illuminate\Database\Eloquent\Casts\Attribute;
@@ -35,7 +36,7 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Query\Builder;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
+
 /**
 * FireflyIII\Models\RuleGroup
 *
@@ -43,10 +44,10 @@ use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 * @property Carbon|null       $created_at
 * @property Carbon|null       $updated_at
 * @property Carbon|null       $deleted_at
- * @property int        $user_id
+ * @property int               $user_id
 * @property string|null       $title
 * @property string|null       $description
- * @property int        $order
+ * @property int               $order
 * @property bool              $active
 * @property bool              $stop_processing
 * @property Collection|Rule[] $rules
@@ -68,7 +69,7 @@ use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 * @method static \Illuminate\Database\Eloquent\Builder|RuleGroup whereUserId($value)
 * @method static Builder|RuleGroup withTrashed()
 * @method static Builder|RuleGroup withoutTrashed()
- * @property int          $user_group_id
+ * @property int               $user_group_id
 * @method static \Illuminate\Database\Eloquent\Builder|RuleGroup whereUserGroupId($value)
 * @mixin Eloquent
 */
--- a/app/Models/RuleTrigger.php
+++ b/app/Models/RuleTrigger.php
@@ -25,21 +25,22 @@ namespace FireflyIII\Models;

 use Carbon\Carbon;
 use Eloquent;
+use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
+
 /**
 * FireflyIII\Models\RuleTrigger
 *
 * @property int         $id
 * @property Carbon|null $created_at
 * @property Carbon|null $updated_at
- * @property int  $rule_id
+ * @property int         $rule_id
 * @property string|null $trigger_type
 * @property string|null $trigger_value
- * @property int  $order
+ * @property int         $order
 * @property bool        $active
 * @property bool        $stop_processing
 * @property-read Rule   $rule
@@ -84,7 +85,7 @@ class RuleTrigger extends Model
    /**
     * @return Attribute
     */
-    protected function ruleId(): Attribute
+    protected function order(): Attribute
    {
        return Attribute::make(
            get: static fn($value) => (int)$value,
@@ -94,7 +95,7 @@ class RuleTrigger extends Model
    /**
     * @return Attribute
     */
-    protected function order(): Attribute
+    protected function ruleId(): Attribute
    {
        return Attribute::make(
            get: static fn($value) => (int)$value,
--- a/app/Models/Tag.php
+++ b/app/Models/Tag.php
@@ -25,6 +25,7 @@ namespace FireflyIII\Models;

 use Carbon\Carbon;
 use Eloquent;
+use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 use FireflyIII\Support\Models\ReturnsIntegerUserIdTrait;
 use FireflyIII\User;
 use Illuminate\Database\Eloquent\Collection;
@@ -35,7 +36,7 @@ use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Query\Builder;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
+
 /**
 * FireflyIII\Models\Tag
 *
@@ -43,7 +44,7 @@ use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 * @property Carbon|null                          $created_at
 * @property Carbon|null                          $updated_at
 * @property Carbon|null                          $deleted_at
- * @property int                           $user_id
+ * @property int                                  $user_id
 * @property string                               $tag
 * @property string                               $tagMode
 * @property Carbon|null                          $date
@@ -76,7 +77,7 @@ use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 * @method static \Illuminate\Database\Eloquent\Builder|Tag whereZoomLevel($value)
 * @method static Builder|Tag withTrashed()
 * @method static Builder|Tag withoutTrashed()
- * @property int                             $user_group_id
+ * @property int                                  $user_group_id
 * @method static \Illuminate\Database\Eloquent\Builder|Tag whereUserGroupId($value)
 * @mixin Eloquent
 */
--- a/app/Models/Transaction.php
+++ b/app/Models/Transaction.php
@@ -25,6 +25,7 @@ namespace FireflyIII\Models;

 use Carbon\Carbon;
 use Eloquent;
+use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Collection;
@@ -33,7 +34,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
-use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
+
 /**
 * FireflyIII\Models\Transaction
 *
@@ -42,12 +43,12 @@ use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 * @property Carbon|null                   $updated_at
 * @property Carbon|null                   $deleted_at
 * @property bool                          $reconciled
- * @property int                    $account_id
- * @property int                    $transaction_journal_id
+ * @property int                           $account_id
+ * @property int                           $transaction_journal_id
 * @property string|null                   $description
 * @property int|null                      $transaction_currency_id
- * @property string|int|null                   $modified
- * @property string|int|null                   $modified_foreign
+ * @property string|int|null               $modified
+ * @property string|int|null               $modified_foreign
 * @property string                        $date
 * @property string                        $max_date
 * @property string                        $amount
@@ -253,6 +254,16 @@ class Transaction extends Model
        return $this->belongsTo(TransactionJournal::class);
    }

+    /**
+     * @return Attribute
+     */
+    protected function accountId(): Attribute
+    {
+        return Attribute::make(
+            get: static fn($value) => (int)$value,
+        );
+    }
+
    /**
     * Get the amount
     *
@@ -261,7 +272,7 @@ class Transaction extends Model
    protected function amount(): Attribute
    {
        return Attribute::make(
-            get: static fn ($value) => (string)$value,
+            get: static fn($value) => (string)$value,
        );
    }

@@ -273,19 +284,10 @@ class Transaction extends Model
    protected function foreignAmount(): Attribute
    {
        return Attribute::make(
-            get: static fn ($value) => (string)$value,
+            get: static fn($value) => (string)$value,
        );
    }

-    /**
-     * @return Attribute
-     */
-    protected function accountId(): Attribute
-    {
-        return Attribute::make(
-            get: static fn($value) => (int)$value,
-        );
-    }
    /**
     * @return Attribute
     */
--- a/app/Models/TransactionCurrency.php
+++ b/app/Models/TransactionCurrency.php
@@ -84,7 +84,7 @@ class TransactionCurrency extends Model

    public ?bool $userDefault;
    public ?bool $userEnabled;
-    protected $casts
+    protected    $casts
        = [
            'created_at'     => 'datetime',
            'updated_at'     => 'datetime',
--- a/app/Models/TransactionGroup.php
+++ b/app/Models/TransactionGroup.php
@@ -25,6 +25,7 @@ namespace FireflyIII\Models;

 use Carbon\Carbon;
 use Eloquent;
+use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 use FireflyIII\Support\Models\ReturnsIntegerUserIdTrait;
 use FireflyIII\User;
 use Illuminate\Database\Eloquent\Collection;
@@ -34,7 +35,7 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Query\Builder;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
+
 /**
 * FireflyIII\Models\TransactionGroup
 *
@@ -42,7 +43,7 @@ use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 * @property Carbon|null                          $created_at
 * @property Carbon|null                          $updated_at
 * @property Carbon|null                          $deleted_at
- * @property int                           $user_id
+ * @property int                                  $user_id
 * @property string|null                          $title
 * @property-read Collection|TransactionJournal[] $transactionJournals
 * @property-read int|null                        $transaction_journals_count
@@ -59,7 +60,7 @@ use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 * @method static \Illuminate\Database\Eloquent\Builder|TransactionGroup whereUserId($value)
 * @method static Builder|TransactionGroup withTrashed()
 * @method static Builder|TransactionGroup withoutTrashed()
- * @property int                             $user_group_id
+ * @property int                                  $user_group_id
 * @method static \Illuminate\Database\Eloquent\Builder|TransactionGroup whereUserGroupId($value)
 * @property-read UserGroup|null                  $userGroup
 * @mixin Eloquent
--- a/app/Models/TransactionJournal.php
+++ b/app/Models/TransactionJournal.php
@@ -25,6 +25,7 @@ namespace FireflyIII\Models;

 use Carbon\Carbon;
 use Eloquent;
+use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 use FireflyIII\Support\Models\ReturnsIntegerUserIdTrait;
 use FireflyIII\User;
 use Illuminate\Database\Eloquent\Builder;
@@ -39,7 +40,7 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
+
 /**
 * FireflyIII\Models\TransactionJournal
 *
@@ -47,8 +48,8 @@ use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 * @property Carbon|null                              $created_at
 * @property Carbon|null                              $updated_at
 * @property Carbon|null                              $deleted_at
- * @property int                               $user_id
- * @property int                              $transaction_type_id
+ * @property int                                      $user_id
+ * @property int                                      $transaction_type_id
 * @property int|string|null                          $transaction_group_id
 * @property int|string|null                          $bill_id
 * @property int|string|null                          $transaction_currency_id
@@ -117,7 +118,7 @@ use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 * @property-read Collection|Location[]               $locations
 * @property-read int|null                            $locations_count
 * @property int|string                               $the_count
- * @property int                                 $user_group_id
+ * @property int                                      $user_group_id
 * @method static EloquentBuilder|TransactionJournal whereUserGroupId($value)
 * @property-read Collection<int, AuditLogEntry>      $auditLogEntries
 * @property-read int|null                            $audit_log_entries_count
@@ -395,15 +396,6 @@ class TransactionJournal extends Model
        return $this->hasMany(Transaction::class);
    }

-    /**
-     * @return Attribute
-     */
-    protected function transactionTypeId(): Attribute
-    {
-        return Attribute::make(
-            get: static fn($value) => (int)$value,
-        );
-    }
    /**
     * @return Attribute
     */
@@ -413,4 +405,14 @@ class TransactionJournal extends Model
            get: static fn($value) => (int)$value,
        );
    }
+
+    /**
+     * @return Attribute
+     */
+    protected function transactionTypeId(): Attribute
+    {
+        return Attribute::make(
+            get: static fn($value) => (int)$value,
+        );
+    }
 }
--- a/app/Models/TransactionJournalLink.php
+++ b/app/Models/TransactionJournalLink.php
@@ -25,6 +25,7 @@ namespace FireflyIII\Models;

 use Carbon\Carbon;
 use Eloquent;
+use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Collection;
@@ -32,14 +33,14 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
+
 /**
 * FireflyIII\Models\TransactionJournalLink
 *
 * @property int                     $id
 * @property Carbon|null             $created_at
 * @property Carbon|null             $updated_at
- * @property int              $link_type_id
+ * @property int                     $link_type_id
 * @property int                     $source_id
 * @property int                     $destination_id
 * @property string|null             $comment
@@ -131,6 +132,17 @@ class TransactionJournalLink extends Model
    {
        return $this->belongsTo(TransactionJournal::class, 'source_id');
    }
+
+    /**
+     * @return Attribute
+     */
+    protected function destinationId(): Attribute
+    {
+        return Attribute::make(
+            get: static fn($value) => (int)$value,
+        );
+    }
+
    /**
     * @return Attribute
     */
@@ -150,13 +162,4 @@ class TransactionJournalLink extends Model
            get: static fn($value) => (int)$value,
        );
    }
-    /**
-     * @return Attribute
-     */
-    protected function destinationId(): Attribute
-    {
-        return Attribute::make(
-            get: static fn($value) => (int)$value,
-        );
-    }
 }
--- a/app/Models/TransactionJournalMeta.php
+++ b/app/Models/TransactionJournalMeta.php
@@ -25,19 +25,20 @@ namespace FireflyIII\Models;

 use Carbon\Carbon;
 use Eloquent;
+use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Query\Builder;
-use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
+
 /**
 * FireflyIII\Models\TransactionJournalMeta
 *
 * @property int                     $id
 * @property Carbon|null             $created_at
 * @property Carbon|null             $updated_at
- * @property int              $transaction_journal_id
+ * @property int                     $transaction_journal_id
 * @property string                  $name
 * @property mixed                   $data
 * @property string                  $hash
@@ -95,7 +96,7 @@ class TransactionJournalMeta extends Model
    {
        $data                     = json_encode($value);
        $this->attributes['data'] = $data;
-        $this->attributes['hash'] = hash('sha256', (string)  $data);
+        $this->attributes['hash'] = hash('sha256', (string)$data);
    }

    /**
@@ -105,6 +106,7 @@ class TransactionJournalMeta extends Model
    {
        return $this->belongsTo(TransactionJournal::class);
    }
+
    /**
     * @return Attribute
     */
--- a/app/Models/TransactionType.php
+++ b/app/Models/TransactionType.php
@@ -25,13 +25,14 @@ namespace FireflyIII\Models;

 use Carbon\Carbon;
 use Eloquent;
+use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Query\Builder;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
+
 /**
 * FireflyIII\Models\TransactionType
 *
--- a/app/Models/UserGroup.php
+++ b/app/Models/UserGroup.php
@@ -27,6 +27,7 @@ namespace FireflyIII\Models;
 use Carbon\Carbon;
 use Eloquent;
 use FireflyIII\Enums\UserRoleEnum;
+use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 use FireflyIII\User;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
@@ -35,7 +36,7 @@ use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\HasManyThrough;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
+
 /**
 * Class UserGroup
 *
--- a/app/Models/UserRole.php
+++ b/app/Models/UserRole.php
@@ -26,11 +26,12 @@ namespace FireflyIII\Models;

 use Carbon\Carbon;
 use Eloquent;
+use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
-use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
+
 /**
 * Class UserRole
 *
--- a/app/Models/Webhook.php
+++ b/app/Models/Webhook.php
@@ -28,6 +28,7 @@ use Eloquent;
 use FireflyIII\Enums\WebhookDelivery;
 use FireflyIII\Enums\WebhookResponse;
 use FireflyIII\Enums\WebhookTrigger;
+use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 use FireflyIII\Support\Models\ReturnsIntegerUserIdTrait;
 use FireflyIII\User;
 use Illuminate\Database\Eloquent\Builder;
@@ -37,7 +38,7 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
+
 /**
 * FireflyIII\Models\Webhook
 *
@@ -45,7 +46,7 @@ use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 * @property Carbon|null                      $created_at
 * @property Carbon|null                      $updated_at
 * @property Carbon|null                      $deleted_at
- * @property int                       $user_id
+ * @property int                              $user_id
 * @property bool                             $active
 * @property int                              $trigger
 * @property int                              $response
@@ -74,7 +75,7 @@ use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 * @property string                           $secret
 * @method static Builder|Webhook whereSecret($value)
 * @method static Builder|Webhook whereTitle($value)
- * @property int                         $user_group_id
+ * @property int                              $user_group_id
 * @method static Builder|Webhook whereUserGroupId($value)
 * @mixin Eloquent
 */
--- a/app/Models/WebhookAttempt.php
+++ b/app/Models/WebhookAttempt.php
@@ -25,6 +25,7 @@ namespace FireflyIII\Models;

 use Carbon\Carbon;
 use Eloquent;
+use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 use FireflyIII\User;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Model;
@@ -32,7 +33,7 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Query\Builder;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
+
 /**
 * Class WebhookAttempt
 *
@@ -40,7 +41,7 @@ use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 * @property Carbon|null         $created_at
 * @property Carbon|null         $updated_at
 * @property string|null         $deleted_at
- * @property int          $webhook_message_id
+ * @property int                 $webhook_message_id
 * @property int|string          $status_code
 * @property string|null         $logs
 * @property string|null         $response
--- a/app/Models/WebhookMessage.php
+++ b/app/Models/WebhookMessage.php
@@ -23,7 +23,9 @@ declare(strict_types=1);

 namespace FireflyIII\Models;

+use Carbon\Carbon;
 use Eloquent;
+use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 use FireflyIII\User;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Casts\Attribute;
@@ -31,9 +33,8 @@ use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
-use Carbon\Carbon;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
+
 /**
 * FireflyIII\Models\WebhookMessage
 *
@@ -41,7 +42,7 @@ use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 * @property Carbon|null                      $created_at
 * @property Carbon|null                      $updated_at
 * @property string|null                      $deleted_at
- * @property int                       $webhook_id
+ * @property int                              $webhook_id
 * @property bool                             $sent
 * @property bool                             $errored
 * @property int                              $attempts
@@ -127,7 +128,7 @@ class WebhookMessage extends Model
    protected function sent(): Attribute
    {
        return Attribute::make(
-            get: static fn ($value) => (bool)$value,
+            get: static fn($value) => (bool)$value,
        );
    }