Model updates for Database Management in ACP

app/Http/Controllers/Admin/DatabaseController.php

@@ -47,30 +47,18 @@ class DatabaseController extends Controller
     public function getIndex(Request $request)
     {
         return view('admin.databases.index', [
-            'databases' => Models\Database::select(
-                    'databases.*',
-                    'database_servers.host as a_host',
-                    'database_servers.port as a_port',
-                    'servers.id as a_serverId',
-                    'servers.name as a_serverName'
-                )->join('database_servers', 'database_servers.id', '=', 'databases.db_server')
-                ->join('servers', 'databases.server_id', '=', 'servers.id')
-                ->paginate(20),
-            'dbh' => Models\DatabaseServer::select(
+            'databases' => Models\Database::with('server')->paginate(50),
+            'hosts' => Models\DatabaseServer::select(
                     'database_servers.*',
-                    'nodes.name as a_linkedNode',
                     DB::raw('(SELECT COUNT(*) FROM `databases` WHERE `databases`.`db_server` = database_servers.id) as c_databases')
-                )->leftJoin('nodes', 'nodes.id', '=', 'database_servers.linked_node')
-                ->paginate(20),
+                )->with('node')->paginate(20),
         ]);
     }
 
     public function getNew(Request $request)
     {
         return view('admin.databases.new', [
-            'nodes' => Models\Node::select('nodes.id', 'nodes.name', 'locations.long as a_location')
-                ->join('locations', 'locations.id', '=', 'nodes.location')
-                ->get(),
+            'nodes' => Models\Node::all()->load('location'),
         ]);
     }
 
@@ -78,15 +66,17 @@ class DatabaseController extends Controller
     {
         try {
             $repo = new DatabaseRepository;
-            $repo->add($request->except([
-                '_token',
+            $repo->add($request->only([
+                'name',
+                'host',
+                'port',
+                'username',
+                'password',
+                'linked_node',
             ]));
-
             Alert::success('Successfully added a new database server to the system.')->flash();
 
-            return redirect()->route('admin.databases', [
-                'tab' => 'tab_dbservers',
-            ]);
+            return redirect()->route('admin.databases', ['tab' => 'tab_dbservers']);
         } catch (DisplayValidationException $ex) {
             return redirect()->route('admin.databases.new')->withErrors(json_decode($ex->getMessage()))->withInput();
         } catch (\Exception $ex) {

app/Models/Database.php

@@ -55,7 +55,27 @@ class Database extends Model
       * @var array
       */
      protected $casts = [
-         'server' => 'integer',
+         'server_id' => 'integer',
          'db_server' => 'integer',
      ];
+
+     /**
+      * Gets the host database server associated with a database.
+      *
+      * @return \Illuminate\Database\Eloquent\Relations\HasOne
+      */
+     public function host()
+     {
+         return $this->hasOne(DatabaseServer::class, 'id', 'db_server');
+     }
+
+     /**
+      * Gets the server associated with a database.
+      *
+      * @return \Illuminate\Database\Eloquent\Relations\HasOne
+      */
+     public function server()
+     {
+         return $this->hasOne(Server::class, 'id', 'server_id');
+     }
 }

app/Models/DatabaseServer.php

@@ -59,4 +59,14 @@ class DatabaseServer extends Model
          'server_id' => 'integer',
          'db_server' => 'integer',
      ];
+
+     /**
+      * Gets the node associated with a database host.
+      *
+      * @return \Illuminate\Database\Eloquent\Relations\HasOne
+      */
+     public function node()
+     {
+         return $this->hasOne(Node::class, 'id', 'linked_node');
+     }
 }

app/Models/Node.php

@@ -53,7 +53,7 @@ class Node extends Model
       */
      protected $casts = [
          'public' => 'integer',
-         'location' => 'integer',
+         'location_id' => 'integer',
          'memory' => 'integer',
          'disk' => 'integer',
          'daemonListen' => 'integer',
@@ -61,11 +61,34 @@ class Node extends Model
      ];
 
     /**
-     * Fields that are not mass assignable.
+     * Fields that are mass assignable.
      *
      * @var array
      */
-    protected $guarded = ['id', 'created_at', 'updated_at'];
+    protected $fillable = [
+        'uuid',
+        'uuidShort',
+        'node_id',
+        'name',
+        'suspended',
+        'owner_id',
+        'memory',
+        'swap',
+        'disk',
+        'io',
+        'cpu',
+        'oom_disabled',
+        'allocation_id',
+        'service_id',
+        'option_id',
+        'pack_id',
+        'startup',
+        'daemonSecret',
+        'image',
+        'username',
+        'sftp_password',
+        'installed',
+    ];
 
     /**
      * @var array
@@ -193,4 +216,14 @@ class Node extends Model
 
         return json_encode($config, $json_options);
     }
+
+    /**
+     * Gets the location associated with a node.
+     *
+     * @return \Illuminate\Database\Eloquent\Relations\HasOne
+     */
+    public function location()
+    {
+        return $this->hasOne(Location::class, 'id', 'location_id');
+    }
 }