From 3273a49336c3cc7edbc81b17145c33885a24a03f Mon Sep 17 00:00:00 2001
From: philipp lang <philipp@aweos.de>
Date: Mon, 13 Feb 2023 01:06:04 +0100
Subject: [PATCH] Add bus

---
 app/Initialize/InitializeMembers.php      | 37 ++++++++++++++---------
 app/Nami/Api/CompleteMemberToRedisJob.php |  4 +++
 packages/laravel-nami                     |  2 +-
 3 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/app/Initialize/InitializeMembers.php b/app/Initialize/InitializeMembers.php
index 56d7db5e..ffd65e47 100644
--- a/app/Initialize/InitializeMembers.php
+++ b/app/Initialize/InitializeMembers.php
@@ -2,9 +2,9 @@
 
 namespace App\Initialize;
 
+use App\Actions\InsertCoursesAction;
 use App\Actions\InsertMemberAction;
-use App\Actions\PullCoursesAction;
-use App\Actions\PullMembershipsAction;
+use App\Actions\InsertMembershipsAction;
 use App\Nami\Api\CompleteMemberToRedisJob;
 use App\Setting\NamiSettings;
 use DB;
@@ -14,7 +14,10 @@ use Illuminate\Support\Facades\Bus;
 use Illuminate\Support\Facades\Redis;
 use Lorisleiva\Actions\Concerns\AsAction;
 use Zoomyboy\LaravelNami\Api;
-use Zoomyboy\LaravelNami\Data\MemberEntry as NamiMember;
+use Zoomyboy\LaravelNami\Data\Course as NamiCourse;
+use Zoomyboy\LaravelNami\Data\Member as NamiMember;
+use Zoomyboy\LaravelNami\Data\MemberEntry as NamiMemberEntry;
+use Zoomyboy\LaravelNami\Data\MembershipEntry as NamiMembershipEntry;
 
 class InitializeMembers
 {
@@ -27,24 +30,30 @@ class InitializeMembers
         $allMembers = collect([]);
         Redis::delete('members');
 
-        $jobs = $api->search([])->map(function (NamiMember $member) use ($api) {
+        $jobs = $api->search([])->map(function (NamiMemberEntry $member) use ($api) {
             return new CompleteMemberToRedisJob($api, $member->groupId, $member->id);
         })->toArray();
 
         $batch = Bus::batch($jobs)
             ->finally(function (Batch $batch) {
-                dd(Redis::get('members'));
+                foreach (Redis::lrange('members', 0, -1) as $data) {
+                    try {
+                        $data = json_decode($data, true);
+                        $localMember = InsertMemberAction::run(NamiMember::from($data['member']));
+                        InsertMembershipsAction::run(
+                            $localMember,
+                            collect($data['memberships'])->map(fn ($membership) => NamiMembershipEntry::from($membership)),
+                        );
+                        InsertCoursesAction::run(
+                            $localMember,
+                            collect($data['courses'])->map(fn ($course) => NamiCourse::from($course)),
+                        );
+                    } catch (Skippable $e) {
+                        continue;
+                    }
+                }
             })
             ->dispatch();
-        //     $localMember = InsertMemberAction::run();
-            // })->catch(function (Batch $batch, Throwable $e) {
-            //     // First batch job failure detected...
-            // })->finally(function (Batch $batch) {
-            //     // The batch has finished executing...
-            // })
-
-            // app(PullMembershipsAction::class)->handle($localMember);
-            // app(PullCoursesAction::class)->handle($localMember);
     }
 
     public function restore(): void
diff --git a/app/Nami/Api/CompleteMemberToRedisJob.php b/app/Nami/Api/CompleteMemberToRedisJob.php
index 3e7770f5..08ce4e0a 100644
--- a/app/Nami/Api/CompleteMemberToRedisJob.php
+++ b/app/Nami/Api/CompleteMemberToRedisJob.php
@@ -28,6 +28,10 @@ class CompleteMemberToRedisJob implements ShouldQueue
 
     public function handle(): void
     {
+        if ($this->batch()->cancelled()) {
+            return;
+        }
+
         Redis::rpush('members', collect([
             'member' => MemberAction::run($this->api, $this->groupId, $this->memberId),
             'memberships' => MembershipsOfAction::run($this->api, $this->memberId),
diff --git a/packages/laravel-nami b/packages/laravel-nami
index 42a303d1..927bf7a0 160000
--- a/packages/laravel-nami
+++ b/packages/laravel-nami
@@ -1 +1 @@
-Subproject commit 42a303d16cc7aa094968e3c212a755f762ce7b16
+Subproject commit 927bf7a09ce5d1f3cef14e60060c7f885ef140d6