Move Membership to data

app/Member/Actions/MemberShowAction.php

@@ -20,12 +20,15 @@ class MemberShowAction
         return [
             'data' => new MemberResource(
                 $member
-                    ->load('memberships')
-                    ->load('invoicePositions.invoice')
-                    ->load('nationality')
-                    ->load('region')
-                    ->load('subscription')
-                    ->load('courses.course')
+                    ->load([
+                        'memberships.activity',
+                        'memberships.subactivity',
+                        'invoicePositions.invoice',
+                        'nationality',
+                        'region',
+                        'subscription',
+                        'courses.course'
+                    ])
             ),
             'meta' => MemberResource::meta(),
         ];

app/Member/Data/ActivityData.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Member\Data;
+
+use Spatie\LaravelData\Data;
+use Spatie\LaravelData\Attributes\MapInputName;
+use Spatie\LaravelData\Attributes\MapOutputName;
+use Spatie\LaravelData\Mappers\SnakeCaseMapper;
+
+#[MapInputName(SnakeCaseMapper::class)]
+#[MapOutputName(SnakeCaseMapper::class)]
+class ActivityData extends Data {
+
+    public function __construct(
+        public int $id,
+        public string $name,
+    ) {}
+
+}

app/Member/Data/GroupData.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Member\Data;
+
+use Spatie\LaravelData\Data;
+use Spatie\LaravelData\Attributes\MapInputName;
+use Spatie\LaravelData\Attributes\MapOutputName;
+use Spatie\LaravelData\Mappers\SnakeCaseMapper;
+
+#[MapInputName(SnakeCaseMapper::class)]
+#[MapOutputName(SnakeCaseMapper::class)]
+class GroupData extends Data {
+
+    public function __construct(
+        public int $id,
+        public string $name,
+    ) {}
+
+}

app/Member/Data/MembershipData.php

