From eee57d4c06716c25ba7d599074ebc7baeb8d0db7 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com>
Date: Tue, 22 Apr 2025 11:16:49 +0200
Subject: [PATCH] fix(api): handle JSON response in service creation and update
 methods for improved error handling

---
 app/Http/Controllers/Api/ServicesController.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Api/ServicesController.php b/app/Http/Controllers/Api/ServicesController.php
index c3730d83f..e792779e1 100644
--- a/app/Http/Controllers/Api/ServicesController.php
+++ b/app/Http/Controllers/Api/ServicesController.php
@@ -380,6 +380,9 @@ class ServicesController extends Controller
 
             $service = new Service;
             $result = $this->upsert_service($request, $service, $teamId);
+            if ($result instanceof \Illuminate\Http\JsonResponse) {
+                return $result;
+            }
 
             return response()->json(serializeApiResponse($result))->setStatusCode(201);
         } else {
@@ -608,12 +611,14 @@ class ServicesController extends Controller
         }
 
         $service = Service::whereRelation('environment.project.team', 'id', $teamId)->whereUuid($request->uuid)->first();
-
         if (! $service) {
             return response()->json(['message' => 'Service not found.'], 404);
         }
 
         $result = $this->upsert_service($request, $service, $teamId);
+        if ($result instanceof \Illuminate\Http\JsonResponse) {
+            return $result;
+        }
 
         return response()->json(serializeApiResponse($result))->setStatusCode(200);
     }