From ca777384eb4d385e6682dd70adab21a5a04e7e6e Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@protonmail.com>
Date: Tue, 30 May 2023 15:00:11 +0000
Subject: [PATCH] updates

---
 app/Http/Livewire/Project/Application/Previews.php | 11 +++++++----
 app/Jobs/ApplicationDeploymentJob.php              |  6 +++---
 bootstrap/helpers/docker.php                       |  2 +-
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/app/Http/Livewire/Project/Application/Previews.php b/app/Http/Livewire/Project/Application/Previews.php
index de61665cd..f56ce2f66 100644
--- a/app/Http/Livewire/Project/Application/Previews.php
+++ b/app/Http/Livewire/Project/Application/Previews.php
@@ -45,10 +45,13 @@ public function deploy(int $pull_request_id)
     {
         try {
             $this->set_deployment_uuid();
-            ApplicationPreview::create([
-                'application_id' => $this->application->id,
-                'pull_request_id' => $pull_request_id,
-            ]);
+            $found = ApplicationPreview::where('application_id', $this->application->id)->where('pull_request_id', $pull_request_id)->first();
+            if (!$found) {
+                ApplicationPreview::create([
+                    'application_id' => $this->application->id,
+                    'pull_request_id' => $pull_request_id,
+                ]);
+            }
             queue_application_deployment(
                 application_id: $this->application->id,
                 deployment_uuid: $this->deployment_uuid,
diff --git a/app/Jobs/ApplicationDeploymentJob.php b/app/Jobs/ApplicationDeploymentJob.php
index 279282362..994f61221 100644
--- a/app/Jobs/ApplicationDeploymentJob.php
+++ b/app/Jobs/ApplicationDeploymentJob.php
@@ -202,8 +202,8 @@ private function build_image()
     }
     private function deploy_pull_request()
     {
-        $this->build_image_name = "{$this->application->uuid}:pr_{$this->pull_request_id}-build";
-        $this->production_image_name = "{$this->application->uuid}:pr_{$this->pull_request_id}";
+        $this->build_image_name = "{$this->application->uuid}:pr-{$this->pull_request_id}-build";
+        $this->production_image_name = "{$this->application->uuid}:pr-{$this->pull_request_id}";
         $this->container_name = generate_container_name($this->application->uuid, $this->pull_request_id);
         // Deploy pull request
         $this->execute_now([
@@ -577,7 +577,7 @@ private function importing_git_repository()
     {
         $git_clone_command = "git clone -q -b {$this->application->git_branch}";
         if ($this->pull_request_id) {
-            $pr_branch_name = "pr_{$this->pull_request_id}_coolify";
+            $pr_branch_name = "pr-{$this->pull_request_id}-coolify";
         }
 
         if ($this->application->deploymentType() === 'source') {
diff --git a/bootstrap/helpers/docker.php b/bootstrap/helpers/docker.php
index 57fb04884..0efd25c84 100644
--- a/bootstrap/helpers/docker.php
+++ b/bootstrap/helpers/docker.php
@@ -42,7 +42,7 @@ function get_container_status(Server $server, string $container_id, bool $throwE
 function generate_container_name(string $uuid, int|null $pull_request_id = null)
 {
     if ($pull_request_id) {
-        return $uuid . '_pr_' . $pull_request_id;
+        return $uuid . '-pr-' . $pull_request_id;
     } else {
         return $uuid;
     }