From ab021ee53566d4d75474da99b87b5fdf74b869e0 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 12 Sep 2023 13:14:01 +0200
Subject: [PATCH] fix: server is functional check

---
 app/Http/Livewire/Server/New/ByIp.php               | 2 +-
 app/Http/Livewire/Server/Proxy/Status.php           | 2 +-
 app/Jobs/DockerCleanupJob.php                       | 4 ++--
 app/Models/Server.php                               | 3 +++
 resources/views/livewire/destination/show.blade.php | 2 +-
 resources/views/livewire/server/form.blade.php      | 4 ++--
 resources/views/livewire/server/proxy.blade.php     | 2 +-
 7 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/app/Http/Livewire/Server/New/ByIp.php b/app/Http/Livewire/Server/New/ByIp.php
index d0b44ecaf..20377dc5d 100644
--- a/app/Http/Livewire/Server/New/ByIp.php
+++ b/app/Http/Livewire/Server/New/ByIp.php
@@ -58,7 +58,7 @@ class ByIp extends Component
     {
         $this->validate();
         try {
-            if (!$this->private_key_id) {
+            if (is_null($this->private_key_id)) {
                 return $this->emit('error', 'You must select a private key');
             }
             $server = Server::create([
diff --git a/app/Http/Livewire/Server/Proxy/Status.php b/app/Http/Livewire/Server/Proxy/Status.php
index 9ecf318a8..a0b90b7be 100644
--- a/app/Http/Livewire/Server/Proxy/Status.php
+++ b/app/Http/Livewire/Server/Proxy/Status.php
@@ -17,7 +17,7 @@ class Status extends Component
     public function getProxyStatus()
     {
         try {
-            if (data_get($this->server, 'settings.is_usable') && data_get($this->server, 'settings.is_reachable')) {
+            if ($this->server->isFunctional()) {
                 $container = getContainerStatus(server: $this->server, container_id: 'coolify-proxy');
                 $this->server->proxy->status = $container;
                 $this->server->save();
diff --git a/app/Jobs/DockerCleanupJob.php b/app/Jobs/DockerCleanupJob.php
index fbb9ac2c7..b1fccbe4b 100644
--- a/app/Jobs/DockerCleanupJob.php
+++ b/app/Jobs/DockerCleanupJob.php
@@ -36,11 +36,11 @@ class DockerCleanupJob implements ShouldQueue
             return;
         }
         try {
-            ray()->showQueries()->color('orange');
+            // ray()->showQueries()->color('orange');
             $servers = Server::all();
             foreach ($servers as $server) {
                 if (
-                    !$server->settings->is_reachable && !$server->settings->is_usable
+                    !$server->isFunctional()
                 ) {
                     continue;
                 }
diff --git a/app/Models/Server.php b/app/Models/Server.php
index 973d2d628..f45cf3b2d 100644
--- a/app/Models/Server.php
+++ b/app/Models/Server.php
@@ -153,4 +153,7 @@ class Server extends BaseModel
         }
         return $shouldRun;
     }
+    public function isFunctional() {
+        return $this->settings->is_reachable && $this->settings->is_usable;
+    }
 }
diff --git a/resources/views/livewire/destination/show.blade.php b/resources/views/livewire/destination/show.blade.php
index 1ab18826e..942c094c3 100644
--- a/resources/views/livewire/destination/show.blade.php
+++ b/resources/views/livewire/destination/show.blade.php
@@ -1,5 +1,5 @@
 <div>
-    @if ($server->settings->is_usable)
+    @if ($server->isFunctional())
         <div class="flex items-end gap-2">
             <h2>Destinations</h2>
             <a href="{{ route('destination.new', ['server_id' => $server->id]) }}">
diff --git a/resources/views/livewire/server/form.blade.php b/resources/views/livewire/server/form.blade.php
index 3bba0ad3c..9af0440a0 100644
--- a/resources/views/livewire/server/form.blade.php
+++ b/resources/views/livewire/server/form.blade.php
@@ -20,7 +20,7 @@
             @endif
 
         </div>
-        @if (!$server->settings->is_reachable || !$server->settings->is_usable)
+        @if (!$server->isFunctional())
             You can't use this server until it is validated.
         @else
             Server validated.
@@ -57,7 +57,7 @@
                 Install Docker Engine 24.0
             </x-forms.button>
         @endif
-        @if ($server->settings->is_usable)
+        @if ($server->isFunctional())
             <h3 class="py-4">Settings</h3>
                 <x-forms.input id="cleanup_after_percentage" label="Disk Cleanup threshold (%)" required
                     helper="Disk cleanup job will be executed if disk usage is more than this number." />
diff --git a/resources/views/livewire/server/proxy.blade.php b/resources/views/livewire/server/proxy.blade.php
index abfb7f69f..0b38ad940 100644
--- a/resources/views/livewire/server/proxy.blade.php
+++ b/resources/views/livewire/server/proxy.blade.php
@@ -1,5 +1,5 @@
 <div>
-    @if (data_get($server,'settings.is_usable'))
+    @if ($server->isFunctional())
         @if (data_get($server,'proxy.type'))
         <x-modal submitWireAction="proxyStatusUpdated" modalId="startProxy">
             <x-slot:modalBody>