From b6e8b66035d77f3f9d44e6084968efb8f807eabb Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 15 Feb 2025 05:38:40 +0100 Subject: [PATCH] Make sure user_group_id is rendered as int where relevant. --- app/Models/Account.php | 1 + app/Models/Attachment.php | 4 +++- app/Models/AvailableBudget.php | 2 ++ app/Models/Budget.php | 4 +++- app/Models/Category.php | 2 ++ app/Models/CurrencyExchangeRate.php | 7 ++++--- app/Models/GroupMembership.php | 7 +++++++ app/Models/InvitedUser.php | 4 +++- app/Models/ObjectGroup.php | 3 ++- app/Models/Preference.php | 2 ++ app/Models/Recurrence.php | 4 +++- app/Models/Rule.php | 4 +++- app/Models/RuleGroup.php | 2 ++ app/Models/Tag.php | 2 ++ app/Models/TransactionGroup.php | 2 ++ app/Models/TransactionJournal.php | 2 ++ app/Models/Webhook.php | 2 ++ 17 files changed, 45 insertions(+), 9 deletions(-) diff --git a/app/Models/Account.php b/app/Models/Account.php index c241eb9c4b..657ac61c8a 100644 --- a/app/Models/Account.php +++ b/app/Models/Account.php @@ -51,6 +51,7 @@ class Account extends Model 'created_at' => 'datetime', 'updated_at' => 'datetime', 'user_id' => 'integer', + 'user_group_id' => 'integer', 'deleted_at' => 'datetime', 'active' => 'boolean', 'encrypted' => 'boolean', diff --git a/app/Models/Attachment.php b/app/Models/Attachment.php index ab3ec23b98..602b0885aa 100644 --- a/app/Models/Attachment.php +++ b/app/Models/Attachment.php @@ -46,9 +46,11 @@ class Attachment extends Model 'updated_at' => 'datetime', 'deleted_at' => 'datetime', 'uploaded' => 'boolean', + 'user_id' => 'integer', + 'user_group_id' => 'integer', ]; - protected $fillable = ['attachable_id', 'attachable_type', 'user_id', 'md5', 'filename', 'mime', 'title', 'description', 'size', 'uploaded']; + protected $fillable = ['attachable_id', 'attachable_type', 'user_id','user_group_id', 'md5', 'filename', 'mime', 'title', 'description', 'size', 'uploaded']; /** * Route binder. Converts the key in the URL to the specified object (or throw 404). diff --git a/app/Models/AvailableBudget.php b/app/Models/AvailableBudget.php index f665705f69..da7bb1c7ea 100644 --- a/app/Models/AvailableBudget.php +++ b/app/Models/AvailableBudget.php @@ -49,6 +49,8 @@ class AvailableBudget extends Model 'transaction_currency_id' => 'int', 'amount' => 'string', 'native_amount' => 'string', + 'user_id' => 'integer', + 'user_group_id' => 'integer', ]; protected $fillable = ['user_id', 'user_group_id', 'transaction_currency_id', 'amount', 'start_date', 'end_date', 'start_date_tz', 'end_date_tz', 'native_amount']; diff --git a/app/Models/Budget.php b/app/Models/Budget.php index 33a43f423d..f715d57f1a 100644 --- a/app/Models/Budget.php +++ b/app/Models/Budget.php @@ -48,9 +48,11 @@ class Budget extends Model 'deleted_at' => 'datetime', 'active' => 'boolean', 'encrypted' => 'boolean', + 'user_id' => 'integer', + 'user_group_id' => 'integer', ]; - protected $fillable = ['user_id', 'name', 'active', 'order', 'user_group_id']; + protected $fillable = ['user_id','user_group_id', 'name', 'active', 'order', 'user_group_id']; protected $hidden = ['encrypted']; diff --git a/app/Models/Category.php b/app/Models/Category.php index aa52efbd3b..eb58b9894e 100644 --- a/app/Models/Category.php +++ b/app/Models/Category.php @@ -46,6 +46,8 @@ class Category extends Model 'updated_at' => 'datetime', 'deleted_at' => 'datetime', 'encrypted' => 'boolean', + 'user_id' => 'integer', + 'user_group_id' => 'integer', ]; protected $fillable = ['user_id', 'user_group_id', 'name']; diff --git a/app/Models/CurrencyExchangeRate.php b/app/Models/CurrencyExchangeRate.php index 722407d2a9..469e606e98 100644 --- a/app/Models/CurrencyExchangeRate.php +++ b/app/Models/CurrencyExchangeRate.php @@ -42,9 +42,10 @@ class CurrencyExchangeRate extends Model = [ 'created_at' => 'datetime', 'updated_at' => 'datetime', - 'user_id' => 'int', - 'from_currency_id' => 'int', - 'to_currency_id' => 'int', + 'user_id' => 'integer', + 'user_group_id' => 'integer', + 'from_currency_id' => 'integer', + 'to_currency_id' => 'integer', 'date' => SeparateTimezoneCaster::class, 'rate' => 'string', 'user_rate' => 'string', diff --git a/app/Models/GroupMembership.php b/app/Models/GroupMembership.php index 965cdc2608..734803fe93 100644 --- a/app/Models/GroupMembership.php +++ b/app/Models/GroupMembership.php @@ -36,6 +36,13 @@ class GroupMembership extends Model use ReturnsIntegerIdTrait; use ReturnsIntegerUserIdTrait; + protected $casts = [ + 'created_at' => 'datetime', + 'updated_at' => 'datetime', + 'user_id' => 'integer', + 'user_group_id' => 'integer', + ]; + protected $fillable = ['user_id', 'user_group_id', 'user_role_id']; public function user(): BelongsTo diff --git a/app/Models/InvitedUser.php b/app/Models/InvitedUser.php index 093f56f32f..d4398b6bab 100644 --- a/app/Models/InvitedUser.php +++ b/app/Models/InvitedUser.php @@ -41,8 +41,10 @@ class InvitedUser extends Model = [ 'expires' => SeparateTimezoneCaster::class, 'redeemed' => 'boolean', + 'user_id' => 'integer', + 'user_group_id' => 'integer', ]; - protected $fillable = ['user_id', 'email', 'invite_code', 'expires', 'expires_tz', 'redeemed']; + protected $fillable = ['user_group_id','user_id', 'email', 'invite_code', 'expires', 'expires_tz', 'redeemed']; /** * Route binder. Converts the key in the URL to the specified object (or throw 404). diff --git a/app/Models/ObjectGroup.php b/app/Models/ObjectGroup.php index 6133acd0d0..0b41e81c10 100644 --- a/app/Models/ObjectGroup.php +++ b/app/Models/ObjectGroup.php @@ -42,7 +42,8 @@ class ObjectGroup extends Model = [ 'created_at' => 'datetime', 'updated_at' => 'datetime', - 'user_id' => 'integer', + 'user_id' => 'integer', + 'user_group_id' => 'integer', 'deleted_at' => 'datetime', ]; protected $fillable = ['title', 'order', 'user_id', 'user_group_id']; diff --git a/app/Models/Preference.php b/app/Models/Preference.php index eef5ff17ec..a6b5c722f3 100644 --- a/app/Models/Preference.php +++ b/app/Models/Preference.php @@ -40,6 +40,8 @@ class Preference extends Model 'created_at' => 'datetime', 'updated_at' => 'datetime', 'data' => 'array', + 'user_id' => 'integer', + 'user_group_id' => 'integer', ]; protected $fillable = ['user_id', 'data', 'name', 'user_group_id']; diff --git a/app/Models/Recurrence.php b/app/Models/Recurrence.php index 41106fb9ff..6093c5d703 100644 --- a/app/Models/Recurrence.php +++ b/app/Models/Recurrence.php @@ -56,10 +56,12 @@ class Recurrence extends Model 'repetitions' => 'int', 'active' => 'bool', 'apply_rules' => 'bool', + 'user_id' => 'integer', + 'user_group_id' => 'integer', ]; protected $fillable - = ['user_id', 'transaction_type_id', 'title', 'description', 'first_date', 'first_date_tz', 'repeat_until', 'repeat_until_tz', 'latest_date', 'latest_date_tz', 'repetitions', 'apply_rules', 'active']; + = ['user_id', 'user_group_id', 'transaction_type_id', 'title', 'description', 'first_date', 'first_date_tz', 'repeat_until', 'repeat_until_tz', 'latest_date', 'latest_date_tz', 'repetitions', 'apply_rules', 'active']; protected $table = 'recurrences'; diff --git a/app/Models/Rule.php b/app/Models/Rule.php index 37f0fa4e25..5a27b8da44 100644 --- a/app/Models/Rule.php +++ b/app/Models/Rule.php @@ -49,9 +49,11 @@ class Rule extends Model 'stop_processing' => 'boolean', 'id' => 'int', 'strict' => 'boolean', + 'user_id' => 'integer', + 'user_group_id' => 'integer', ]; - protected $fillable = ['rule_group_id', 'order', 'active', 'title', 'description', 'user_id', 'strict']; + protected $fillable = ['rule_group_id', 'order', 'active', 'title', 'description', 'user_id','user_group_id', 'strict']; /** * Route binder. Converts the key in the URL to the specified object (or throw 404). diff --git a/app/Models/RuleGroup.php b/app/Models/RuleGroup.php index 9b909aaa7e..5554da39e9 100644 --- a/app/Models/RuleGroup.php +++ b/app/Models/RuleGroup.php @@ -47,6 +47,8 @@ class RuleGroup extends Model 'active' => 'boolean', 'stop_processing' => 'boolean', 'order' => 'int', + 'user_id' => 'integer', + 'user_group_id' => 'integer', ]; protected $fillable = ['user_id', 'user_group_id', 'stop_processing', 'order', 'title', 'description', 'active']; diff --git a/app/Models/Tag.php b/app/Models/Tag.php index a17ca72b61..ea1cca6ad0 100644 --- a/app/Models/Tag.php +++ b/app/Models/Tag.php @@ -49,6 +49,8 @@ class Tag extends Model 'zoomLevel' => 'int', 'latitude' => 'float', 'longitude' => 'float', + 'user_id' => 'integer', + 'user_group_id' => 'integer', ]; protected $fillable = ['user_id', 'user_group_id', 'tag', 'date', 'date_tz', 'description', 'tagMode']; diff --git a/app/Models/TransactionGroup.php b/app/Models/TransactionGroup.php index e42fb3763f..7d8761c545 100644 --- a/app/Models/TransactionGroup.php +++ b/app/Models/TransactionGroup.php @@ -46,6 +46,8 @@ class TransactionGroup extends Model 'deleted_at' => 'datetime', 'title' => 'string', 'date' => 'datetime', + 'user_id' => 'integer', + 'user_group_id' => 'integer', ]; protected $fillable = ['user_id', 'user_group_id', 'title']; diff --git a/app/Models/TransactionJournal.php b/app/Models/TransactionJournal.php index e99c259955..139b20b21b 100644 --- a/app/Models/TransactionJournal.php +++ b/app/Models/TransactionJournal.php @@ -65,6 +65,8 @@ class TransactionJournal extends Model 'tag_count' => 'int', 'encrypted' => 'boolean', 'completed' => 'boolean', + 'user_id' => 'integer', + 'user_group_id' => 'integer', ]; protected $fillable diff --git a/app/Models/Webhook.php b/app/Models/Webhook.php index 69e1eb1da4..0866286239 100644 --- a/app/Models/Webhook.php +++ b/app/Models/Webhook.php @@ -48,6 +48,8 @@ class Webhook extends Model 'trigger' => 'integer', 'response' => 'integer', 'delivery' => 'integer', + 'user_id' => 'integer', + 'user_group_id' => 'integer', ]; protected $fillable = ['active', 'trigger', 'response', 'delivery', 'user_id', 'user_group_id', 'url', 'title', 'secret'];