Updated models and tests to match.

This commit is contained in:
James Cole
2015-02-07 12:15:53 +01:00
parent 72e72c60c2
commit 07ad43f7a2
26 changed files with 86 additions and 14 deletions

View File

@@ -42,7 +42,7 @@ class Account extends Model
public function getDates() public function getDates()
{ {
return ['created_at', 'updated_at']; return ['created_at', 'updated_at','deleted_at'];
} }
} }

View File

@@ -20,5 +20,9 @@ class AccountMeta extends Model
{ {
$this->attributes['data'] = json_encode($value); $this->attributes['data'] = json_encode($value);
} }
public function getDates()
{
return ['created_at', 'updated_at'];
}
} }

View File

@@ -10,4 +10,8 @@ class AccountType extends Model
{ {
return $this->hasMany('FireflyIII\Models\Account'); return $this->hasMany('FireflyIII\Models\Account');
} }
public function getDates()
{
return ['created_at', 'updated_at'];
}
} }

View File

@@ -14,6 +14,10 @@ class Bill extends Model
{ {
return $this->belongsTo('FireflyIII\User'); return $this->belongsTo('FireflyIII\User');
} }
public function getDates()
{
return ['created_at', 'updated_at','date'];
}
} }

View File

@@ -25,6 +25,10 @@ class Budget extends Model
{ {
return $this->belongsTo('FireflyIII\User'); return $this->belongsTo('FireflyIII\User');
} }
public function getDates()
{
return ['created_at', 'updated_at','deleted_at'];
}
} }

View File

@@ -14,5 +14,9 @@ class BudgetLimit extends Model
{ {
return $this->hasMany('FireflyIII\Models\LimitRepetition'); return $this->hasMany('FireflyIII\Models\LimitRepetition');
} }
public function getDates()
{
return ['created_at', 'updated_at','startdate'];
}
} }

View File

@@ -14,5 +14,9 @@ class Category extends Model
{ {
return $this->belongsTo('FireflyIII\User'); return $this->belongsTo('FireflyIII\User');
} }
public function getDates()
{
return ['created_at', 'updated_at','deleted_at'];
}
} }

View File

@@ -5,6 +5,8 @@ use Illuminate\Database\Eloquent\Model;
class Component extends Model class Component extends Model
{ {
// public function getDates()
{
return ['created_at', 'updated_at','deleted_at'];
}
} }

View File

@@ -9,5 +9,9 @@ class LimitRepetition extends Model
{ {
return $this->belongsTo('FireflyIII\Models\BudgetLimit'); return $this->belongsTo('FireflyIII\Models\BudgetLimit');
} }
public function getDates()
{
return ['created_at', 'updated_at','startdate','enddate'];
}
} }

View File

@@ -24,4 +24,8 @@ class PiggyBank extends Model
{ {
return $this->morphMany('FireflyIII\Models\Reminder', 'remindersable'); return $this->morphMany('FireflyIII\Models\Reminder', 'remindersable');
} }
public function getDates()
{
return ['created_at', 'updated_at','deleted_at','startdate','targetdate'];
}
} }

View File

@@ -14,5 +14,9 @@ class PiggyBankEvent extends Model
{ {
return $this->belongsTo('FireflyIII\Models\TransactionJournal'); return $this->belongsTo('FireflyIII\Models\TransactionJournal');
} }
public function getDates()
{
return ['created_at', 'updated_at','date'];
}
} }

View File

@@ -9,5 +9,9 @@ class PiggyBankRepetition extends Model
{ {
return $this->belongsTo('FireflyIII\Models\PiggyBank'); return $this->belongsTo('FireflyIII\Models\PiggyBank');
} }
public function getDates()
{
return ['created_at', 'updated_at','startdate','targetdate'];
}
} }

View File

@@ -19,5 +19,9 @@ class Preference extends Model
{ {
return $this->belongsTo('FireflyIII\User'); return $this->belongsTo('FireflyIII\User');
} }
public function getDates()
{
return ['created_at', 'updated_at'];
}
} }

