fix(service): resolve team lookup via service relationship (#8559)
This commit is contained in:
commit
133241bac1
3 changed files with 79 additions and 2 deletions
|
|
@ -88,7 +88,7 @@ public function type()
|
||||||
|
|
||||||
public function team()
|
public function team()
|
||||||
{
|
{
|
||||||
return data_get($this, 'environment.project.team');
|
return data_get($this, 'service.environment.project.team');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function workdir()
|
public function workdir()
|
||||||
|
|
|
||||||
|
|
@ -124,7 +124,7 @@ public function getServiceDatabaseUrl()
|
||||||
|
|
||||||
public function team()
|
public function team()
|
||||||
{
|
{
|
||||||
return data_get($this, 'environment.project.team');
|
return data_get($this, 'service.environment.project.team');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function workdir()
|
public function workdir()
|
||||||
|
|
|
||||||
77
tests/Feature/ServiceDatabaseTeamTest.php
Normal file
77
tests/Feature/ServiceDatabaseTeamTest.php
Normal file
|
|
@ -0,0 +1,77 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
use App\Models\Environment;
|
||||||
|
use App\Models\Project;
|
||||||
|
use App\Models\Service;
|
||||||
|
use App\Models\ServiceApplication;
|
||||||
|
use App\Models\ServiceDatabase;
|
||||||
|
use App\Models\Team;
|
||||||
|
use Illuminate\Foundation\Testing\RefreshDatabase;
|
||||||
|
|
||||||
|
uses(RefreshDatabase::class);
|
||||||
|
|
||||||
|
it('returns the correct team through the service relationship chain', function () {
|
||||||
|
$team = Team::factory()->create();
|
||||||
|
|
||||||
|
$project = Project::create([
|
||||||
|
'uuid' => (string) Illuminate\Support\Str::uuid(),
|
||||||
|
'name' => 'Test Project',
|
||||||
|
'team_id' => $team->id,
|
||||||
|
]);
|
||||||
|
|
||||||
|
$environment = Environment::create([
|
||||||
|
'name' => 'test-env-'.Illuminate\Support\Str::random(8),
|
||||||
|
'project_id' => $project->id,
|
||||||
|
]);
|
||||||
|
|
||||||
|
$service = Service::create([
|
||||||
|
'uuid' => (string) Illuminate\Support\Str::uuid(),
|
||||||
|
'name' => 'supabase',
|
||||||
|
'environment_id' => $environment->id,
|
||||||
|
'destination_id' => 1,
|
||||||
|
'destination_type' => 'App\Models\StandaloneDocker',
|
||||||
|
'docker_compose_raw' => 'version: "3"',
|
||||||
|
]);
|
||||||
|
|
||||||
|
$serviceDatabase = ServiceDatabase::create([
|
||||||
|
'uuid' => (string) Illuminate\Support\Str::uuid(),
|
||||||
|
'name' => 'supabase-db',
|
||||||
|
'service_id' => $service->id,
|
||||||
|
]);
|
||||||
|
|
||||||
|
expect($serviceDatabase->team())->not->toBeNull()
|
||||||
|
->and($serviceDatabase->team()->id)->toBe($team->id);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('returns the correct team for ServiceApplication through the service relationship chain', function () {
|
||||||
|
$team = Team::factory()->create();
|
||||||
|
|
||||||
|
$project = Project::create([
|
||||||
|
'uuid' => (string) Illuminate\Support\Str::uuid(),
|
||||||
|
'name' => 'Test Project',
|
||||||
|
'team_id' => $team->id,
|
||||||
|
]);
|
||||||
|
|
||||||
|
$environment = Environment::create([
|
||||||
|
'name' => 'test-env-'.Illuminate\Support\Str::random(8),
|
||||||
|
'project_id' => $project->id,
|
||||||
|
]);
|
||||||
|
|
||||||
|
$service = Service::create([
|
||||||
|
'uuid' => (string) Illuminate\Support\Str::uuid(),
|
||||||
|
'name' => 'supabase',
|
||||||
|
'environment_id' => $environment->id,
|
||||||
|
'destination_id' => 1,
|
||||||
|
'destination_type' => 'App\Models\StandaloneDocker',
|
||||||
|
'docker_compose_raw' => 'version: "3"',
|
||||||
|
]);
|
||||||
|
|
||||||
|
$serviceApplication = ServiceApplication::create([
|
||||||
|
'uuid' => (string) Illuminate\Support\Str::uuid(),
|
||||||
|
'name' => 'supabase-studio',
|
||||||
|
'service_id' => $service->id,
|
||||||
|
]);
|
||||||
|
|
||||||
|
expect($serviceApplication->team())->not->toBeNull()
|
||||||
|
->and($serviceApplication->team()->id)->toBe($team->id);
|
||||||
|
});
|
||||||
Loading…
Reference in a new issue