app/Member/MemberRequest.php

@@ -95,19 +95,14 @@ class MemberRequest extends FormRequest
         $member->updatePhoneNumbers()->save();
 
         if ($this->input('has_nami')) {
-            $this->storeFreshMemberInNami($member);
-        }
-        ResyncAction::dispatch();
-    }
-
-    protected function storeFreshMemberInNami(Member $member): void
-    {
             NamiPutMemberAction::run(
-            $member->fresh(),
+                $member,
                 Activity::findOrFail($this->input('first_activity_id')),
                 Subactivity::find($this->input('first_subactivity_id')),
             );
         }
+        ResyncAction::dispatch();
+    }
 
     public function persistUpdate(Member $member): void
     {
@@ -118,7 +113,7 @@ class MemberRequest extends FormRequest
         $member->save();
 
         if ($this->input('has_nami') && null === $member->nami_id) {
-            $this->storeFreshMemberInNami($member);
+            NamiPutMemberAction::run($member->fresh(), null, null);
         }
         if ($this->input('has_nami') && null !== $member->nami_id && $namiSync) {
             NamiPutMemberAction::run($member->fresh(), null, null);
@@ -137,11 +132,9 @@ class MemberRequest extends FormRequest
         $this->namiIfElse($validator, 'zip', 'required|numeric');
         $this->namiIfElse($validator, 'location', 'required|max:255');
         $this->namiIfElse($validator, 'joined_at', 'date|required');
-        $this->namiIfStoring($validator, 'first_activity_id', 'required|exclude|exists:activities,id');
-        $this->namiIfStoring($validator, 'first_subactivity_id', 'required|exclude|exists:subactivities,id');
     }
 
-    private function namiIfElse(Validator $validator, string $attribute, string $rules): void
+    public function namiIfElse(Validator $validator, string $attribute, string $rules): void
     {
         $request = request();
         $when = fn () => true === $request->input('has_nami');
@@ -149,13 +142,4 @@ class MemberRequest extends FormRequest
         $validator->sometimes($attribute, $rules, $when);
         $validator->sometimes($attribute, 'present', $notWhen);
     }
-
-    private function namiIfStoring(Validator $validator, string $attribute, string $rules): void
-    {
-        $request = request();
-        /** @var Member */
-        $member = request()->route('member');
-        $when = fn () => true === $request->input('has_nami') && (!$member || !$member->has_nami);
-        $validator->sometimes($attribute, $rules, $when);
-    }
 }

packages/laravel-nami

@@ -1 +1 @@
-Subproject commit b8164cd3d204412cd3be95cbf29b9fcc3d23a77d
+Subproject commit dfd3fbb6eec0493e6c89b7f42722a6141acf6695

resources/js/views/member/VForm.vue

@@ -77,8 +77,7 @@
                             label="Eintrittsdatum" size="sm" required></f-text>
                         <f-textarea id="comment" v-model="inner.comment" rows="3" class="col-span-2" label="Kommentar"
                             size="sm"></f-textarea>
-                        <div v-if="mode === 'create' || (original.has_nami === false && inner.has_nami === true)"
-                            class="contents">
+                        <div v-if="mode === 'create'" class="contents">
                             <f-select id="first_activity_id" v-model="inner.first_activity_id"
                                 :options="meta.formCreateActivities" label="Erste Tätigkeit" name="first_activity_id"
                                 size="sm" required></f-select>
