From fe8ea63fa5513d525599693b06700fc8fa5ca35e Mon Sep 17 00:00:00 2001
From: philipp lang <philipp@aweos.de>
Date: Thu, 2 Mar 2023 23:14:25 +0100
Subject: [PATCH] Add mitgliedsnr

---
 app/Actions/InsertMemberAction.php            |  1 +
 app/Member/Member.php                         |  1 +
 app/Member/MemberResource.php                 |  1 +
 ...0832_create_members_mitgliedsnr_column.php | 32 +++++++++++++++++++
 resources/js/views/member/boxes/System.vue    |  3 +-
 tests/Feature/Member/PullMemberActionTest.php |  4 ++-
 tests/Feature/Member/ShowTest.php             |  2 ++
 7 files changed, 42 insertions(+), 2 deletions(-)
 create mode 100644 database/migrations/2023_03_02_220832_create_members_mitgliedsnr_column.php

diff --git a/app/Actions/InsertMemberAction.php b/app/Actions/InsertMemberAction.php
index cc1738c7..7c975e90 100644
--- a/app/Actions/InsertMemberAction.php
+++ b/app/Actions/InsertMemberAction.php
@@ -47,6 +47,7 @@ class InsertMemberAction
             'country_id' => optional(Country::where('nami_id', $member->countryId)->first())->id,
             'subscription_id' => $this->getSubscriptionId($member),
             'nationality_id' => Nationality::where('nami_id', $member->nationalityId)->firstOrFail()->id,
+            'mitgliedsnr' => $member->memberId,
             'version' => $member->version,
         ]);
     }
diff --git a/app/Member/Member.php b/app/Member/Member.php
index d71c18d8..0e135dcc 100644
--- a/app/Member/Member.php
+++ b/app/Member/Member.php
@@ -74,6 +74,7 @@ class Member extends Model
         'multiply_more_pv' => 'boolean',
         'is_leader' => 'boolean',
         'bill_kind' => BillKind::class,
+        'mitgliedsnr' => 'integer',
     ];
 
     /**
diff --git a/app/Member/MemberResource.php b/app/Member/MemberResource.php
index 59188ff5..f5552ad9 100644
--- a/app/Member/MemberResource.php
+++ b/app/Member/MemberResource.php
@@ -90,6 +90,7 @@ class MemberResource extends JsonResource
             'is_leader' => $this->leaderMemberships->count() > 0,
             'group_id' => $this->group_id,
             'salutation' => $this->salutation,
+            'mitgliedsnr' => $this->mitgliedsnr,
             'comment' => $this->comment,
             'links' => [
                 'show' => route('member.show', ['member' => $this->getModel()]),
diff --git a/database/migrations/2023_03_02_220832_create_members_mitgliedsnr_column.php b/database/migrations/2023_03_02_220832_create_members_mitgliedsnr_column.php
new file mode 100644
index 00000000..12770a13
--- /dev/null
+++ b/database/migrations/2023_03_02_220832_create_members_mitgliedsnr_column.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('members', function (Blueprint $table) {
+            $table->string('mitgliedsnr')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('members', function (Blueprint $table) {
+            $table->dropColumn('mitgliedsnr');
+        });
+    }
+};
diff --git a/resources/js/views/member/boxes/System.vue b/resources/js/views/member/boxes/System.vue
index 0d94ff66..f247d93b 100644
--- a/resources/js/views/member/boxes/System.vue
+++ b/resources/js/views/member/boxes/System.vue
@@ -1,6 +1,7 @@
 <template>
     <div class="grid gap-3">
-        <key-value v-show="inner.nami_id" label="Nami Mitgliedsnummer" :value="inner.nami_id"></key-value>
+        <key-value v-show="inner.nami_id" label="NaMi ID" :value="inner.nami_id"></key-value>
+        <key-value v-show="inner.nami_id" label="NaMi Mitgliedsnummer" :value="inner.mitgliedsnr"></key-value>
         <key-value label="Beitrag" :value="inner.subscription ? inner.subscription.name : 'kein'"></key-value>
         <key-value v-if="inner.joined_at_human" label="Eintrittsdatum" :value="inner.joined_at_human"></key-value>
         <key-value v-if="inner.bill_kind_name" label="Rechnung" :value="inner.bill_kind_name"></key-value>
diff --git a/tests/Feature/Member/PullMemberActionTest.php b/tests/Feature/Member/PullMemberActionTest.php
index 11d9ed4e..b2e31989 100644
--- a/tests/Feature/Member/PullMemberActionTest.php
+++ b/tests/Feature/Member/PullMemberActionTest.php
@@ -48,11 +48,12 @@ class PullMemberActionTest extends TestCase
             'ort' => '::location::',
             'version' => 40,
             'gruppierung' => 'SG Wald',
+            'mitgliedsNummer' => 53,
         ]);
 
         $member = app(PullMemberAction::class)->handle(1000, 1001);
 
-        $group = Group::firstWhere('nami_id', 1000);
+        Group::firstWhere('nami_id', 1000);
         $this->assertDatabaseHas('members', [
             'firstname' => '::firstname::',
             'lastname' => '::lastname::',
@@ -69,6 +70,7 @@ class PullMemberActionTest extends TestCase
             'zip' => '12346',
             'location' => '::location::',
             'version' => '40',
+            'mitgliedsnr' => 53,
         ]);
 
         $this->assertDatabaseHas('groups', [
diff --git a/tests/Feature/Member/ShowTest.php b/tests/Feature/Member/ShowTest.php
index 886b9e4f..3a233acc 100644
--- a/tests/Feature/Member/ShowTest.php
+++ b/tests/Feature/Member/ShowTest.php
@@ -71,6 +71,7 @@ class ShowTest extends TestCase
                 'multiply_more_pv' => true,
                 'send_newspaper' => true,
                 'joined_at' => '2022-06-11',
+                'mitgliedsnr' => 998,
             ]);
 
         $response = $this->get("/member/{$member->id}");
@@ -103,6 +104,7 @@ class ShowTest extends TestCase
             'send_newspaper' => true,
             'joined_at_human' => '11.06.2022',
             'bill_kind_name' => 'Post',
+            'mitgliedsnr' => 998,
             'subscription' => [
                 'name' => 'Sub',
             ],