Skip to content

An open-source, self-hostable PaaS alternative to Vercel, Heroku & Netlify that lets you easily deploy static sites, databases, full-stack applications and 360+ one-click services on your own servers.

feat(compose-preview): populate fqdn from docker_compose_domains

Andras Bacsaic39a287b47a7
diff --git a/app/Models/ApplicationPreview.php b/app/Models/ApplicationPreview.php
index 7373fdb162..3b7bf3030d 100644
--- a/app/Models/ApplicationPreview.php
+++ b/app/Models/ApplicationPreview.php
@@ -166,6 +166,16 @@ class ApplicationPreview extends BaseModel
}
$this->docker_compose_domains = json_encode($docker_compose_domains);
+
+ // Populate fqdn from generated domains so webhook notifications can read it
+ $allDomains = collect($docker_compose_domains)
+ ->pluck('domain')
+ ->filter(fn ($d) => ! empty($d))
+ ->flatMap(fn ($d) => explode(',', $d))
+ ->implode(',');
+
+ $this->fqdn = ! empty($allDomains) ? $allDomains : null;
+
$this->save();
}
}
diff --git a/tests/Feature/ComposePreviewFqdnTest.php b/tests/Feature/ComposePreviewFqdnTest.php
new file mode 100644
index 0000000000..c62f905d68
--- /dev/null
+++ b/tests/Feature/ComposePreviewFqdnTest.php
@@ -0,0 +1,77 @@
+<?php
+
+use App\Models\Application;
+use App\Models\ApplicationPreview;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+
+uses(RefreshDatabase::class);
+
+it('populates fqdn from docker_compose_domains after generate_preview_fqdn_compose', function () {
+ $application = Application::factory()->create([
+ 'build_pack' => 'dockercompose',
+ 'docker_compose_domains' => json_encode([
+ 'web' => ['domain' => 'https://example.com'],
+ ]),
+ ]);
+
+ $preview = ApplicationPreview::create([
+ 'application_id' => $application->id,
+ 'pull_request_id' => 42,
+ 'docker_compose_domains' => $application->docker_compose_domains,
+ ]);
+
+ $preview->generate_preview_fqdn_compose();
+
+ $preview->refresh();
+
+ expect($preview->fqdn)->not->toBeNull();
+ expect($preview->fqdn)->toContain('42');
+ expect($preview->fqdn)->toContain('example.com');
+});
+
+it('populates fqdn with multiple domains from multiple services', function () {
+ $application = Application::factory()->create([
+ 'build_pack' => 'dockercompose',
+ 'docker_compose_domains' => json_encode([
+ 'web' => ['domain' => 'https://web.example.com'],
+ 'api' => ['domain' => 'https://api.example.com'],
+ ]),
+ ]);
+
+ $preview = ApplicationPreview::create([
+ 'application_id' => $application->id,
+ 'pull_request_id' => 7,
+ 'docker_compose_domains' => $application->docker_compose_domains,
+ ]);
+
+ $preview->generate_preview_fqdn_compose();
+
+ $preview->refresh();
+
+ expect($preview->fqdn)->not->toBeNull();
+ $domains = explode(',', $preview->fqdn);
+ expect($domains)->toHaveCount(2);
+ expect($preview->fqdn)->toContain('web.example.com');
+ expect($preview->fqdn)->toContain('api.example.com');
+});
+
+it('sets fqdn to null when no domains are configured', function () {
+ $application = Application::factory()->create([
+ 'build_pack' => 'dockercompose',
+ 'docker_compose_domains' => json_encode([
+ 'web' => ['domain' => ''],
+ ]),
+ ]);
+
+ $preview = ApplicationPreview::create([
+ 'application_id' => $application->id,
+ 'pull_request_id' => 99,
+ 'docker_compose_domains' => $application->docker_compose_domains,
+ ]);
+
+ $preview->generate_preview_fqdn_compose();
+
+ $preview->refresh();
+
+ expect($preview->fqdn)->toBeNull();
+});