From 0ec6a9dea233d8d56b67c462742fa053fdd94709 Mon Sep 17 00:00:00 2001
From: Saeed Vaziry <mr.saeedvaziry@gmail.com>
Date: Sun, 14 Jan 2024 12:56:25 +0100
Subject: [PATCH] fix db transaction usage

---
 app/Actions/Server/CreateServer.php | 3 +--
 app/Actions/Site/CreateSite.php     | 3 +--
 app/Models/GitHook.php              | 2 +-
 app/Models/Site.php                 | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/Actions/Server/CreateServer.php b/app/Actions/Server/CreateServer.php
index 8f56e00..492ab45 100755
--- a/app/Actions/Server/CreateServer.php
+++ b/app/Actions/Server/CreateServer.php
@@ -44,9 +44,8 @@ public function create(User $creator, array $input): Server
             'progress_step' => 'Initializing',
         ]);
 
+        DB::beginTransaction();
         try {
-            DB::beginTransaction();
-
             if ($server->provider != 'custom') {
                 $server->provider_id = $input['server_provider'];
             }
diff --git a/app/Actions/Site/CreateSite.php b/app/Actions/Site/CreateSite.php
index 73a93df..21bfbd8 100755
--- a/app/Actions/Site/CreateSite.php
+++ b/app/Actions/Site/CreateSite.php
@@ -23,9 +23,8 @@ public function create(Server $server, array $input): Site
     {
         $this->validateInputs($server, $input);
 
+        DB::beginTransaction();
         try {
-            DB::beginTransaction();
-
             $site = new Site([
                 'server_id' => $server->id,
                 'type' => $input['type'],
diff --git a/app/Models/GitHook.php b/app/Models/GitHook.php
index 414ccc2..34b3294 100755
--- a/app/Models/GitHook.php
+++ b/app/Models/GitHook.php
@@ -69,8 +69,8 @@ public function deployHook(): void
      */
     public function destroyHook(): void
     {
+        DB::beginTransaction();
         try {
-            DB::beginTransaction();
             $this->sourceControl->provider()->destroyHook($this->site->repository, $this->hook_id);
             $this->delete();
             DB::commit();
diff --git a/app/Models/Site.php b/app/Models/Site.php
index 14c94be..9cd1681 100755
--- a/app/Models/Site.php
+++ b/app/Models/Site.php
@@ -357,8 +357,8 @@ public function enableAutoDeployment(): void
             throw new SourceControlIsNotConnected($this->source_control);
         }
 
+        DB::beginTransaction();
         try {
-            DB::beginTransaction();
             $gitHook = new GitHook([
                 'site_id' => $this->id,
                 'source_control_id' => $this->sourceControl()->id,