Fixed: Create member

.env.example

@@ -47,6 +47,7 @@ PUSHER_APP_SECRET=
 PUSHER_APP_CLUSTER=mt1
 
 NAMI_MGLNR=-1
+NAMI_GROUP=-1
 NAMI_PASSWORD=password
 
 MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"

app/Member/CreateJob.php

@@ -5,13 +5,13 @@ namespace App\Member;
 use App\Activity;
 use App\Confession;
 use App\Group;
+use App\Setting\NamiSettings;
 use App\Subactivity;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
-use Zoomyboy\LaravelNami\Nami;
 
 class CreateJob implements ShouldQueue
 {
@@ -21,12 +21,10 @@ class CreateJob implements ShouldQueue
     use SerializesModels;
 
     public int $memberId;
-    public Member $member;
 
     public function __construct(Member $member)
     {
         $this->memberId = $member->id;
-        $this->user = $user;
     }
 
     /**
@@ -34,50 +32,49 @@ class CreateJob implements ShouldQueue
      *
      * @return void
      */
-    public function handle()
+    public function handle(NamiSettings $settings)
     {
-        $this->member = Member::find($this->memberId);
-
-        if ($this->member->hasNami) {
+        $member = Member::findOrFail($this->memberId);
+        if ($member->hasNami) {
             return;
         }
-
-        $response = $this->user->api()->putMember([
-            'firstname' => $this->member->firstname,
-            'lastname' => $this->member->lastname,
-            'joined_at' => $this->member->joined_at,
-            'birthday' => $this->member->birthday,
-            'send_newspaper' => $this->member->send_newspaper,
-            'address' => $this->member->address,
-            'zip' => $this->member->zip,
-            'location' => $this->member->location,
-            'nickname' => $this->member->nickname,
-            'other_country' => $this->member->other_country,
-            'further_address' => $this->member->further_address,
-            'main_phone' => $this->member->main_phone,
-            'mobile_phone' => $this->member->mobile_phone,
-            'work_phone' => $this->member->work_phone,
-            'fax' => $this->member->fax,
-            'email' => $this->member->email,
-            'email_parents' => $this->member->email_parents,
-            'gender_id' => optional($this->member->gender)->nami_id,
-            'confession_id' => $this->member->confession ? $this->member->confession->nami_id : Confession::firstWhere('is_null', true)->id,
-            'region_id' => optional($this->member->region)->nami_id,
-            'country_id' => $this->member->country->nami_id,
-            'fee_id' => $this->member->getNamiFeeId(),
-            'nationality_id' => $this->member->nationality->nami_id,
-            'group_id' => $this->member->group->nami_id,
-            'first_activity_id' => $this->member->firstActivity->nami_id,
-            'first_subactivity_id' => $this->member->firstSubactivity->nami_id,
+        $api = $settings->login();
+        $response = $api->putMember([
+            'firstname' => $member->firstname,
+            'lastname' => $member->lastname,
+            'joined_at' => $member->joined_at,
+            'birthday' => $member->birthday,
+            'send_newspaper' => $member->send_newspaper,
+            'address' => $member->address,
+            'zip' => $member->zip,
+            'location' => $member->location,
+            'nickname' => $member->nickname,
+            'other_country' => $member->other_country,
+            'further_address' => $member->further_address,
+            'main_phone' => $member->main_phone,
+            'mobile_phone' => $member->mobile_phone,
+            'work_phone' => $member->work_phone,
+            'fax' => $member->fax,
+            'email' => $member->email,
+            'email_parents' => $member->email_parents,
+            'gender_id' => optional($member->gender)->nami_id,
+            'confession_id' => $member->confession ? $member->confession->nami_id : Confession::firstWhere('is_null', true)->id,
+            'region_id' => optional($member->region)->nami_id,
+            'country_id' => $member->country->nami_id,
+            'fee_id' => $member->getNamiFeeId(),
+            'nationality_id' => $member->nationality->nami_id,
+            'group_id' => $member->group->nami_id,
+            'first_activity_id' => $member->firstActivity->nami_id,
+            'first_subactivity_id' => $member->firstSubactivity->nami_id,
         ]);
-        Member::withoutEvents(function () use ($response) {
-            $version = Nami::login($this->user->mglnr)->member($this->member->group->nami_id, $response['id'])['version'];
-            $this->member->update(['version' => $version, 'nami_id' => $response['id']]);
+        Member::withoutEvents(function () use ($response, $api, $member) {
+            $version = $api->member($member->group->nami_id, $response['id'])['version'];
+            $member->update(['version' => $version, 'nami_id' => $response['id']]);
         });
 
-        $memberships = $this->member->getNamiMemberships($this->user->api());
+        $memberships = $member->getNamiMemberships($api);
         foreach ($memberships as $membership) {
-            $this->member->memberships()->create([
+            $member->memberships()->create([
                 'activity_id' => Activity::nami($membership['activity_id'])->id,
                 'subactivity_id' => $membership['subactivity_id']
                     ? Subactivity::nami($membership['subactivity_id'])->id

app/Member/MemberController.php

@@ -13,6 +13,7 @@ use App\Nationality;
 use App\Payment\Subscription;
 use App\Region;
 use App\Setting\GeneralSettings;
+use App\Setting\NamiSettings;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Inertia\Response;
@@ -77,9 +78,9 @@ class MemberController extends Controller
         ]);
     }
 
-    public function store(MemberRequest $request): RedirectResponse
+    public function store(MemberRequest $request, NamiSettings $settings): RedirectResponse
     {
-        $request->persistCreate();
+        $request->persistCreate($settings);
 
         return redirect()->route('member.index');
     }

app/Member/MemberRequest.php

@@ -3,9 +3,8 @@
 namespace App\Member;
 
 use App\Activity;
-use App\Group;
+use App\Setting\NamiSettings;
 use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Str;
 use Illuminate\Validation\Rule;
 
@@ -60,12 +59,12 @@ class MemberRequest extends FormRequest
         ];
     }
 
-    public function persistCreate(): void
+    public function persistCreate(NamiSettings $settings): void
     {
-        $this->merge(['group_id' => Group::where('nami_id', Auth::user()->getNamiGroupId())->firstOrFail()->id]);
+        $this->merge(['group_id' => $settings->default_group_id]);
         $member = Member::create($this->input());
         if ($this->input('has_nami')) {
-            CreateJob::dispatch($member, auth()->user());
+            CreateJob::dispatch($member);
         }
     }
 

app/Setting/NamiSettings.php

@@ -12,6 +12,8 @@ class NamiSettings extends Settings
 
     public string $password;
 
+    public int $default_group_id;
+
     public static function group(): string
     {
         return 'nami';

database/settings/2022_05_01_185012_create_nami_settings_group.php

@@ -0,0 +1,11 @@
+<?php
+
+use Spatie\LaravelSettings\Migrations\SettingsMigration;
+
+class create_nami_settings_group extends SettingsMigration
+{
+    public function up(): void
+    {
+        $this->migrator->add('nami.default_group_id', (int) env('NAMI_GROUP'));
+    }
+}

packages/laravel-nami

@@ -1 +1 @@
-Subproject commit c604f082e26c547e277aa1615edf725008fed43a
+Subproject commit 48b7688faacaa772dd95bce9a6fc596c16ad2010