dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

refactor(database): enhance application conversion logic and add existence checks for databases and applications

Browse Source
This commit is contained in:
Andras Bacsai
2025-04-30 18:30:33 +02:00
parent 0a1a403940
commit ed0961e0dc
2 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/Livewire/Project/Service/Database.php
View File

@@ -89,17 +89,17 @@ class Database extends Component
try { try {
$service = $this->database->service; $service = $this->database->service;
$serviceDatabase = $this->database; $serviceDatabase = $this->database;
// Check if application with same name already exists // Check if application with same name already exists
if ($service->applications()->where('name', $serviceDatabase->name)->exists()) { if ($service->applications()->where('name', $serviceDatabase->name)->exists()) {
throw new \Exception('An application with this name already exists.'); throw new \Exception('An application with this name already exists.');
} }
// Create new parameters removing database_uuid // Create new parameters removing database_uuid
$redirectParams = collect($this->parameters) $redirectParams = collect($this->parameters)
->except('database_uuid') ->except('database_uuid')
->all(); ->all();
DB::transaction(function () use ($service, $serviceDatabase) { DB::transaction(function () use ($service, $serviceDatabase) {
$service->applications()->create([ $service->applications()->create([
'name' => $serviceDatabase->name, 'name' => $serviceDatabase->name,
@@ -113,9 +113,7 @@ class Database extends Component
]); ]);
$serviceDatabase->delete(); $serviceDatabase->delete();
}); });
$this->dispatch('success', 'Database converted to Application. Hasta la vista, database!');
return redirect()->route('project.service.configuration', $redirectParams); return redirect()->route('project.service.configuration', $redirectParams);
} catch (\Throwable $e) { } catch (\Throwable $e) {
return handleError($e, $this); return handleError($e, $this);

39
app/Livewire/Project/Service/ServiceApplicationView.php
View File

@@ -79,24 +79,31 @@ class ServiceApplicationView extends Component
try { try {
$service = $this->application->service; $service = $this->application->service;
$serviceApplication = $this->application; $serviceApplication = $this->application;
DB::beginTransaction();
$service->databases()->create([
'name' => $serviceApplication->name,
'human_name' => $serviceApplication->human_name,
'description' => $serviceApplication->description,
'exclude_from_status' => $serviceApplication->exclude_from_status,
'is_log_drain_enabled' => $serviceApplication->is_log_drain_enabled,
'image' => $serviceApplication->image,
'service_id' => $service->id,
'is_migrated' => true,
]);
$serviceApplication->delete();
DB::commit();
return redirect()->route('project.service.configuration', $this->parameters); // Check if database with same name already exists
if ($service->databases()->where('name', $serviceApplication->name)->exists()) {
throw new \Exception('A database with this name already exists.');
}
$redirectParams = collect($this->parameters)
->except('database_uuid')
->all();
DB::transaction(function () use ($service, $serviceApplication) {
$service->databases()->create([
'name' => $serviceApplication->name,
'human_name' => $serviceApplication->human_name,
'description' => $serviceApplication->description,
'exclude_from_status' => $serviceApplication->exclude_from_status,
'is_log_drain_enabled' => $serviceApplication->is_log_drain_enabled,
'image' => $serviceApplication->image,
'service_id' => $service->id,
'is_migrated' => true,
]);
$serviceApplication->delete();
});
return redirect()->route('project.service.configuration', $redirectParams);
} catch (\Throwable $e) { } catch (\Throwable $e) {
DB::rollBack();
return handleError($e, $this); return handleError($e, $this);
} }
} }