From 61a54afe2be25ac49501196927a96783370a07a2 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com>
Date: Mon, 23 Feb 2026 13:23:12 +0100
Subject: [PATCH] fix(service): resolve team lookup via service relationship

Update service application/database team accessors to traverse the service relation chain and add coverage to prevent null team regressions.
---
 app/Models/ServiceApplication.php         |  2 +-
 app/Models/ServiceDatabase.php            |  2 +-
 tests/Feature/ServiceDatabaseTeamTest.php | 77 +++++++++++++++++++++++
 3 files changed, 79 insertions(+), 2 deletions(-)
 create mode 100644 tests/Feature/ServiceDatabaseTeamTest.php

diff --git a/app/Models/ServiceApplication.php b/app/Models/ServiceApplication.php
index 7b8b46812..4bf78085e 100644
--- a/app/Models/ServiceApplication.php
+++ b/app/Models/ServiceApplication.php
@@ -88,7 +88,7 @@ public function type()
 
     public function team()
     {
-        return data_get($this, 'environment.project.team');
+        return data_get($this, 'service.environment.project.team');
     }
 
     public function workdir()
diff --git a/app/Models/ServiceDatabase.php b/app/Models/ServiceDatabase.php
index f6a39cfe4..7b0abe59e 100644
--- a/app/Models/ServiceDatabase.php
+++ b/app/Models/ServiceDatabase.php
@@ -124,7 +124,7 @@ public function getServiceDatabaseUrl()
 
     public function team()
     {
-        return data_get($this, 'environment.project.team');
+        return data_get($this, 'service.environment.project.team');
     }
 
     public function workdir()
diff --git a/tests/Feature/ServiceDatabaseTeamTest.php b/tests/Feature/ServiceDatabaseTeamTest.php
new file mode 100644
index 000000000..97bb0fd2a
--- /dev/null
+++ b/tests/Feature/ServiceDatabaseTeamTest.php
@@ -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);
+});