@@ -0,0 +1,80 @@
+<?php
+
+namespace App\Member\Data;
+
+use Spatie\LaravelData\Data;
+use Spatie\LaravelData\Attributes\MapInputName;
+use Spatie\LaravelData\Attributes\MapOutputName;
+use Spatie\LaravelData\Mappers\SnakeCaseMapper;
+use Carbon\Carbon;
+use App\Member\Membership;
+use App\Member\Member;
+use App\Activity;
+
+#[MapInputName(SnakeCaseMapper::class)]
+#[MapOutputName(SnakeCaseMapper::class)]
+class MembershipData extends Data
+{
+
+    public function __construct(
+        public int $id,
+        public ActivityData $activity,
+        public SubactivityData $subactivity,
+        public GroupData $group,
+        public Carbon $from,
+        public ?Carbon $promisedAt,
+        public bool $isActive,
+    ) {}
+
+    public static function fromModel(Membership $membership)
+    {
+        return static::factory()->withoutMagicalCreation()->from([
+            'id' => $membership->id,
+            'activity' => $membership->activity,
+            'subactivity' => $membership->subactivity,
+            'is_active' => $membership->isActive(),
+            'from' => $membership->from,
+            'group' => $membership->group,
+            'promised_at' => $membership->promised_at,
+        ]);
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    public function with(): array
+    {
+        return [
+            'human_date' => $this->from->format('d.m.Y'),
+            'promised_at_human' => $this->promisedAt?->format('d.m.Y'),
+            'promised_at' => $this->promisedAt?->format('Y-m-d'),
+            'links' => [
+                'update' => route('membership.update', ['membership' => $this->id]),
+                'destroy' => route('membership.destroy', ['membership' => $this->id]),
+            ]
+        ];
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    public static function memberMeta(Member $member): array
+    {
+        $activities = Activity::with('subactivities')->get();
+
+        return [
+            'links' => [
+                'store' => route('member.membership.store', ['member' => $member]),
+            ],
+            'groups' => NestedGroup::cacheForSelect(),
+            'activities' => $activities->map(fn($activity) => ['id' => $activity->id, 'name' => $activity->name]),
+            'subactivities' => $activities->mapWithKeys(fn($activity) => [$activity->id => $activity->subactivities->map(fn($subactivity) => ['id' => $subactivity->id, 'name' => $subactivity->name, 'is_age_group' => $subactivity->is_age_group])]),
+            'default' => [
+                'group_id' => $member->group_id,
+                'activity_id' => null,
+                'subactivity_id' => null,
+                'promised_at' => null,
+            ],
+        ];
+    }
+}

app/Member/Data/SubactivityData.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Member\Data;
+
+use Spatie\LaravelData\Data;
+use Spatie\LaravelData\Attributes\MapInputName;
+use Spatie\LaravelData\Attributes\MapOutputName;
+use Spatie\LaravelData\Mappers\SnakeCaseMapper;
+
+#[MapInputName(SnakeCaseMapper::class)]
+#[MapOutputName(SnakeCaseMapper::class)]
+class SubactivityData extends Data {
+
+    public function __construct(
+        public int $id,
+        public string $name,
+    ) {}
+
+}

app/Member/MemberResource.php

@@ -14,7 +14,7 @@ use App\Member\Data\NestedGroup;
 use App\Member\Resources\BankAccountResource;
 use App\Member\Resources\NationalityResource;
 use App\Member\Resources\RegionResource;
-use App\Membership\MembershipResource;
+use App\Member\Data\MembershipData;
 use App\Nationality;
 use App\Payment\Subscription;
 use App\Payment\SubscriptionResource;
@@ -75,7 +75,7 @@ class MemberResource extends JsonResource
             'pending_payment' => $this->pending_payment ? number_format($this->pending_payment / 100, 2, ',', '.') . ' €' : null,
             'age_group_icon' => $this->ageGroupMemberships->first()?->subactivity->slug,
             'courses' => CourseMemberResource::collection($this->whenLoaded('courses')),
-            'memberships' => MembershipResource::collection($this->whenLoaded('memberships')),
+            'memberships' => $this->relationLoaded('memberships') ? MembershipData::collect($this->memberships) : null,
             'invoicePositions' => InvoicePositionResource::collection($this->whenLoaded('invoicePositions')),
             'nationality' => new NationalityResource($this->whenLoaded('nationality')),
             'region' => new RegionResource($this->whenLoaded('region')),

app/Membership/Actions/IndexAction.php

@@ -4,10 +4,10 @@ namespace App\Membership\Actions;
 
 use App\Member\Member;
 use App\Member\Membership;
-use App\Membership\MembershipResource;
 use Illuminate\Database\Eloquent\Collection;
-use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
 use Lorisleiva\Actions\Concerns\AsAction;
+use App\Member\Data\MembershipData;
+use Illuminate\Http\JsonResponse;
 
 class IndexAction
 {
@@ -21,11 +21,11 @@ class IndexAction
         return $member->memberships;
     }
 
-    public function asController(Member $member): AnonymousResourceCollection
+    public function asController(Member $member): JsonResponse
     {
-        return MembershipResource::collection($this->handle($member))
-            ->additional([
-                'meta' => MembershipResource::memberMeta($member)
+        return response()->json([
+            'data' => MembershipData::collect($this->handle($member)),
+            'meta' => MembershipData::memberMeta($member),
         ]);
     }
 }

app/Membership/MembershipResource.php

@@ -1,64 +0,0 @@
-<?php
-
-namespace App\Membership;
-
-use App\Activity;
-use App\Lib\HasMeta;
-use App\Member\Data\NestedGroup;
-use App\Member\Member;
-use Illuminate\Http\Resources\Json\JsonResource;
-
-/**
- * @mixin \App\Member\Membership
- */
-class MembershipResource extends JsonResource
-{
-    /**
-     * Transform the resource into an array.
-     *
-     * @param \Illuminate\Http\Request $request
-     *
-     * @return array
-     */
-    public function toArray($request)
-    {
-        return [
-            'id' => $this->id,
-            'group_id' => $this->group_id,
-            'activity_id' => $this->activity_id,
-            'activity_name' => $this->activity->name,
-            'subactivity_id' => $this->subactivity_id,
-            'subactivity_name' => $this->subactivity?->name,
-            'human_date' => $this->from->format('d.m.Y'),
-            'promised_at' => $this->promised_at?->format('Y-m-d'),
-            'is_active' => $this->isActive(),
-            'links' => [
-                'update' => route('membership.update', ['membership' => $this->getModel()]),
-                'destroy' => route('membership.destroy', ['membership' => $this->getModel()]),
-            ]
-        ];
-    }
-
-    /**
-     * @return array<string, mixed>
-     */
-    public static function memberMeta(Member $member): array
-    {
-        $activities = Activity::with('subactivities')->get();
-
-        return [
-            'links' => [
-                'store' => route('member.membership.store', ['member' => $member]),
-            ],
-            'groups' => NestedGroup::cacheForSelect(),
-            'activities' => $activities->map(fn ($activity) => ['id' => $activity->id, 'name' => $activity->name]),
-            'subactivities' => $activities->mapWithKeys(fn ($activity) => [$activity->id => $activity->subactivities->map(fn ($subactivity) => ['id' => $subactivity->id, 'name' => $subactivity->name, 'is_age_group' => $subactivity->is_age_group])]),
-            'default' => [
-                'group_id' => $member->group_id,
-                'activity_id' => null,
-                'subactivity_id' => null,
-                'promised_at' => null,
-            ],
-        ];
-    }
-}

tests/Feature/Member/ShowTest.php

@@ -118,12 +118,19 @@ class ShowTest extends TestCase
             ],
         ], $response, 'data');
         $this->assertInertiaHas([
-            'activity_name' => '€ LeiterIn',
-            'subactivity_name' => 'Jungpfadfinder',
             'id' => $member->memberships->first()->id,
             'human_date' => '19.11.2022',
             'promised_at' => now()->format('Y-m-d'),
+            'activity' => [
+                'name' => '€ LeiterIn',
+                'id' => $member->memberships->first()->activity->id,
+            ],
+            'subactivity' => [
+                'name' => 'Jungpfadfinder',
+                'id' => $member->memberships->first()->subactivity->id,
+            ]
         ], $response, 'data.memberships.0');