@@ -164,7 +163,6 @@ export default {
     },
     data: function () {
         return {
-            original: { ...this.data },
             inner: { ...this.data },
             active: 0,
         };

resources/lang/de/validation.php

@@ -188,7 +188,6 @@ return [
         'nationality_id' => 'Staatsangehörigkeit',
         'first_group_id' => 'Erste Untertätigkeit',
         'first_activity_id' => 'Erste Tätigkeit',
-        'first_subactivity_id' => 'Erste Untergliederung',
         'fee_id' => 'Beitragsart',
         'course_id' => 'Baustein',
         'completed_at' => 'Datum',

tests/Feature/Member/NamiPutMemberActionTest.php

@@ -36,7 +36,7 @@ class NamiPutMemberActionTest extends TestCase
         $subscription = Subscription::factory()->create();
         $group = Group::factory()->inNami(55)->create();
         $confession = Confession::factory()->inNami(567)->create(['is_null' => true]);
-        app(MemberFake::class)->stores(55, 993);
+        app(MemberFake::class)->createsSuccessfully(55, 993);
         $activity = Activity::factory()->hasAttached(Subactivity::factory()->name('Biber')->inNami(55))->name('Leiter')->inNami(6)->create();
         $subactivity = $activity->subactivities->first();
 
@@ -51,7 +51,7 @@ class NamiPutMemberActionTest extends TestCase
 
         NamiPutMemberAction::run($member, $activity, $subactivity);
 
-        app(MemberFake::class)->assertStored(55, [
+        app(MemberFake::class)->assertCreated(55, [
             'ersteTaetigkeitId' => 6,
             'ersteUntergliederungId' => 55,
             'konfessionId' => 567,

tests/Feature/Member/StoreTest.php

@@ -2,10 +2,7 @@
 
 namespace Tests\Feature\Member;
 
-use App\Actions\PullMemberAction;
-use App\Actions\PullMembershipsAction;
 use App\Activity;
-use App\Confession;
 use App\Country;
 use App\Fee;
 use App\Gender;
@@ -18,7 +15,6 @@ use App\Subactivity;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Tests\Lib\MergesAttributes;
 use Tests\TestCase;
-use Zoomyboy\LaravelNami\Fakes\MemberFake;
 
 class StoreTest extends TestCase
 {
@@ -27,19 +23,16 @@ class StoreTest extends TestCase
 
     public function testItCanStoreAMember(): void
     {
-        app(MemberFake::class)->stores(55, 103);
         Fee::factory()->create();
         $this->withoutExceptionHandling()->login()->loginNami();
         $country = Country::factory()->create();
         $gender = Gender::factory()->create();
         $region = Region::factory()->create();
         $nationality = Nationality::factory()->create();
-        $activity = Activity::factory()->inNami(89)->create();
-        $subactivity = Subactivity::factory()->inNami(90)->create();
+        $activity = Activity::factory()->create();
+        $subactivity = Subactivity::factory()->create();
         $subscription = Subscription::factory()->create();
-        $confesstion = Confession::factory()->create(['is_null' => true]);
-        PullMemberAction::shouldRun();
-        PullMembershipsAction::shouldRun();
+        NamiPutMemberAction::allowToRun();
 
         $response = $this
             ->from('/member/create')
@@ -82,11 +75,11 @@ class StoreTest extends TestCase
             'salutation' => 'Doktor',
             'comment' => 'Lorem bla',
         ]);
-
-        app(MemberFake::class)->assertStored(55, [
-            'ersteTaetigkeitId' => 89,
-            'ersteUntergliederungId' => 90,
-        ]);
+        NamiPutMemberAction::spy()->shouldHaveReceived('handle')->withArgs(
+            fn (Member $memberParam, Activity $activityParam, Subactivity $subactivityParam) => $memberParam->is($member)
+                && $activityParam->is($activity)
+                && $subactivityParam->is($subactivity)
+        )->once();
     }
 
     public function testItCanStoreAMemberWithoutNami(): void

tests/Feature/Member/UpdateTest.php

@@ -2,8 +2,6 @@
 
 namespace Tests\Feature\Member;
 
-use App\Actions\PullMemberAction;
-use App\Actions\PullMembershipsAction;
 use App\Activity;
 use App\Confession;
 use App\Country;
@@ -17,7 +15,6 @@ use App\Subactivity;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Support\Facades\Http;
 use Tests\TestCase;
-use Zoomyboy\LaravelNami\Fakes\MemberFake;
 
 class UpdateTest extends TestCase
 {
@@ -108,50 +105,6 @@ class UpdateTest extends TestCase
         $this->assertEquals('englisch', $member->fresh()->other_country);
     }
 
-    public function testItCreatesMemberWithFirstActivityId(): void
-    {
-        $this->login()->loginNami()->withoutExceptionHandling();
-        $member = Member::factory()->defaults()->create();
-        app(MemberFake::class)->stores($member->group->nami_id, 103);
-        $activity = Activity::factory()->inNami(89)->create();
-        $subactivity = Subactivity::factory()->inNami(90)->create();
-        Confession::factory()->create(['is_null' => true]);
-        PullMemberAction::shouldRun();
-        PullMembershipsAction::shouldRun();
-
-        $this->patch("/member/{$member->id}", [
-            ...$member->getAttributes(),
-            'has_nami' => true,
-            'first_activity_id' => $activity->id,
-            'first_subactivity_id' => $subactivity->id,
-        ])->assertSessionHasNoErrors();
-
-        app(MemberFake::class)->assertStored($member->group->nami_id, [
-            'ersteTaetigkeitId' => 89,
-            'ersteUntergliederungId' => 90,
-        ]);
-    }
-
-    public function testItRequiresFirstActivityId(): void
-    {
-        $this->login()->loginNami();
-        $member = Member::factory()->defaults()->create();
-        app(MemberFake::class)->stores($member->group->nami_id, 103);
-        Confession::factory()->create(['is_null' => true]);
-        PullMemberAction::shouldRun();
-        PullMembershipsAction::shouldRun();
-
-        $this->patch("/member/{$member->id}", [
-            ...$member->getAttributes(),
-            'has_nami' => true,
-            'first_activity_id' => null,
-            'first_subactivity_id' => null,
-        ])->assertSessionHasErrors([
-            'first_activity_id' => 'Erste Tätigkeit ist erforderlich.',
-            'first_subactivity_id' => 'Erste Untergliederung ist erforderlich.',
-        ]);
-    }
-
     public function testItUpdatesCriminalRecord(): void
     {
         $this->withoutExceptionHandling()->login()->loginNami();