resources er uit gesloopt

app/Concerns/SerializesIdToUuid.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Concerns;
+
+trait SerializesIdToUuid
+{
+    /**
+     * Convert the model's attributes to an array.
+     * Overrides the default model toArray method to replace 'id' with 'uuid'.
+     *
+     * @return array<string, mixed>
+     */
+    public function toArray(): array
+    {
+        $array = parent::toArray();
+
+        if (isset($this->uuid)) {
+            $array['id'] = $this->uuid;
+        }
+
+        return $array;
+    }
+}

app/Http/Controllers/DynamicController.php

@@ -3,10 +3,6 @@
 namespace App\Http\Controllers;
 
 use App\Http\Requests\UpdateDynamicRequest;
-use App\Http\Resources\DynamicResource;
-use App\Http\Resources\LedgerResource;
-use App\Http\Resources\MessageResource;
-use App\Http\Resources\UserResource;
 use App\Models\Dynamic;
 use App\Services\ActivityService;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
@@ -23,7 +19,7 @@ class DynamicController extends Controller
     public function index(Request $request)
     {
         return Inertia::render('Dynamics/Index', [
-            'dynamics' => DynamicResource::collection($request->user()->dynamics()->get()),
+            'dynamics' => $request->user()->dynamics()->get(),
         ]);
     }
 
