Frontend: - Consolidate duplicate API layers into single src/lib/axios.ts per app - Remove src/lib/api-client.ts and src/utils/api.ts (admin) - Add src/lib/query-client.ts with TanStack Query config per app - Update all imports and auto-import config Backend: - Fix organisations.billing_status default to 'trial' - Fix user_invitations.invited_by_user_id to nullOnDelete - Add MeResource with separated app_roles and pivot-based org roles - Add cross-org check to EventPolicy view() and update() - Restrict EventPolicy create/update to org_admin/event_manager (not org_member) - Attach creator as org_admin on organisation store - Add query scopes to Event and UserInvitation models - Improve factories with Dutch test data - Expand test suite from 29 to 41 tests (90 assertions) Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
58 lines
1.7 KiB
PHP
58 lines
1.7 KiB
PHP
<?php
|
|
|
|
declare(strict_types=1);
|
|
|
|
namespace App\Http\Controllers\Api\V1;
|
|
|
|
use App\Http\Controllers\Controller;
|
|
use App\Http\Requests\Api\V1\StoreOrganisationRequest;
|
|
use App\Http\Requests\Api\V1\UpdateOrganisationRequest;
|
|
use App\Http\Resources\Api\V1\OrganisationResource;
|
|
use App\Models\Organisation;
|
|
use Illuminate\Http\JsonResponse;
|
|
use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
|
|
use Illuminate\Support\Facades\Gate;
|
|
|
|
final class OrganisationController extends Controller
|
|
{
|
|
public function index(): AnonymousResourceCollection
|
|
{
|
|
Gate::authorize('viewAny', Organisation::class);
|
|
|
|
$user = auth()->user();
|
|
|
|
$organisations = $user->hasRole('super_admin')
|
|
? Organisation::query()->paginate()
|
|
: $user->organisations()->paginate();
|
|
|
|
return OrganisationResource::collection($organisations);
|
|
}
|
|
|
|
public function show(Organisation $organisation): JsonResponse
|
|
{
|
|
Gate::authorize('view', $organisation);
|
|
|
|
return $this->success(new OrganisationResource($organisation));
|
|
}
|
|
|
|
public function store(StoreOrganisationRequest $request): JsonResponse
|
|
{
|
|
Gate::authorize('create', Organisation::class);
|
|
|
|
$organisation = Organisation::create($request->validated());
|
|
|
|
$organisation->users()->attach(auth()->id(), ['role' => 'org_admin']);
|
|
|
|
return $this->created(new OrganisationResource($organisation));
|
|
}
|
|
|
|
public function update(UpdateOrganisationRequest $request, Organisation $organisation): JsonResponse
|
|
{
|
|
Gate::authorize('update', $organisation);
|
|
|
|
$organisation->update($request->validated());
|
|
|
|
return $this->success(new OrganisationResource($organisation->fresh()));
|
|
}
|
|
}
|