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

refactor(databases): streamline backup queries to use team context

Browse Source 
- Updated backup retrieval logic in DatabasesController to utilize the new ownedByCurrentTeam method for improved access control.
- Enhanced code readability and maintainability by centralizing team-based filtering in the ScheduledDatabaseBackup model.
This commit is contained in:
Andras Bacsai
2025-09-22 17:45:37 +02:00
parent 5c6ab50332
commit bb06a74fee
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/Api/DatabasesController.php
View File

@@ -718,7 +718,7 @@ class DatabasesController extends Controller
return response()->json(['message' => 'Database not found.'], 404); return response()->json(['message' => 'Database not found.'], 404);
} }
$backupConfig = ScheduledDatabaseBackup::where('team_id', $teamId)->where('database_id', $database->id) $backupConfig = ScheduledDatabaseBackup::ownedByCurrentTeam()->where('database_id', $database->id)
->where('uuid', $request->scheduled_backup_uuid) ->where('uuid', $request->scheduled_backup_uuid)
->first(); ->first();
if (! $backupConfig) { if (! $backupConfig) {
@@ -1951,7 +1951,7 @@ class DatabasesController extends Controller
} }
// Find the backup configuration by its UUID // Find the backup configuration by its UUID
$backup = ScheduledDatabaseBackup::where('team_id', $teamId)->where('database_id', $database->id) $backup = ScheduledDatabaseBackup::ownedByCurrentTeam()->where('database_id', $database->id)
->where('uuid', $request->scheduled_backup_uuid) ->where('uuid', $request->scheduled_backup_uuid)
->first(); ->first();
@@ -2072,7 +2072,7 @@ class DatabasesController extends Controller
} }
// Find the backup configuration by its UUID // Find the backup configuration by its UUID
$backup = ScheduledDatabaseBackup::where('team_id', $teamId)->where('database_id', $database->id) $backup = ScheduledDatabaseBackup::ownedByCurrentTeam()->where('database_id', $database->id)
->where('uuid', $request->scheduled_backup_uuid) ->where('uuid', $request->scheduled_backup_uuid)
->first(); ->first();
@@ -2180,7 +2180,7 @@ class DatabasesController extends Controller
} }
// Find the backup configuration by its UUID // Find the backup configuration by its UUID
$backup = ScheduledDatabaseBackup::where('team_id', $teamId)->where('database_id', $database->id) $backup = ScheduledDatabaseBackup::ownedByCurrentTeam()->where('database_id', $database->id)
->where('uuid', $request->scheduled_backup_uuid) ->where('uuid', $request->scheduled_backup_uuid)
->first(); ->first();

5
app/Models/ScheduledDatabaseBackup.php
View File

@@ -10,6 +10,11 @@ class ScheduledDatabaseBackup extends BaseModel
{ {
protected $guarded = []; protected $guarded = [];
public static function ownedByCurrentTeam()
{
return ScheduledDatabaseBackup::whereRelation('team', 'id', currentTeam()->id)->orderBy('name');
}
public function team() public function team()
{ {
return $this->belongsTo(Team::class); return $this->belongsTo(Team::class);