Extra large code cleanup.

app/Models/Account.php

@@ -15,6 +15,7 @@ class Account extends Model
 {
     use SoftDeletes, ValidatingTrait;
 
+    protected $fillable = ['user_id', 'account_type_id', 'name', 'active'];
     protected $rules
         = [
             'user_id'         => 'required|exists:users,id',
@@ -23,41 +24,6 @@ class Account extends Model
             'active'          => 'required|boolean'
         ];
 
-    protected $fillable = ['user_id', 'account_type_id', 'name', 'active'];
-
-    /**
-     * @param $fieldName
-     *
-     * @return string|null
-     */
-    public function getMeta($fieldName)
-    {
-        foreach ($this->accountMeta as $meta) {
-            if ($meta->name == $fieldName) {
-                return $meta->data;
-            }
-        }
-
-        return null;
-
-    }
-
-    /**
-     * @param $value
-     *
-     * @return string
-     */
-    public function getNameAttribute($value)
-    {
-        if ($this->encrypted) {
-            return Crypt::decrypt($value);
-        }
-
-        // @codeCoverageIgnoreStart
-        return $value;
-        // @codeCoverageIgnoreEnd
-    }
-
     /**
      * @return \Illuminate\Database\Eloquent\Relations\HasMany
      */
@@ -82,6 +48,33 @@ class Account extends Model
         return ['created_at', 'updated_at', 'deleted_at'];
     }
 
+    /**
+     * @param $fieldName
+     *
+     * @return string|null
+     */
+    public function getMeta($fieldName)
+    {
+        foreach ($this->accountMeta as $meta) {
+            if ($meta->name == $fieldName) {
+                return $meta->data;
+            }
+        }
+
+        return null;
+
+    }
+
+
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     */
+    public function piggyBanks()
+    {
+        return $this->hasMany('FireflyIII\Models\PiggyBank');
+    }
+
     /**
      * @param EloquentBuilder $query
      * @param array           $types
@@ -95,6 +88,31 @@ class Account extends Model
         $query->whereIn('account_types.type', $types);
     }
 
+    /**
+     * @param $value
+     */
+    public function setNameAttribute($value)
+    {
+        $this->attributes['name']      = Crypt::encrypt($value);
+        $this->attributes['encrypted'] = true;
+    }
+    /**
+     * @param $value
+     *
+     * @return string
+     */
+    public function getNameAttribute($value)
+    {
+
+        if (intval($this->encrypted) == 1) {
+            return Crypt::decrypt($value);
+        }
+
+        // @codeCoverageIgnoreStart
+        return $value;
+        // @codeCoverageIgnoreEnd
+    }
+
     /**
      * @return \Illuminate\Database\Eloquent\Relations\HasMany
      */
@@ -111,12 +129,4 @@ class Account extends Model
         return $this->belongsTo('FireflyIII\User');
     }
 
-    /**
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
-     */
-    public function piggyBanks()
-    {
-        return $this->hasMany('FireflyIII\Models\PiggyBank');
-    }
-
 }