From b1389262e2c333d740e889e0d96baf3651133db1 Mon Sep 17 00:00:00 2001 From: Dane Everitt Date: Sun, 5 Feb 2017 18:00:39 -0500 Subject: [PATCH] Use belongsTo versus hasOne when more logical. --- app/Models/Database.php | 8 ++++---- app/Models/DatabaseServer.php | 4 ++-- app/Models/Node.php | 4 ++-- app/Models/Server.php | 16 ++++++++-------- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/app/Models/Database.php b/app/Models/Database.php index c316d6e0..b5e9d39a 100644 --- a/app/Models/Database.php +++ b/app/Models/Database.php @@ -62,20 +62,20 @@ class Database extends Model /** * Gets the host database server associated with a database. * - * @return \Illuminate\Database\Eloquent\Relations\HasOne + * @return \Illuminate\Database\Eloquent\Relations\BelongsTo */ public function host() { - return $this->hasOne(DatabaseServer::class, 'id', 'db_server'); + return $this->belongsTo(DatabaseServer::class, 'db_server'); } /** * Gets the server associated with a database. * - * @return \Illuminate\Database\Eloquent\Relations\HasOne + * @return \Illuminate\Database\Eloquent\Relations\BelongsTo */ public function server() { - return $this->hasOne(Server::class, 'id', 'server_id'); + return $this->belongsTo(Server::class); } } diff --git a/app/Models/DatabaseServer.php b/app/Models/DatabaseServer.php index 7713f59b..c71d1b8d 100644 --- a/app/Models/DatabaseServer.php +++ b/app/Models/DatabaseServer.php @@ -63,10 +63,10 @@ class DatabaseServer extends Model /** * Gets the node associated with a database host. * - * @return \Illuminate\Database\Eloquent\Relations\HasOne + * @return \Illuminate\Database\Eloquent\Relations\BelongsTo */ public function node() { - return $this->hasOne(Node::class, 'id', 'linked_node'); + return $this->belongsTo(Node::class, 'linked_node'); } } diff --git a/app/Models/Node.php b/app/Models/Node.php index 2be35568..93668264 100644 --- a/app/Models/Node.php +++ b/app/Models/Node.php @@ -220,11 +220,11 @@ class Node extends Model /** * Gets the location associated with a node. * - * @return \Illuminate\Database\Eloquent\Relations\HasOne + * @return \Illuminate\Database\Eloquent\Relations\BelongsTo */ public function location() { - return $this->hasOne(Location::class, 'id', 'location_id'); + return $this->belongsTo(Location::class); } /** diff --git a/app/Models/Server.php b/app/Models/Server.php index f7e8bdbe..abe512e6 100644 --- a/app/Models/Server.php +++ b/app/Models/Server.php @@ -221,11 +221,11 @@ class Server extends Model /** * Gets the user who owns the server. * - * @return \Illuminate\Database\Eloquent\Relations\HasOne + * @return \Illuminate\Database\Eloquent\Relations\BelongsTo */ public function user() { - return $this->hasOne(User::class, 'id', 'owner_id'); + return $this->belongsTo(User::class, 'owner_id'); } /** @@ -251,21 +251,21 @@ class Server extends Model /** * Gets information for the service associated with this server. * - * @return \Illuminate\Database\Eloquent\Relations\HasOne + * @return \Illuminate\Database\Eloquent\Relations\BelongsTo */ public function service() { - return $this->hasOne(Service::class, 'id', 'service_id'); + return $this->belongsTo(Service::class); } /** * Gets information for the service option associated with this server. * - * @return \Illuminate\Database\Eloquent\Relations\HasOne + * @return \Illuminate\Database\Eloquent\Relations\BelongsTo */ public function option() { - return $this->hasOne(ServiceOptions::class, 'id', 'option_id'); + return $this->belongsTo(ServiceOptions::class); } /** @@ -281,11 +281,11 @@ class Server extends Model /** * Gets information for the node associated with this server. * - * @return \Illuminate\Database\Eloquent\Relations\HasOne + * @return \Illuminate\Database\Eloquent\Relations\BelongsTo */ public function node() { - return $this->hasOne(Node::class, 'id', 'node_id'); + return $this->belongsTo(Node::class); } /**