From 4d319a8caa58dd75537815cfa1ff3f725f728407 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Wed, 21 Feb 2024 12:22:32 +0100
Subject: [PATCH] Update service and shared helper files

---
 bootstrap/helpers/services.php |  9 +++++++--
 bootstrap/helpers/shared.php   | 13 ++++++-------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/bootstrap/helpers/services.php b/bootstrap/helpers/services.php
index aa7d6fd54..c46c1e542 100644
--- a/bootstrap/helpers/services.php
+++ b/bootstrap/helpers/services.php
@@ -4,8 +4,8 @@
 use App\Models\Service;
 use App\Models\ServiceApplication;
 use App\Models\ServiceDatabase;
-use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
+use Spatie\Url\Url;
 use Symfony\Component\Yaml\Yaml;
 
 function replaceRegex(?string $name = null)
@@ -95,12 +95,17 @@ function updateCompose($resource)
             // Update FQDN
             $variableName = "SERVICE_FQDN_" . Str::of($resource->name)->upper();
             $generatedEnv = EnvironmentVariable::where('service_id', $resource->service_id)->where('key', $variableName)->first();
+            $fqdn = Url::fromString($resource->fqdn);
+            $fqdn = $fqdn->getScheme() . '://' . $fqdn->getHost();
             if ($generatedEnv) {
-                $generatedEnv->value = $resource->fqdn;
+                $generatedEnv->value = $fqdn;
                 $generatedEnv->save();
             }
             $variableName = "SERVICE_URL_" . Str::of($resource->name)->upper();
             $generatedEnv = EnvironmentVariable::where('service_id', $resource->service_id)->where('key', $variableName)->first();
+            $url = Url::fromString($resource->fqdn);
+            $url = $url->getHost();
+            ray($url);
             if ($generatedEnv) {
                 $url = Str::of($resource->fqdn)->after('://');
                 $generatedEnv->value = $url;
diff --git a/bootstrap/helpers/shared.php b/bootstrap/helpers/shared.php
index 1a91eb945..094973a6a 100644
--- a/bootstrap/helpers/shared.php
+++ b/bootstrap/helpers/shared.php
@@ -974,13 +974,12 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
                                         'is_preview' => false,
                                     ]);
                                 }
-                                // if (!$isDatabase) {
-                                //     ray($savedService,$fqdn);
-                                //     if ($command->value() === 'FQDN' && is_null($savedService->fqdn)) {
-                                //         $savedService->fqdn = $fqdn;
-                                //         $savedService->save();
-                                //     }
-                                // }
+                                if (!$isDatabase) {
+                                    if ($command->value() === 'FQDN' && is_null($savedService->fqdn) && !$foundEnv) {
+                                        $savedService->fqdn = $fqdn;
+                                        $savedService->save();
+                                    }
+                                }
                             } else {
                                 $generatedValue = generateEnvValue($command);
                                 if (!$foundEnv) {