From ac801c8b86d977ef44490e64b7f194b5663db433 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 3 Nov 2017 16:04:17 +0100 Subject: [PATCH] Update models. --- app/Models/Account.php | 8 +++----- app/Models/AccountMeta.php | 5 ++--- app/Models/AccountType.php | 9 ++------- app/Models/Attachment.php | 8 +++----- app/Models/AvailableBudget.php | 8 +++----- app/Models/Bill.php | 8 +++----- app/Models/Budget.php | 11 ++++++----- app/Models/BudgetLimit.php | 6 +++--- app/Models/Category.php | 8 +++----- app/Models/Configuration.php | 6 ++---- app/Models/CurrencyExchangeRate.php | 3 ++- app/Models/ExportJob.php | 6 ++---- app/Models/ImportJob.php | 6 ++---- app/Models/LimitRepetition.php | 8 +++++--- app/Models/LinkType.php | 6 +++--- app/Models/Note.php | 8 ++++---- app/Models/PiggyBank.php | 11 +++++++---- app/Models/PiggyBankEvent.php | 9 +++++---- app/Models/PiggyBankRepetition.php | 10 ++++++---- app/Models/Preference.php | 7 ++++--- app/Models/Role.php | 6 +++--- app/Models/Rule.php | 8 +++----- app/Models/RuleAction.php | 6 ++---- app/Models/RuleGroup.php | 9 +++------ app/Models/RuleTrigger.php | 6 ++---- app/Models/Tag.php | 15 +++++++++------ app/Models/Transaction.php | 7 +++---- app/Models/TransactionCurrency.php | 10 ++++++---- app/Models/TransactionJournal.php | 8 ++++---- app/Models/TransactionJournalMeta.php | 13 +++++++------ app/Models/TransactionType.php | 8 +++----- 31 files changed, 115 insertions(+), 132 deletions(-) diff --git a/app/Models/Account.php b/app/Models/Account.php index 3848ac32f2..a4bd0ddb8a 100644 --- a/app/Models/Account.php +++ b/app/Models/Account.php @@ -53,15 +53,13 @@ class Account extends Model */ protected $casts = [ - 'created_at' => 'date', - 'updated_at' => 'date', - 'deleted_at' => 'date', + 'created_at' => 'datetime', + 'updated_at' => 'datetime', + 'deleted_at' => 'datetime', 'active' => 'boolean', 'encrypted' => 'boolean', ]; /** @var array */ - protected $dates = ['created_at', 'updated_at', 'deleted_at']; - /** @var array */ protected $fillable = ['user_id', 'account_type_id', 'name', 'active', 'virtual_balance', 'iban']; /** @var array */ protected $hidden = ['encrypted']; diff --git a/app/Models/AccountMeta.php b/app/Models/AccountMeta.php index a4b454ab20..02dfedbe3d 100644 --- a/app/Models/AccountMeta.php +++ b/app/Models/AccountMeta.php @@ -41,11 +41,10 @@ class AccountMeta extends Model */ protected $casts = [ - 'created_at' => 'date', - 'updated_at' => 'date', + 'created_at' => 'datetime', + 'updated_at' => 'datetime', ]; /** @var array */ - protected $dates = ['created_at', 'updated_at']; protected $fillable = ['account_id', 'name', 'data']; protected $table = 'account_meta'; diff --git a/app/Models/AccountType.php b/app/Models/AccountType.php index 5ec636bfbd..6e2a93de3c 100644 --- a/app/Models/AccountType.php +++ b/app/Models/AccountType.php @@ -50,15 +50,10 @@ class AccountType extends Model */ protected $casts = [ - 'created_at' => 'date', - 'updated_at' => 'date', + 'created_at' => 'datetime', + 'updated_at' => 'datetime', ]; - /** @var array */ - protected $dates = ['created_at', 'updated_at']; - - // - /** * @return HasMany */ diff --git a/app/Models/Attachment.php b/app/Models/Attachment.php index a26d618644..e11a7cb3df 100644 --- a/app/Models/Attachment.php +++ b/app/Models/Attachment.php @@ -46,14 +46,12 @@ class Attachment extends Model */ protected $casts = [ - 'created_at' => 'date', - 'updated_at' => 'date', - 'deleted_at' => 'date', + 'created_at' => 'datetime', + 'updated_at' => 'datetime', + 'deleted_at' => 'datetime', 'uploaded' => 'boolean', ]; /** @var array */ - protected $dates = ['created_at', 'updated_at', 'deleted_at']; - /** @var array */ protected $fillable = ['attachable_id', 'attachable_type', 'user_id', 'md5', 'filename', 'mime', 'title', 'notes', 'description', 'size', 'uploaded']; /** diff --git a/app/Models/AvailableBudget.php b/app/Models/AvailableBudget.php index 7a37df2f07..b8c26bae47 100644 --- a/app/Models/AvailableBudget.php +++ b/app/Models/AvailableBudget.php @@ -43,15 +43,13 @@ class AvailableBudget extends Model */ protected $casts = [ - 'created_at' => 'date', - 'updated_at' => 'date', - 'deleted_at' => 'date', + 'created_at' => 'datetime', + 'updated_at' => 'datetime', + 'deleted_at' => 'datetime', 'start_date' => 'date', 'end_date' => 'date', ]; /** @var array */ - protected $dates = ['created_at', 'updated_at', 'deleted_at']; - /** @var array */ protected $fillable = ['user_id', 'transaction_currency_id', 'amount', 'start_date', 'end_date']; /** diff --git a/app/Models/Bill.php b/app/Models/Bill.php index 6c52a3a86b..f681a0915c 100644 --- a/app/Models/Bill.php +++ b/app/Models/Bill.php @@ -47,9 +47,9 @@ class Bill extends Model */ protected $casts = [ - 'created_at' => 'date', - 'updated_at' => 'date', - 'deleted_at' => 'date', + 'created_at' => 'datetime', + 'updated_at' => 'datetime', + 'deleted_at' => 'datetime', 'date' => 'date', 'skip' => 'int', 'automatch' => 'boolean', @@ -57,8 +57,6 @@ class Bill extends Model 'name_encrypted' => 'boolean', 'match_encrypted' => 'boolean', ]; - /** @var array */ - protected $dates = ['created_at', 'updated_at', 'deleted_at']; protected $fillable = ['name', 'match', 'amount_min', 'match_encrypted', 'name_encrypted', 'user_id', 'amount_max', 'date', 'repeat_freq', 'skip', 'automatch', 'active',]; diff --git a/app/Models/Budget.php b/app/Models/Budget.php index 1044d66125..b0680f3b85 100644 --- a/app/Models/Budget.php +++ b/app/Models/Budget.php @@ -47,16 +47,17 @@ class Budget extends Model */ protected $casts = [ - 'created_at' => 'date', - 'updated_at' => 'date', - 'deleted_at' => 'date', + 'created_at' => 'datetime', + 'updated_at' => 'datetime', + 'deleted_at' => 'datetime', 'active' => 'boolean', 'encrypted' => 'boolean', ]; - /** @var array */ - protected $dates = ['created_at', 'updated_at', 'deleted_at']; + /** @var array */ protected $fillable = ['user_id', 'name', 'active']; + /** @var array */ protected $hidden = ['encrypted']; + /** @var array */ protected $rules = ['name' => 'required|between:1,200',]; /** diff --git a/app/Models/BudgetLimit.php b/app/Models/BudgetLimit.php index fa0384857f..71eb68378e 100644 --- a/app/Models/BudgetLimit.php +++ b/app/Models/BudgetLimit.php @@ -41,14 +41,14 @@ class BudgetLimit extends Model */ protected $casts = [ - 'created_at' => 'date', - 'updated_at' => 'date', + 'created_at' => 'datetime', + 'updated_at' => 'datetime', 'start_date' => 'date', 'end_date' => 'date', 'repeats' => 'boolean', ]; /** @var array */ - protected $dates = ['created_at', 'updated_at', 'start_date', 'end_date']; + protected $dates = ['start_date', 'end_date']; /** * @param $value diff --git a/app/Models/Category.php b/app/Models/Category.php index cd44b771e6..a52fc76532 100644 --- a/app/Models/Category.php +++ b/app/Models/Category.php @@ -46,14 +46,12 @@ class Category extends Model */ protected $casts = [ - 'created_at' => 'date', - 'updated_at' => 'date', - 'deleted_at' => 'date', + 'created_at' => 'datetime', + 'updated_at' => 'datetime', + 'deleted_at' => 'datetime', 'encrypted' => 'boolean', ]; /** @var array */ - protected $dates = ['created_at', 'updated_at', 'deleted_at']; - /** @var array */ protected $fillable = ['user_id', 'name']; /** @var array */ protected $hidden = ['encrypted']; diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php index c9f9edbf77..f00654ec0f 100644 --- a/app/Models/Configuration.php +++ b/app/Models/Configuration.php @@ -42,11 +42,9 @@ class Configuration extends Model */ protected $casts = [ - 'created_at' => 'date', - 'updated_at' => 'date', + 'created_at' => 'datetime', + 'updated_at' => 'datetime', ]; - /** @var array */ - protected $dates = ['created_at', 'updated_at', 'deleted_at']; protected $table = 'configuration'; /** diff --git a/app/Models/CurrencyExchangeRate.php b/app/Models/CurrencyExchangeRate.php index c953a8cca1..37a94593e0 100644 --- a/app/Models/CurrencyExchangeRate.php +++ b/app/Models/CurrencyExchangeRate.php @@ -36,7 +36,8 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo; class CurrencyExchangeRate extends Model { - protected $dates = ['created_at', 'updated_at', 'date']; + /** @var array */ + protected $dates = ['date']; /** * @return BelongsTo diff --git a/app/Models/ExportJob.php b/app/Models/ExportJob.php index dc14d88805..2d223402f0 100644 --- a/app/Models/ExportJob.php +++ b/app/Models/ExportJob.php @@ -39,11 +39,9 @@ class ExportJob extends Model /** @var array */ protected $casts = [ - 'created_at' => 'date', - 'updated_at' => 'date', + 'created_at' => 'datetime', + 'updated_at' => 'datetime', ]; - /** @var array */ - protected $dates = ['created_at', 'updated_at']; /** * @param $value diff --git a/app/Models/ImportJob.php b/app/Models/ImportJob.php index 6e866aefda..c8c5c7079a 100644 --- a/app/Models/ImportJob.php +++ b/app/Models/ImportJob.php @@ -44,11 +44,9 @@ class ImportJob extends Model */ protected $casts = [ - 'created_at' => 'date', - 'updated_at' => 'date', + 'created_at' => 'datetime', + 'updated_at' => 'datetime', ]; - /** @var array */ - protected $dates = ['created_at', 'updated_at']; protected $validStatus = [ diff --git a/app/Models/LimitRepetition.php b/app/Models/LimitRepetition.php index dfaaebd903..f2c541cedb 100644 --- a/app/Models/LimitRepetition.php +++ b/app/Models/LimitRepetition.php @@ -43,12 +43,14 @@ class LimitRepetition extends Model */ protected $casts = [ - 'created_at' => 'date', - 'updated_at' => 'date', + 'created_at' => 'datetime', + 'updated_at' => 'datetime', 'startdate' => 'date', 'enddate' => 'date', ]; - protected $dates = ['created_at', 'updated_at', 'startdate', 'enddate']; + /** @var array */ + protected $dates = ['startdate', 'enddate']; + /** @var array */ protected $hidden = ['amount_encrypted']; /** diff --git a/app/Models/LinkType.php b/app/Models/LinkType.php index be70f06f4c..7fe9faef47 100644 --- a/app/Models/LinkType.php +++ b/app/Models/LinkType.php @@ -42,9 +42,9 @@ class LinkType extends Model */ protected $casts = [ - 'created_at' => 'date', - 'updated_at' => 'date', - 'deleted_at' => 'date', + 'created_at' => 'datetime', + 'updated_at' => 'datetime', + 'deleted_at' => 'datetime', 'editable' => 'boolean', ]; diff --git a/app/Models/Note.php b/app/Models/Note.php index aa1665c671..f1c2202fa9 100644 --- a/app/Models/Note.php +++ b/app/Models/Note.php @@ -40,11 +40,11 @@ class Note extends Model */ protected $casts = [ - 'created_at' => 'date', - 'updated_at' => 'date', - 'deleted_at' => 'date', + 'created_at' => 'datetime', + 'updated_at' => 'datetime', + 'deleted_at' => 'datetime', ]; - protected $dates = ['created_at', 'updated_at', 'deleted_at']; + /** @var array */ protected $fillable = ['title', 'text']; /** diff --git a/app/Models/PiggyBank.php b/app/Models/PiggyBank.php index 9a81a08118..3325f2c282 100644 --- a/app/Models/PiggyBank.php +++ b/app/Models/PiggyBank.php @@ -47,17 +47,20 @@ class PiggyBank extends Model */ protected $casts = [ - 'created_at' => 'date', - 'updated_at' => 'date', - 'deleted_at' => 'date', + 'created_at' => 'datetime', + 'updated_at' => 'datetime', + 'deleted_at' => 'datetime', 'startdate' => 'date', 'targetdate' => 'date', 'order' => 'int', 'active' => 'boolean', 'encrypted' => 'boolean', ]; - protected $dates = ['created_at', 'updated_at', 'deleted_at', 'startdate', 'targetdate']; + /** @var array */ + protected $dates = ['startdate', 'targetdate']; + /** @var array */ protected $fillable = ['name', 'account_id', 'order', 'targetamount', 'startdate', 'targetdate']; + /** @var array */ protected $hidden = ['targetamount_encrypted', 'encrypted']; /** diff --git a/app/Models/PiggyBankEvent.php b/app/Models/PiggyBankEvent.php index 41e27d4296..13088c60c3 100644 --- a/app/Models/PiggyBankEvent.php +++ b/app/Models/PiggyBankEvent.php @@ -40,11 +40,12 @@ class PiggyBankEvent extends Model */ protected $casts = [ - 'created_at' => 'date', - 'updated_at' => 'date', - 'date' => 'date', + 'created_at' => 'datetime', + 'updated_at' => 'datetime', + 'date' => 'datetime', ]; - protected $dates = ['created_at', 'updated_at', 'date']; + /** @var array */ + protected $dates = ['date']; protected $fillable = ['piggy_bank_id', 'transaction_journal_id', 'date', 'amount']; protected $hidden = ['amount_encrypted']; diff --git a/app/Models/PiggyBankRepetition.php b/app/Models/PiggyBankRepetition.php index 9484e631c2..6073e3c108 100644 --- a/app/Models/PiggyBankRepetition.php +++ b/app/Models/PiggyBankRepetition.php @@ -42,13 +42,15 @@ class PiggyBankRepetition extends Model */ protected $casts = [ - 'created_at' => 'date', - 'updated_at' => 'date', - 'deleted_at' => 'date', + 'created_at' => 'datetime', + 'updated_at' => 'datetime', + 'deleted_at' => 'datetime', 'startdate' => 'date', 'targetdate' => 'date', ]; - protected $dates = ['created_at', 'updated_at', 'startdate', 'targetdate']; + /** @var array */ + protected $dates = ['startdate', 'targetdate']; + /** @var array */ protected $fillable = ['piggy_bank_id', 'startdate', 'targetdate', 'currentamount']; /** diff --git a/app/Models/Preference.php b/app/Models/Preference.php index 6c984085a3..9d66c0ac85 100644 --- a/app/Models/Preference.php +++ b/app/Models/Preference.php @@ -45,10 +45,11 @@ class Preference extends Model */ protected $casts = [ - 'created_at' => 'date', - 'updated_at' => 'date', + 'created_at' => 'datetime', + 'updated_at' => 'datetime', ]; - protected $dates = ['created_at', 'updated_at']; + + /** @var array */ protected $fillable = ['user_id', 'data', 'name', 'data']; /** diff --git a/app/Models/Role.php b/app/Models/Role.php index 1d4da87723..c117329c6a 100644 --- a/app/Models/Role.php +++ b/app/Models/Role.php @@ -41,10 +41,10 @@ class Role extends Model */ protected $casts = [ - 'created_at' => 'date', - 'updated_at' => 'date', + 'created_at' => 'datetime', + 'updated_at' => 'datetime', ]; - protected $dates = ['created_at', 'updated_at']; + /** * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany diff --git a/app/Models/Rule.php b/app/Models/Rule.php index bb67df6f68..8a777698b7 100644 --- a/app/Models/Rule.php +++ b/app/Models/Rule.php @@ -43,15 +43,13 @@ class Rule extends Model */ protected $casts = [ - 'created_at' => 'date', - 'updated_at' => 'date', - 'deleted_at' => 'date', + 'created_at' => 'datetime', + 'updated_at' => 'datetime', + 'deleted_at' => 'datetime', 'active' => 'boolean', 'order' => 'int', 'stop_processing' => 'boolean', ]; - /** @var array */ - protected $dates = ['created_at', 'updated_at', 'deleted_at']; /** * @param Rule $value diff --git a/app/Models/RuleAction.php b/app/Models/RuleAction.php index 800357db85..c26359ab62 100644 --- a/app/Models/RuleAction.php +++ b/app/Models/RuleAction.php @@ -39,14 +39,12 @@ class RuleAction extends Model */ protected $casts = [ - 'created_at' => 'date', - 'updated_at' => 'date', + 'created_at' => 'datetime', + 'updated_at' => 'datetime', 'active' => 'boolean', 'order' => 'int', 'stop_processing' => 'boolean', ]; - /** @var array */ - protected $dates = ['created_at', 'updated_at']; /** * @return \Illuminate\Database\Eloquent\Relations\BelongsTo diff --git a/app/Models/RuleGroup.php b/app/Models/RuleGroup.php index 2eabf6bb5d..e2d13773ec 100644 --- a/app/Models/RuleGroup.php +++ b/app/Models/RuleGroup.php @@ -42,15 +42,12 @@ class RuleGroup extends Model */ protected $casts = [ - 'created_at' => 'date', - 'updated_at' => 'date', - 'deleted_at' => 'date', + 'created_at' => 'datetime', + 'updated_at' => 'datetime', + 'deleted_at' => 'datetime', 'active' => 'boolean', 'order' => 'int', ]; - /** @var array */ - protected $dates = ['created_at', 'updated_at', 'deleted_at']; - protected $fillable = ['user_id', 'order', 'title', 'description', 'active']; diff --git a/app/Models/RuleTrigger.php b/app/Models/RuleTrigger.php index d9af8d38ab..629b283ee1 100644 --- a/app/Models/RuleTrigger.php +++ b/app/Models/RuleTrigger.php @@ -39,14 +39,12 @@ class RuleTrigger extends Model */ protected $casts = [ - 'created_at' => 'date', - 'updated_at' => 'date', + 'created_at' => 'datetime', + 'updated_at' => 'datetime', 'active' => 'boolean', 'order' => 'int', 'stop_processing' => 'boolean', ]; - /** @var array */ - protected $dates = ['created_at', 'updated_at']; /** * @return \Illuminate\Database\Eloquent\Relations\BelongsTo diff --git a/app/Models/Tag.php b/app/Models/Tag.php index a5174e594a..93b31b4d75 100644 --- a/app/Models/Tag.php +++ b/app/Models/Tag.php @@ -44,17 +44,20 @@ class Tag extends Model * @var array */ protected $casts - = [ - 'created_at' => 'date', - 'updated_at' => 'date', - 'deleted_at' => 'date', + = [ + 'created_at' => 'datetime', + 'updated_at' => 'datetime', + 'deleted_at' => 'datetime', 'date' => 'date', 'zoomLevel' => 'int', ]; - protected $dates = ['created_at', 'updated_at', 'date', 'deleted_at']; + /** @var array */ + protected $dates = ['date']; + /** @var array */ protected $fillable = ['user_id', 'tag', 'date', 'description', 'longitude', 'latitude', 'zoomLevel', 'tagMode']; - protected $rules = ['tag' => 'required|between:1,200',]; + /** @var array */ + protected $rules = ['tag' => 'required|between:1,200',]; /** diff --git a/app/Models/Transaction.php b/app/Models/Transaction.php index fa0c0c5a08..217f3484fa 100644 --- a/app/Models/Transaction.php +++ b/app/Models/Transaction.php @@ -87,14 +87,13 @@ class Transaction extends Model */ protected $casts = [ - 'created_at' => 'date', - 'updated_at' => 'date', - 'deleted_at' => 'date', + 'created_at' => 'datetime', + 'updated_at' => 'datetime', + 'deleted_at' => 'datetime', 'identifier' => 'int', 'encrypted' => 'boolean', // model does not have these fields though 'bill_name_encrypted' => 'boolean', ]; - protected $dates = ['created_at', 'updated_at', 'deleted_at']; protected $fillable = ['account_id', 'transaction_journal_id', 'description', 'amount', 'identifier', 'transaction_currency_id', 'foreign_currency_id', 'foreign_amount']; diff --git a/app/Models/TransactionCurrency.php b/app/Models/TransactionCurrency.php index 8fe217cb8d..3b4c0eb607 100644 --- a/app/Models/TransactionCurrency.php +++ b/app/Models/TransactionCurrency.php @@ -44,12 +44,14 @@ class TransactionCurrency extends Model */ protected $casts = [ - 'created_at' => 'date', - 'updated_at' => 'date', - 'deleted_at' => 'date', + 'created_at' => 'datetime', + 'updated_at' => 'datetime', + 'deleted_at' => 'datetime', 'decimal_places' => 'int', ]; - protected $dates = ['created_at', 'updated_at', 'deleted_at', 'date']; + /** @var array */ + protected $dates = ['date']; + /** @var array */ protected $fillable = ['name', 'code', 'symbol', 'decimal_places']; /** diff --git a/app/Models/TransactionJournal.php b/app/Models/TransactionJournal.php index f67b25aec7..b6df84bbd7 100644 --- a/app/Models/TransactionJournal.php +++ b/app/Models/TransactionJournal.php @@ -53,9 +53,9 @@ class TransactionJournal extends Model */ protected $casts = [ - 'created_at' => 'date', - 'updated_at' => 'date', - 'deleted_at' => 'date', + 'created_at' => 'datetime', + 'updated_at' => 'datetime', + 'deleted_at' => 'datetime', 'date' => 'date', 'interest_date' => 'date', 'book_date' => 'date', @@ -66,7 +66,7 @@ class TransactionJournal extends Model 'completed' => 'boolean', ]; /** @var array */ - protected $dates = ['created_at', 'updated_at', 'date', 'deleted_at', 'interest_date', 'book_date', 'process_date']; + protected $dates = ['date','interest_date', 'book_date', 'process_date']; /** @var array */ protected $fillable = ['user_id', 'transaction_type_id', 'bill_id', 'interest_date', 'book_date', 'process_date', diff --git a/app/Models/TransactionJournalMeta.php b/app/Models/TransactionJournalMeta.php index 11a23eff31..e23cf76edb 100644 --- a/app/Models/TransactionJournalMeta.php +++ b/app/Models/TransactionJournalMeta.php @@ -42,14 +42,15 @@ class TransactionJournalMeta extends Model * @var array */ protected $casts - = [ - 'created_at' => 'date', - 'updated_at' => 'date', - 'deleted_at' => 'date', + = [ + 'created_at' => 'datetime', + 'updated_at' => 'datetime', + 'deleted_at' => 'datetime', ]; - protected $dates = ['created_at', 'updated_at', 'deleted_at']; + /** @var array */ protected $fillable = ['transaction_journal_id', 'name', 'data', 'hash']; - protected $table = 'journal_meta'; + /** @var string */ + protected $table = 'journal_meta'; /** * @param $value diff --git a/app/Models/TransactionType.php b/app/Models/TransactionType.php index a7ebd80beb..1df75796aa 100644 --- a/app/Models/TransactionType.php +++ b/app/Models/TransactionType.php @@ -48,13 +48,11 @@ class TransactionType extends Model */ protected $casts = [ - 'created_at' => 'date', - 'updated_at' => 'date', - 'deleted_at' => 'date', + 'created_at' => 'datetime', + 'updated_at' => 'datetime', + 'deleted_at' => 'datetime', ]; - protected $dates = ['created_at', 'updated_at', 'deleted_at']; - /** * @param string $type *