Add initialize command

app/Console/Commands/NamiInitializeCommand.php

@@ -0,0 +1,55 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Initialize\Initializer;
+use Illuminate\Console\Command;
+use Zoomyboy\LaravelNami\Nami;
+use Zoomyboy\LaravelNami\NamiUser;
+
+class NamiInitializeCommand extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'nami:initialize {--mglnr=} {--password=} {--group_id=}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Initializes nami';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+        app(Initializer::class)->run(NamiUser::fromPayload([
+            'credentials' => [
+                'mglnr' => $this->option('mglnr'),
+                'password' => $this->option('password'),
+            ],
+            'firstname' => 'Console',
+            'lastname' => 'Console',
+            'group_id' => $this->option('group_id'),
+        ]));
+
+        return 0;
+    }
+}

app/Initialize/InitializeActivities.php

@@ -6,17 +6,13 @@ use Zoomyboy\LaravelNami\NamiUser;
 
 class InitializeActivities {
 
-    private $bar;
     private $api;
 
-    public function __construct($bar, $api) {
+    public function __construct($api) {
-        $this->bar = $bar;
         $this->api = $api;
     }
 
     public function handle(NamiUser $user) {
-        $this->bar->task('Synchronisiere Tätigkeiten', function() use ($user) {
         app(ActivityCreator::class)->createFor($this->api, $user->getNamiGroupId());
-        });
     }
 }

app/Initialize/InitializeConfessions.php

@@ -2,22 +2,20 @@
 
 namespace App\Initialize;
 
+use App\Confession;
+
 class InitializeConfessions {
 
-    private $bar;
     private $api;
     public $nullName = 'ohne Konfession';
 
-    public function __construct($bar, $api) {
+    public function __construct($api) {
-        $this->bar = $bar;
         $this->api = $api;
     }
 
     public function handle() {
-        $this->bar->task('Synchronisiere Konfessionen', function() {
         $this->api->confessions()->each(function($confession) {
-                \App\Confession::create(['nami_id' => $confession->id, 'name' => $confession->name, 'is_null' => $this->nullName === $confession->name]);
+            Confession::create(['nami_id' => $confession->id, 'name' => $confession->name, 'is_null' => $this->nullName === $confession->name]);
-            });
         });
     }
 }

app/Initialize/InitializeCountries.php

@@ -4,19 +4,15 @@ namespace App\Initialize;
 
 class InitializeCountries {
 
-    private $bar;
     private $api;
 
-    public function __construct($bar, $api) {
+    public function __construct($api) {
-        $this->bar = $bar;
         $this->api = $api;
     }
 
     public function handle() {
-        $this->bar->task('Synchronisiere Länder', function() {
         $this->api->countries()->each(function($country) {
             \App\Country::create(['nami_id' => $country->id, 'name' => $country->name]);
         });
-        });
     }
 }

app/Initialize/InitializeCourses.php

@@ -10,19 +10,15 @@ use Zoomyboy\LaravelNami\NamiUser;
 class InitializeCourses {
 
     private Api $api;
-    private Progress $bar;
 
-    public function __construct(Progress $bar, Api $api) {
+    public function __construct(Api $api) {
-        $this->bar = $bar;
         $this->api = $api;
     }
 
     public function handle(NamiUser $user): void
     {
-        $this->bar->task('Synchronisiere Kurse', function() {
         $this->api->courses()->each(function($course) {
             Course::create(['nami_id' => $course->id, 'name' => $course->name]);
         });
-        });
     }
 }

app/Initialize/InitializeFees.php

@@ -6,16 +6,13 @@ use Zoomyboy\LaravelNami\NamiUser;
 
 class InitializeFees {
 
-    private $bar;
     private $api;
     
-    public function __construct($bar, $api) {
+    public function __construct($api) {
-        $this->bar = $bar;
         $this->api = $api;
     }
 
     public function handle(NamiUser $user) {
-        $this->bar->task('Synchronisiere Beiträge', function() use ($user) {
         $this->api->feesOf($user->getNamiGroupId())->each(function($fee) {
             \App\Fee::create(['nami_id' => $fee->id, 'name' => $fee->name])
                 ->subscriptions()->create([
@@ -23,6 +20,5 @@ class InitializeFees {
                     'amount' => 1000,
                 ]);
         });
-        });
     }
 }

app/Initialize/InitializeGenders.php

@@ -6,19 +6,15 @@ use Zoomyboy\LaravelNami\NamiUser;
 
 class InitializeGenders {
 
-    private $bar;
     private $api;
 
-    public function __construct($bar, $api) {
+    public function __construct($api) {
-        $this->bar = $bar;
         $this->api = $api;
     }
 
     public function handle(NamiUser $user) {
-        $this->bar->task('Synchronisiere Geschlechter', function() {
         $this->api->genders()->each(function($gender) {
             \App\Gender::create(['nami_id' => $gender->id, 'name' => $gender->name]);
         });
-        });
     }
 }

app/Initialize/InitializeJob.php

@@ -17,18 +17,6 @@ class InitializeJob implements ShouldQueue
 
     public $user;
 
-    public static $initializers = [
-        InitializeNationalities::class,
-        InitializeFees::class,
-        InitializeConfessions::class,
-        InitializeCountries::class,
-        InitializeGenders::class,
-        InitializeRegions::class,
-        InitializeActivities::class,
-        InitializeCourses::class,
-        InitializeMembers::class,
-    ];
-
     public function __construct(NamiUser $user)
     {
         $this->user = $user;
@@ -41,13 +29,6 @@ class InitializeJob implements ShouldQueue
      */
     public function handle()
     {
-        $api = $this->user->api();
+        app(Initializer::class)->run($this->user);
-        $bar = $this->createProgressBar('Initialisiere');
-
-        foreach (static::$initializers as $initializer) {
-            (new $initializer($bar, $api))->handle($this->user);
-        }
-
-        $bar->finish('Initialisierung abgeschlossen');
     }
 }

app/Initialize/InitializeMembers.php

@@ -15,16 +15,15 @@ use App\Region;
 use App\Subactivity;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
+use Zoomyboy\LaravelNami\Exceptions\RightException;
 use Zoomyboy\LaravelNami\Member as NamiMember;
 use Zoomyboy\LaravelNami\NamiException;
 
 class InitializeMembers {
 
-    private $bar;
     private $api;
     
-    public function __construct($bar, $api) {
+    public function __construct($api) {
-        $this->bar = $bar;
         $this->api = $api;
     }
 
@@ -40,7 +39,6 @@ class InitializeMembers {
     public function handle() {
         $allMembers = collect([]);
 
-        $this->bar->task('Synchronisiere Mitglieder', function() {
         $this->api->search([])->each(function($member) {
             $member = NamiMember::fromNami($this->api->member($member->group_id, $member->id));
             if (!$member->joined_at) {
@@ -107,7 +105,11 @@ class InitializeMembers {
                         : Subactivity::where('name', $membership['entries_untergliederung'])->firstOrFail()->id;
                     $activity = Activity::where('nami_id', (int) $activityMatches[1])->first();
                     if (!$activity) {
+                        try {
                             $singleMembership = $this->api->membership($member->id, $membership['id']);
+                        } catch (RightException $e) {
+                            continue;
+                        }
                         app(ActivityCreator::class)->createFor($this->api, $singleMembership['gruppierungId']);
                         $activity = Activity::where('nami_id', $singleMembership['taetigkeitId'])->first();
                         $group = Group::firstOrCreate(['nami_id' => $singleMembership['gruppierungId']], [
@@ -127,6 +129,5 @@ class InitializeMembers {
                 dd($e->getMessage(), $member);
             }
         });
-        });
     }
 }

app/Initialize/InitializeNationalities.php

@@ -4,19 +4,15 @@ namespace App\Initialize;
 
 class InitializeNationalities {
 
-    private $bar;
     private $api;
 
-    public function __construct($bar, $api) {
+    public function __construct($api) {
-        $this->bar = $bar;
         $this->api = $api;
     }
 
     public function handle() {
-        $this->bar->task('Synchronisiere Nationalitäten', function() {
         $this->api->nationalities()->each(function($nationality) {
             \App\Nationality::create(['nami_id' => $nationality->id, 'name' => $nationality->name]);
         });
-        });
     }
 }

app/Initialize/InitializeRegions.php

@@ -4,20 +4,16 @@ namespace App\Initialize;
 
 class InitializeRegions {
 
-    private $bar;
     private $api;
     private $nullName = 'Nicht-DE';
     
-    public function __construct($bar, $api) {
+    public function __construct($api) {
-        $this->bar = $bar;
         $this->api = $api;
     }
 
     public function handle() {
-        $this->bar->task('Synchronisiere Bundesländer', function() {
         $this->api->regions()->each(function($region) {
             \App\Region::create(['nami_id' => $region->id, 'name' => $region->name, 'is_null' => $region->name == $this->nullName]);
         });
-        });
     }
 }

app/Initialize/Initializer.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Initialize;
+
+use Zoomyboy\LaravelNami\Api;
+use Zoomyboy\LaravelNami\NamiUser;
+
+class Initializer {
+
+    public $user;
+
+    public static $initializers = [
+        InitializeNationalities::class,
+        InitializeFees::class,
+        InitializeConfessions::class,
+        InitializeCountries::class,
+        InitializeGenders::class,
+        InitializeRegions::class,
+        InitializeActivities::class,
+        InitializeCourses::class,
+        InitializeMembers::class,
+    ];
+
+    public function run(NamiUser $namiUser) {
+        foreach (static::$initializers as $initializer) {
+            (new $initializer($namiUser->api()))->handle($namiUser);
+        }
+    }
+
+}

public/index.php

@@ -1,5 +1,7 @@
 <?php
 
+phpinfo();exit;
+
 /**
  * Laravel - A PHP Framework For Web Artisans
  *

tests/Feature/Initialize/InitializeTest.php

@@ -9,9 +9,11 @@ use App\Gender;
 use App\Group;
 use App\Member\Member;
 use App\Nationality;
+use App\Setting\GeneralSettings;
 use App\Subactivity;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Foundation\Testing\WithFaker;
+use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Http;
 use Tests\TestCase;
 use Zoomyboy\LaravelNami\Backend\FakeBackend;
@@ -120,6 +122,24 @@ class InitializeTest extends TestCase
         Http::assertSentCount(16);
     }
 
+    public function testItInitializesFromCommandLine(): void
+    {
+        $this->withoutExceptionHandling();
+        $this->initializeProvider();
+        GeneralSettings::fake(['allowed_nami_accounts' => [123]]);
+
+        Artisan::call('nami:initialize', [
+            '--mglnr' => 90166,
+            '--password' => 'secret',
+            '--group_id' => 1000,
+        ]);
+
+        $this->assertDatabaseHas('regions', [
+            'name' => 'nrw',
+            'nami_id' => 304
+        ]);
+    }
+
     public function testSyncCoursesOfMember(): void
     {
         $this->withoutExceptionHandling();

tests/TestCase.php

@@ -21,11 +21,15 @@ abstract class TestCase extends BaseTestCase
         TestResponse::mixin(new InertiaMixin());
     }
 
-    public function login(): self
+    public function fakeAuthUser() {
-    {
         app(FakeBackend::class)
             ->fakeLogin('123')
             ->addSearch(123, ['entries_vorname' => '::firstname::', 'entries_nachname' => '::lastname::', 'entries_gruppierungId' => 1000]);
+    }
+
+    public function login(): self
+    {
+        $this->fakeAuthUser();
         auth()->loginNami([
             'mglnr' => 123,
             'password' => 'secret',