From 99cc0b60bfb4be855c37128b704c05efe72d150b Mon Sep 17 00:00:00 2001
From: philipp lang <philipp@aweos.de>
Date: Sat, 4 Jul 2020 23:55:34 +0200
Subject: [PATCH] Fixed: Allow subactivity of membership to be null

---
 src/Membership.php                 | 7 ++++++-
 tests/Unit/PullMembershipsTest.php | 4 ++--
 tests/json/membership-69.json      | 2 --
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/Membership.php b/src/Membership.php
index 9d296ed..d5eae8c 100644
--- a/src/Membership.php
+++ b/src/Membership.php
@@ -25,8 +25,13 @@ class Membership extends Model {
 
     protected $guarded = [];
 
+    public static $default = [
+        'untergliederungId' => null,
+        'untergliederung' => null
+    ];
+
     public static function fromNami($item) {
-        $item = collect($item)
+        $item = collect(static::$default)->merge(collect($item))
             ->only(array_keys(static::$overviewAttributes))
             ->mapWithKeys(function($item, $key) {
                 return [ data_get(static::$overviewAttributes, $key, $key) => $item ];
diff --git a/tests/Unit/PullMembershipsTest.php b/tests/Unit/PullMembershipsTest.php
index d0bd15f..40c850a 100644
--- a/tests/Unit/PullMembershipsTest.php
+++ b/tests/Unit/PullMembershipsTest.php
@@ -17,11 +17,11 @@ class PullMembershipsTest extends TestCase
             'id' => ['id', [68, 69]],
             'group_id' => ['group_id', [103,104]],
             'activity_id' => ['activity_id', [33, 34]],
-            'subactivity_id' => ['subactivity_id', [55, 56]],
+            'subactivity_id' => ['subactivity_id', [55, null]],
             'starts_at' => ['starts_at', ['2017-02-11', '2017-11-12']],
             'ends_at' => ['ends_at', ['2017-03-11', null]],
             'activity_name' => ['activity_name', ['ReferentIn', 'Wö']],
-            'subactivity_name' => ['subactivity_name', ['Pfadfinder', 'AAA']],
+            'subactivity_name' => ['subactivity_name', ['Pfadfinder', null]],
         ];
     }
 
diff --git a/tests/json/membership-69.json b/tests/json/membership-69.json
index 93e7ef6..d2b1bd2 100644
--- a/tests/json/membership-69.json
+++ b/tests/json/membership-69.json
@@ -6,8 +6,6 @@
     "gruppierungId": 104,
     "taetigkeit": "Wö",
     "taetigkeitId": 34,
-    "untergliederung": "AAA",
-    "untergliederungId": 56,
     "aktivVon": "2017-11-12 00:00:00",
     "aktivBis": ""
   },