+
         $this->assertInertiaHas([
             'organizer' => 'DPSG',
             'event_name' => 'Wochenende',

tests/Feature/Membership/IndexTest.php

@@ -28,12 +28,12 @@ class IndexTest extends TestCase
         $membership = $member->memberships->first();
 
         $this->get("/member/{$member->id}/membership")
-            ->assertJsonPath('data.0.activity_id', $membership->activity_id)
-            ->assertJsonPath('data.0.subactivity_id', $membership->subactivity_id)
-            ->assertJsonPath('data.0.activity_name', '€ Mitglied')
-            ->assertJsonPath('data.0.subactivity_name', 'Wölfling')
+            ->assertJsonPath('data.0.activity.id', $membership->activity_id)
+            ->assertJsonPath('data.0.subactivity.id', $membership->subactivity_id)
+            ->assertJsonPath('data.0.activity.name', '€ Mitglied')
+            ->assertJsonPath('data.0.subactivity.name', 'Wölfling')
             ->assertJsonPath('data.0.human_date', '02.11.2022')
-            ->assertJsonPath('data.0.group_id', $group->id)
+            ->assertJsonPath('data.0.group.id', $group->id)
             ->assertJsonPath('data.0.id', $membership->id)
             ->assertJsonPath('data.0.links.update', route('membership.update', ['membership' => $membership]))
             ->assertJsonPath('data.0.links.destroy', route('membership.destroy', ['membership' => $membership]))