@@ -59,10 +55,10 @@ class DynamicController extends Controller
         $dynamic->load(['ledgers.media', 'participants', 'chat']);
 
         return Inertia::render('Dynamics/Show', [
-            'dynamic' => new DynamicResource($dynamic),
+            'dynamic' => $dynamic,
-            'ledgers' => LedgerResource::collection($dynamic->ledgers),
+            'ledgers' => $dynamic->ledgers,
-            'participants' => UserResource::collection($dynamic->participants),
+            'participants' => $dynamic->participants,
-            'messages' => MessageResource::collection($dynamic->chat->messages()->with(['user', 'media'])->latest()->paginate(\App\Models\Message::PAGINATION_COUNT)),
+            'messages' => $dynamic->chat->messages()->with(['user', 'media'])->latest()->paginate(\App\Models\Message::PAGINATION_COUNT),
             'can' => [
                 'update' => $request->user()->can('update', $dynamic),
             ],
@@ -73,7 +69,7 @@ class DynamicController extends Controller
     {
         $this->authorize('view', $dynamic);
 
-        return MessageResource::collection($dynamic->chat->messages()->with(['user', 'media'])->latest()->paginate(\App\Models\Message::PAGINATION_COUNT));
+        return $dynamic->chat->messages()->with(['user', 'media'])->latest()->paginate(\App\Models\Message::PAGINATION_COUNT);
     }
 
     /**
@@ -84,7 +80,7 @@ class DynamicController extends Controller
         $this->authorize('update', $dynamic);
 
         return Inertia::render('Dynamics/Settings', [
-            'dynamic' => new DynamicResource($dynamic),
+            'dynamic' => $dynamic,
         ]);
     }
 

app/Http/Controllers/LedgerController.php

@@ -3,11 +3,6 @@
 namespace App\Http\Controllers;
 
 use App\Http\Requests\StoreLedgerRequest;
-use App\Http\Resources\DynamicResource;
-use App\Http\Resources\LedgerResource;
-use App\Http\Resources\MessageResource;
-use App\Http\Resources\MutationResource;
-use App\Http\Resources\UserResource;
 use App\Models\Dynamic;
 use App\Models\Ledger;
 use App\Services\ActivityService;
@@ -35,7 +30,7 @@ class LedgerController extends Controller
         $this->authorize('update', $dynamic);
 
         return Inertia::render('Ledgers/Create', [
-            'dynamic' => new DynamicResource($dynamic),
+            'dynamic' => $dynamic,
         ]);
     }
 
@@ -83,9 +78,9 @@ class LedgerController extends Controller
         ]);
 
         return Inertia::render('Ledgers/Show', [
-            'dynamic' => new DynamicResource($dynamic),
+            'dynamic' => $dynamic,
-            'ledger' => new LedgerResource($ledger),
+            'ledger' => $ledger,
-            'messages' => MessageResource::collection($dynamic->getOrCreateChat()->messages()->with(['user', 'media'])->latest()->paginate(\App\Models\Message::PAGINATION_COUNT)),
+            'messages' => $dynamic->getOrCreateChat()->messages()->with(['user', 'media'])->latest()->paginate(\App\Models\Message::PAGINATION_COUNT),
             'can' => [
                 'update' => $request->user()->can('update', $ledger),
                 'close' => $request->user()->can('close', $ledger),
@@ -97,7 +92,7 @@ class LedgerController extends Controller
     {
         $this->authorize('view', $ledger);
 
-        return MessageResource::collection($dynamic->getOrCreateChat()->messages()->with(['user', 'media'])->latest()->paginate(\App\Models\Message::PAGINATION_COUNT));
+        return $dynamic->getOrCreateChat()->messages()->with(['user', 'media'])->latest()->paginate(\App\Models\Message::PAGINATION_COUNT);
     }
 
     /**
@@ -108,8 +103,8 @@ class LedgerController extends Controller
         $this->authorize('update', $ledger);
 
         return Inertia::render('Ledgers/Edit', [
-            'dynamic' => new DynamicResource($dynamic),
+            'dynamic' => $dynamic,
-            'ledger' => new LedgerResource($ledger),
+            'ledger' => $ledger,
         ]);
     }
 

app/Http/Controllers/MutationController.php

@@ -6,7 +6,6 @@ use App\Events\MessageSent;
 use App\Events\MutationCreated;
 use App\Events\MutationUpdated;
 use App\Http\Requests\StoreMutationRequest;
-use App\Http\Resources\MutationResource;
 use App\Models\Dynamic;
 use App\Models\Ledger;
 use App\Models\Mutation;
@@ -81,7 +80,7 @@ class MutationController extends Controller
     {
         $this->authorize('view', $mutation);
 
-        return new MutationResource($mutation);
+        return $mutation;
     }
 
     /**

app/Http/Controllers/ParticipantController.php

@@ -2,7 +2,6 @@
 
 namespace App\Http\Controllers;
 
-use App\Http\Resources\DynamicResource;
 use App\Models\Dynamic;
 use App\Models\User;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
@@ -45,9 +44,9 @@ class ParticipantController extends Controller
             ->get();
 
         return Inertia::render('Dynamics/Participants/Show', [
-            'dynamic' => new DynamicResource($dynamic),
+            'dynamic' => $dynamic,
             'participant' => [
-                'id' => $user->id,
+                'id' => $user->uuid,
                 'name' => $user->name,
                 'display_name' => $participant->pivot->display_name,
                 'role' => $participant->pivot->role,

app/Http/Resources/BaseResource.php

@@ -1,25 +0,0 @@
-<?php
-
-namespace App\Http\Resources;
-
-use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\JsonResource;
-
-class BaseResource extends JsonResource
-{
-    /**
-     * Transform the resource into an array.
-     *
-     * @return array<string, mixed>
-     */
-    public function toArray(Request $request): array
-    {
-        $data = parent::toArray($request);
-
-        if (isset($data['id']) && isset($this->uuid)) {
-            $data['id'] = $this->uuid;
-        }
-
-        return $data;
-    }
-}

app/Http/Resources/ChatResource.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Http\Resources;
-
-use Illuminate\Http\Request;
-
-class ChatResource extends BaseResource
-{
-    /**
-     * Transform the resource into an array.
-     *
-     * @return array<string, mixed>
-     */
-    public function toArray(Request $request): array
-    {
-        $data = parent::toArray($request);
-
-        if ($this->whenLoaded('messages')) {
-            $data['messages'] = MessageResource::collection($this->messages);
-        }
-
-        return $data;
-    }
-}

app/Http/Resources/DynamicResource.php

@@ -1,28 +0,0 @@
-<?php
-
-namespace App\Http\Resources;
-
-use Illuminate\Http\Request;
-
-class DynamicResource extends BaseResource
-{
-    /**
-     * Transform the resource into an array.
-     *
-     * @return array<string, mixed>
-     */
-    public function toArray(Request $request): array
-    {
-        $result = parent::toArray($request);
-        if ($this->ledgers) {
-            $result['ledgers'] = LedgerResource::collection($this->ledgers);
-        }
-        if ($this->whenLoaded('participants')) {
-            $result['participants'] = ParticipantResource::collection($this->participants);
-        }
-        if ($this->whenLoaded('chat')) {
-            $result['chat'] = new ChatResource($this->chat);
-        }
-        return $result;
-    }
-}

app/Http/Resources/LedgerResource.php

@@ -1,22 +0,0 @@
-<?php
-
-namespace App\Http\Resources;
-
-use Illuminate\Http\Request;
-
-class LedgerResource extends BaseResource
-{
-    /**
-     * Transform the resource into an array.
-     *
-     * @return array<string, mixed>
-     */
-    public function toArray(Request $request): array
-    {
-        $data = parent::toArray($request);
-
-        $data['mutations'] = MutationResource::collection($this->whenLoaded('mutations'));
-
-        return $data;
-    }
-}

app/Http/Resources/MessageResource.php

@@ -1,18 +0,0 @@
-<?php
-
-namespace App\Http\Resources;
-
-use Illuminate\Http\Request;
-
-class MessageResource extends BaseResource
-{
-    /**
-     * Transform the resource into an array.
-     *
-     * @return array<string, mixed>
-     */
-    public function toArray(Request $request): array
-    {
-        return parent::toArray($request);
-    }
-}

app/Http/Resources/MutationResource.php

@@ -1,25 +0,0 @@
-<?php
-
-namespace App\Http\Resources;
-
-use Illuminate\Http\Request;
-
-class MutationResource extends BaseResource
-{
-    /**
-     * Transform the resource into an array.
-     *
-     * @return array<string, mixed>
-     */
-    public function toArray(Request $request): array
-    {
-        $data = parent::toArray($request);
-
-        $data['can'] = [
-            'update' => $request->user()?->can('update', $this->resource) ?? false,
-            'void' => $request->user()?->can('void', $this->resource) ?? false,
-        ];
-
-        return $data;
-    }
-}

app/Http/Resources/ParticipantResource.php

@@ -1,18 +0,0 @@
-<?php
-
-namespace App\Http\Resources;
-
-use Illuminate\Http\Request;
-
-class ParticipantResource extends BaseResource
-{
-    /**
-     * Transform the resource into an array.
-     *
-     * @return array<string, mixed>
-     */
-    public function toArray(Request $request): array
-    {
-        return parent::toArray($request);
-    }
-}

app/Http/Resources/PredefinedMutationResource.php

@@ -1,18 +0,0 @@
-<?php
-
-namespace App\Http\Resources;
-
-use Illuminate\Http\Request;
-
-class PredefinedMutationResource extends BaseResource
-{
-    /**
-     * Transform the resource into an array.
-     *
-     * @return array<string, mixed>
-     */
-    public function toArray(Request $request): array
-    {
-        return parent::toArray($request);
-    }
-}

app/Http/Resources/UserResource.php

@@ -1,18 +0,0 @@
-<?php
-
-namespace App\Http\Resources;
-
-use Illuminate\Http\Request;
-
-class UserResource extends BaseResource
-{
-    /**
-     * Transform the resource into an array.
-     *
-     * @return array<string, mixed>
-     */
-    public function toArray(Request $request): array
-    {
-        return parent::toArray($request);
-    }
-}

app/Models/Dynamic.php

@@ -10,11 +10,12 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\MorphOne;
 use Illuminate\Support\Str;
 use App\Models\Chat;
+use App\Concerns\SerializesIdToUuid;
 
 class Dynamic extends Model
 {
     /** @use HasFactory<DynamicFactory> */
-    use HasFactory;
+    use HasFactory, SerializesIdToUuid;
 
     protected $fillable = [
         'name',

app/Models/Ledger.php

@@ -9,11 +9,12 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Support\Str;
+use App\Concerns\SerializesIdToUuid;
 
 class Ledger extends Model
 {
     /** @use HasFactory<LedgerFactory> */
-    use HasFactory;
+    use HasFactory, SerializesIdToUuid;
 
     protected $fillable = [
         'dynamic_id',

app/Models/Mutation.php

@@ -10,11 +10,12 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Database\Eloquent\Relations\MorphOne;
 use Illuminate\Support\Str;
+use App\Concerns\SerializesIdToUuid;
 
 class Mutation extends Model
 {
     /** @use HasFactory<MutationFactory> */
-    use HasFactory;
+    use HasFactory, SerializesIdToUuid;
 
     protected $fillable = [
         'ledger_id',
@@ -104,6 +105,16 @@ class Mutation extends Model
         });
     }
 
+    protected $appends = ['can'];
+
+    public function getCanAttribute(): array
+    {
+        return [
+            'update' => auth()->user()?->can('update', $this) ?? false,
+            'void' => auth()->user()?->can('void', $this) ?? false,
+        ];
+    }
+
     public function getRouteKeyName()
     {
         return 'uuid';

app/Models/PredefinedMutation.php

@@ -6,10 +6,11 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Support\Str;
+use App\Concerns\SerializesIdToUuid;
 
 class PredefinedMutation extends Model
 {
-    use HasFactory;
+    use HasFactory, SerializesIdToUuid;
 
     protected $fillable = [
         'ledger_id',

app/Models/User.php

@@ -15,6 +15,7 @@ use Laravel\Fortify\Contracts\PasskeyUser;
 use Laravel\Fortify\PasskeyAuthenticatable;
 use Laravel\Fortify\TwoFactorAuthenticatable;
 use NotificationChannels\WebPush\HasPushSubscriptions;
+use App\Concerns\SerializesIdToUuid;
 
 /**
  * @property int $id
@@ -34,7 +35,7 @@ use NotificationChannels\WebPush\HasPushSubscriptions;
 class User extends Authenticatable implements PasskeyUser
 {
     /** @use HasFactory<UserFactory> */
-    use HasFactory, HasPushSubscriptions, Notifiable, PasskeyAuthenticatable, TwoFactorAuthenticatable;
+    use HasFactory, HasPushSubscriptions, Notifiable, PasskeyAuthenticatable, TwoFactorAuthenticatable, SerializesIdToUuid;
 
     public function dynamics()
     {

tests/Feature/ParticipantDetailTest.php

@@ -21,7 +21,7 @@ test('authenticated participant can view another participant detail page in dyna
     $response->assertInertia(fn ($page) => $page
         ->component('Dynamics/Participants/Show')
         ->has('dynamic')
-        ->where('participant.id', $participant->id)
+        ->where('participant.id', $participant->uuid)
         ->where('participant.name', $participant->name)
         ->where('participant.display_name', null)
         ->where('participant.role', 'participant')

tests/Feature/PredefinedMutationTest.php

@@ -25,8 +25,8 @@ test('owner can view predefined mutations for ledger', function () {
     $response->assertOk();
     $response->assertInertia(fn ($page) => $page
         ->component('Ledgers/PredefinedMutations/Index')
-        ->where('dynamic.id', $dynamic->id)
+        ->where('dynamic.id', $dynamic->uuid)
-        ->where('ledger.id', $ledger->id)
+        ->where('ledger.id', $ledger->uuid)
         ->has('predefined_mutations', 1)
         ->where('predefined_mutations.0.name', 'Weekly Room Cleaning')
     );
@@ -112,7 +112,7 @@ test('owner can view edit form for predefined mutation', function () {
     $response->assertOk();
     $response->assertInertia(fn ($page) => $page
         ->component('Ledgers/PredefinedMutations/Edit')
-        ->where('predefined_mutation.id', $predefined->id)
+        ->where('predefined_mutation.id', $predefined->uuid)
     );
 });