From 110cc1248b1417bad6127097b4a077c608cf5b2f Mon Sep 17 00:00:00 2001
From: Lance Pioch <git@lance.sh>
Date: Sun, 2 Jun 2024 00:33:58 -0400
Subject: [PATCH] Fix relationship

---
 app/Http/Controllers/Admin/ServersController.php | 10 ++--------
 app/Models/MountServer.php                       | 16 ----------------
 app/Models/Server.php                            |  9 +++------
 3 files changed, 5 insertions(+), 30 deletions(-)
 delete mode 100644 app/Models/MountServer.php

diff --git a/app/Http/Controllers/Admin/ServersController.php b/app/Http/Controllers/Admin/ServersController.php
index 5a2b8074f..b62957620 100644
--- a/app/Http/Controllers/Admin/ServersController.php
+++ b/app/Http/Controllers/Admin/ServersController.php
@@ -9,7 +9,6 @@ use Illuminate\Http\Response;
 use App\Models\Mount;
 use App\Models\Server;
 use App\Models\Database;
-use App\Models\MountServer;
 use Illuminate\Http\RedirectResponse;
 use Prologue\Alerts\AlertsMessageBag;
 use App\Exceptions\DisplayException;
@@ -228,12 +227,7 @@ class ServersController extends Controller
      */
     public function addMount(Request $request, Server $server): RedirectResponse
     {
-        $mountServer = (new MountServer())->forceFill([
-            'mount_id' => $request->input('mount_id'),
-            'server_id' => $server->id,
-        ]);
-
-        $mountServer->saveOrFail();
+        $server->mounts()->attach($request->input('mount_id'));
 
         $this->alert->success('Mount was added successfully.')->flash();
 
@@ -245,7 +239,7 @@ class ServersController extends Controller
      */
     public function deleteMount(Server $server, Mount $mount): RedirectResponse
     {
-        MountServer::where('mount_id', $mount->id)->where('server_id', $server->id)->delete();
+        $server->mounts()->detach($mount);
 
         $this->alert->success('Mount was removed successfully.')->flash();
 
diff --git a/app/Models/MountServer.php b/app/Models/MountServer.php
deleted file mode 100644
index 8d04723cb..000000000
--- a/app/Models/MountServer.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use Illuminate\Database\Eloquent\Model;
-
-class MountServer extends Model
-{
-    protected $table = 'mount_server';
-
-    public $timestamps = false;
-
-    protected $primaryKey = null;
-
-    public $incrementing = false;
-}
diff --git a/app/Models/Server.php b/app/Models/Server.php
index 3c4657343..9b5e5b1cc 100644
--- a/app/Models/Server.php
+++ b/app/Models/Server.php
@@ -5,6 +5,7 @@ namespace App\Models;
 use App\Enums\ServerState;
 use App\Exceptions\Http\Connection\DaemonConnectionException;
 use GuzzleHttp\Exception\GuzzleException;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Notifications\Notifiable;
 use Illuminate\Database\Query\JoinClause;
 use Illuminate\Support\Facades\Http;
@@ -13,7 +14,6 @@ use Illuminate\Database\Eloquent\Relations\HasOne;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\MorphToMany;
-use Illuminate\Database\Eloquent\Relations\HasManyThrough;
 use App\Exceptions\Http\Server\ServerStateConflictException;
 
 /**
@@ -311,12 +311,9 @@ class Server extends Model
         return $this->hasMany(Backup::class);
     }
 
-    /**
-     * Returns all mounts that have this server has mounted.
-     */
-    public function mounts(): HasManyThrough
+    public function mounts(): BelongsToMany
     {
-        return $this->hasManyThrough(Mount::class, MountServer::class, 'server_id', 'id', 'id', 'mount_id');
+        return $this->belongsToMany(Mount::class);
     }
 
     /**