feat(organisation): add contact fields to model and API
Add contact_name, contact_email, phone, website columns. Wire the new fields through the Organisation model, update request validation, response resource, and the TypeScript Organisation interface. Needed by the upcoming dashboard + form-builder binding registry. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -23,6 +23,10 @@ final class UpdateOrganisationRequest extends FormRequest
|
|||||||
'sometimes', 'string', 'max:255', 'regex:/^[a-z0-9-]+$/',
|
'sometimes', 'string', 'max:255', 'regex:/^[a-z0-9-]+$/',
|
||||||
Rule::unique('organisations', 'slug')->ignore($this->route('organisation')),
|
Rule::unique('organisations', 'slug')->ignore($this->route('organisation')),
|
||||||
],
|
],
|
||||||
|
'contact_name' => ['sometimes', 'nullable', 'string', 'max:255'],
|
||||||
|
'contact_email' => ['sometimes', 'nullable', 'email', 'max:255'],
|
||||||
|
'phone' => ['sometimes', 'nullable', 'string', 'max:255'],
|
||||||
|
'website' => ['sometimes', 'nullable', 'url', 'max:255'],
|
||||||
'settings' => ['sometimes', 'array'],
|
'settings' => ['sometimes', 'array'],
|
||||||
'email_logo_url' => ['nullable', 'url', 'max:500'],
|
'email_logo_url' => ['nullable', 'url', 'max:500'],
|
||||||
'email_primary_color' => ['nullable', 'string', 'regex:/^#[0-9A-Fa-f]{6}$/'],
|
'email_primary_color' => ['nullable', 'string', 'regex:/^#[0-9A-Fa-f]{6}$/'],
|
||||||
|
|||||||
@@ -15,6 +15,10 @@ final class OrganisationResource extends JsonResource
|
|||||||
'id' => $this->id,
|
'id' => $this->id,
|
||||||
'name' => $this->name,
|
'name' => $this->name,
|
||||||
'slug' => $this->slug,
|
'slug' => $this->slug,
|
||||||
|
'contact_name' => $this->contact_name,
|
||||||
|
'contact_email' => $this->contact_email,
|
||||||
|
'phone' => $this->phone,
|
||||||
|
'website' => $this->website,
|
||||||
'billing_status' => $this->billing_status,
|
'billing_status' => $this->billing_status,
|
||||||
'settings' => $this->settings,
|
'settings' => $this->settings,
|
||||||
'email_logo_url' => $this->email_logo_url,
|
'email_logo_url' => $this->email_logo_url,
|
||||||
|
|||||||
@@ -21,6 +21,10 @@ final class Organisation extends Model
|
|||||||
protected $fillable = [
|
protected $fillable = [
|
||||||
'name',
|
'name',
|
||||||
'slug',
|
'slug',
|
||||||
|
'contact_name',
|
||||||
|
'contact_email',
|
||||||
|
'phone',
|
||||||
|
'website',
|
||||||
'billing_status',
|
'billing_status',
|
||||||
'settings',
|
'settings',
|
||||||
'email_logo_url',
|
'email_logo_url',
|
||||||
|
|||||||
@@ -0,0 +1,27 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
use Illuminate\Support\Facades\Schema;
|
||||||
|
|
||||||
|
return new class extends Migration
|
||||||
|
{
|
||||||
|
public function up(): void
|
||||||
|
{
|
||||||
|
Schema::table('organisations', function (Blueprint $table) {
|
||||||
|
$table->string('contact_name')->nullable()->after('slug');
|
||||||
|
$table->string('contact_email')->nullable()->after('contact_name');
|
||||||
|
$table->string('phone')->nullable()->after('contact_email');
|
||||||
|
$table->string('website')->nullable()->after('phone');
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(): void
|
||||||
|
{
|
||||||
|
Schema::table('organisations', function (Blueprint $table) {
|
||||||
|
$table->dropColumn(['contact_name', 'contact_email', 'phone', 'website']);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
};
|
||||||
@@ -221,4 +221,65 @@ class OrganisationTest extends TestCase
|
|||||||
|
|
||||||
$response->assertForbidden();
|
$response->assertForbidden();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function test_org_admin_can_update_all_contact_fields(): void
|
||||||
|
{
|
||||||
|
$user = User::factory()->create();
|
||||||
|
$org = Organisation::factory()->create();
|
||||||
|
$org->users()->attach($user, ['role' => 'org_admin']);
|
||||||
|
|
||||||
|
Sanctum::actingAs($user);
|
||||||
|
|
||||||
|
$response = $this->putJson("/api/v1/organisations/{$org->id}", [
|
||||||
|
'contact_name' => 'Bert Hausmans',
|
||||||
|
'contact_email' => 'bert@example.com',
|
||||||
|
'phone' => '+31 6 12345678',
|
||||||
|
'website' => 'https://example.com',
|
||||||
|
]);
|
||||||
|
|
||||||
|
$response->assertOk()
|
||||||
|
->assertJson(['data' => [
|
||||||
|
'contact_name' => 'Bert Hausmans',
|
||||||
|
'contact_email' => 'bert@example.com',
|
||||||
|
'phone' => '+31 6 12345678',
|
||||||
|
'website' => 'https://example.com',
|
||||||
|
]]);
|
||||||
|
|
||||||
|
$this->assertDatabaseHas('organisations', [
|
||||||
|
'id' => $org->id,
|
||||||
|
'contact_email' => 'bert@example.com',
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function test_update_returns_422_for_invalid_contact_email(): void
|
||||||
|
{
|
||||||
|
$user = User::factory()->create();
|
||||||
|
$org = Organisation::factory()->create();
|
||||||
|
$org->users()->attach($user, ['role' => 'org_admin']);
|
||||||
|
|
||||||
|
Sanctum::actingAs($user);
|
||||||
|
|
||||||
|
$response = $this->putJson("/api/v1/organisations/{$org->id}", [
|
||||||
|
'contact_email' => 'not-an-email',
|
||||||
|
]);
|
||||||
|
|
||||||
|
$response->assertUnprocessable()
|
||||||
|
->assertJsonValidationErrors(['contact_email']);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function test_update_returns_422_for_invalid_website_url(): void
|
||||||
|
{
|
||||||
|
$user = User::factory()->create();
|
||||||
|
$org = Organisation::factory()->create();
|
||||||
|
$org->users()->attach($user, ['role' => 'org_admin']);
|
||||||
|
|
||||||
|
Sanctum::actingAs($user);
|
||||||
|
|
||||||
|
$response = $this->putJson("/api/v1/organisations/{$org->id}", [
|
||||||
|
'website' => 'not a url',
|
||||||
|
]);
|
||||||
|
|
||||||
|
$response->assertUnprocessable()
|
||||||
|
->assertJsonValidationErrors(['website']);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,10 @@ export interface Organisation {
|
|||||||
id: string
|
id: string
|
||||||
name: string
|
name: string
|
||||||
slug: string
|
slug: string
|
||||||
|
contact_name: string | null
|
||||||
|
contact_email: string | null
|
||||||
|
phone: string | null
|
||||||
|
website: string | null
|
||||||
billing_status: 'trial' | 'active' | 'suspended' | 'cancelled'
|
billing_status: 'trial' | 'active' | 'suspended' | 'cancelled'
|
||||||
settings: Record<string, unknown> | null
|
settings: Record<string, unknown> | null
|
||||||
email_logo_url: string | null
|
email_logo_url: string | null
|
||||||
@@ -23,6 +27,10 @@ export interface OrganisationMember {
|
|||||||
export interface UpdateOrganisationPayload {
|
export interface UpdateOrganisationPayload {
|
||||||
name?: string
|
name?: string
|
||||||
slug?: string
|
slug?: string
|
||||||
|
contact_name?: string | null
|
||||||
|
contact_email?: string | null
|
||||||
|
phone?: string | null
|
||||||
|
website?: string | null
|
||||||
billing_status?: Organisation['billing_status']
|
billing_status?: Organisation['billing_status']
|
||||||
settings?: Record<string, unknown>
|
settings?: Record<string, unknown>
|
||||||
email_logo_url?: string | null
|
email_logo_url?: string | null
|
||||||
|
|||||||
Reference in New Issue
Block a user