View File

@@ -14,6 +14,9 @@ class Reminder extends Model
{ {
return $this->belongsTo('FireflyIII\User'); return $this->belongsTo('FireflyIII\User');
} }
public function getDates()
{
return ['created_at', 'updated_at','startdate','enddate'];
}
} }

View File

@@ -14,5 +14,8 @@ class Transaction extends Model
{ {
return $this->belongsTo('FireflyIII\Models\TransactionJournal'); return $this->belongsTo('FireflyIII\Models\TransactionJournal');
} }
public function getDates()
{
return ['created_at', 'updated_at','deleted_at'];
}
} }

View File

@@ -9,5 +9,8 @@ class TransactionCurrency extends Model
{ {
return $this->hasMany('FireflyIII\Models\TransactionJournal'); return $this->hasMany('FireflyIII\Models\TransactionJournal');
} }
public function getDates()
{
return ['created_at', 'updated_at','deleted_at'];
}
} }

View File

@@ -14,6 +14,9 @@ class TransactionGroup extends Model
{ {
return $this->belongsTo('FireflyIII\User'); return $this->belongsTo('FireflyIII\User');
} }
public function getDates()
{
return ['created_at', 'updated_at','deleted_at'];
}
} }

View File

@@ -25,7 +25,7 @@ class TransactionJournal extends Model
public function getDates() public function getDates()
{ {
return ['created_at', 'updated_at', 'date']; return ['created_at', 'updated_at', 'date','deleted_at'];
} }
public function getDescriptionAttribute($value) public function getDescriptionAttribute($value)

View File

@@ -5,6 +5,9 @@ use Illuminate\Database\Eloquent\Model;
class TransactionRelation extends Model class TransactionRelation extends Model
{ {
// public function getDates()
{
return ['created_at', 'updated_at'];
}
} }

View File

@@ -9,5 +9,8 @@ class TransactionType extends Model
{ {
return $this->hasMany('FireflyIII\Models\TransactionJournal'); return $this->hasMany('FireflyIII\Models\TransactionJournal');
} }
public function getDates()
{
return ['created_at', 'updated_at','deleted_at'];
}
} }

View File

@@ -1,5 +1,7 @@
<?php <?php
use FireflyIII\User;
/** /**
* Class BillControllerCest * Class BillControllerCest
* *

View File

@@ -1,5 +1,6 @@
<?php <?php
use FireflyIII\Models\Preference;
/** /**
* *
* @SuppressWarnings("CamelCase") * @SuppressWarnings("CamelCase")
@@ -50,8 +51,8 @@ class HomeControllerCest
*/ */
public function indexWithPrefs(FunctionalTester $I) public function indexWithPrefs(FunctionalTester $I)
{ {
\Preference::whereName('frontPageAccounts')->delete(); Preference::whereName('frontPageAccounts')->delete();
\Preference::create( Preference::create(
[ [
'user_id' => 1, 'user_id' => 1,
'name' => 'frontPageAccounts', 'name' => 'frontPageAccounts',

View File

@@ -1,5 +1,7 @@
<?php <?php
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Models\TransactionGroup;
/** /**
* @SuppressWarnings("CamelCase") * @SuppressWarnings("CamelCase")
* @SuppressWarnings("short") * @SuppressWarnings("short")

View File

@@ -1,5 +1,5 @@
<?php <?php
use FireflyIII\Models\Reminder;
/** /**
* Class ReminderControllerCest * Class ReminderControllerCest
* *

View File

@@ -1,6 +1,6 @@
<?php <?php
use Carbon\Carbon; use Carbon\Carbon;
use FireflyIII\Models\PiggyBank;
/** /**
* Class RepeatedExpenseControllerCest * Class RepeatedExpenseControllerCest
* *

View File

@@ -1,5 +1,8 @@
<?php <?php
use FireflyIII\Models\TransactionType;
use FireflyIII\Models\TransactionJournal;
/** /**
* Class TransactionControllerCest * Class TransactionControllerCest
*/ */