@@ -377,11 +377,9 @@ public function create_service(Request $request)
377
377
378
378
return response ()->json (['message ' => 'Service not found. ' , 'valid_service_types ' => $ serviceKeys ], 404 );
379
379
} elseif (filled ($ request ->docker_compose_raw )) {
380
-
381
380
$ service = new Service ;
382
- $ result = $ this ->upsert_service ($ request , $ service , $ teamId );
383
381
384
- return response ()-> json ( serializeApiResponse ( $ result ))-> setStatusCode ( 201 );
382
+ return $ this -> upsert_service ( $ request , $ service , $ teamId , 201 );
385
383
} else {
386
384
return response ()->json (['message ' => 'No service type or docker_compose_raw provided. ' ], 400 );
387
385
}
@@ -613,20 +611,18 @@ public function update_by_uuid(Request $request)
613
611
return response ()->json (['message ' => 'Service not found. ' ], 404 );
614
612
}
615
613
616
- $ result = $ this ->upsert_service ($ request , $ service , $ teamId );
617
-
618
- return response ()->json (serializeApiResponse ($ result ))->setStatusCode (200 );
614
+ return $ this ->upsert_service ($ request , $ service , $ teamId , 200 );
619
615
}
620
616
621
- private function upsert_service (Request $ request , Service $ service , string $ teamId )
617
+ private function upsert_service (Request $ request , Service $ service , string $ teamId, int $ code )
622
618
{
623
619
$ allowedFields = ['name ' , 'description ' , 'project_uuid ' , 'environment_name ' , 'environment_uuid ' , 'server_uuid ' , 'destination_uuid ' , 'instant_deploy ' , 'docker_compose_raw ' , 'connect_to_docker_network ' ];
624
620
$ validator = customApiValidator ($ request ->all (), [
625
621
'project_uuid ' => 'string|required ' ,
626
622
'environment_name ' => 'string|nullable ' ,
627
623
'environment_uuid ' => 'string|nullable ' ,
628
624
'server_uuid ' => 'string|required ' ,
629
- 'destination_uuid ' => 'string ' ,
625
+ 'destination_uuid ' => 'string|nullable ' ,
630
626
'name ' => 'string|max:255 ' ,
631
627
'description ' => 'string|nullable ' ,
632
628
'instant_deploy ' => 'boolean ' ,
@@ -724,10 +720,10 @@ private function upsert_service(Request $request, Service $service, string $team
724
720
return $ domain ;
725
721
})->values ();
726
722
727
- return [
723
+ return response ()-> json ( [
728
724
'uuid ' => $ service ->uuid ,
729
725
'domains ' => $ domains ,
730
- ];
726
+ ])-> setStatusCode ( $ code ) ;
731
727
}
732
728
733
729
#[OA \Get(
0 commit comments