Fixed: Make joined_at nullable
This commit is contained in:
parent
94fc390fcf
commit
2f21031d49
|
@ -38,6 +38,10 @@ class Member extends Model {
|
||||||
'eintrittsdatum' => 'joined_at',
|
'eintrittsdatum' => 'joined_at',
|
||||||
];
|
];
|
||||||
|
|
||||||
|
protected $casts = [];
|
||||||
|
|
||||||
|
protected $nullable = ['further_address', 'other_country', 'nickname'];
|
||||||
|
|
||||||
protected $guarded = [];
|
protected $guarded = [];
|
||||||
|
|
||||||
public static function fromNami($item) {
|
public static function fromNami($item) {
|
||||||
|
@ -59,7 +63,11 @@ class Member extends Model {
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getJoinedAtAttribute() {
|
public function getJoinedAtAttribute() {
|
||||||
return Carbon::parse($this->attributes['joined_at'])->format('Y-m-d');
|
$date = $this->attributes['joined_at'];
|
||||||
|
|
||||||
|
return empty($date)
|
||||||
|
? null
|
||||||
|
: Carbon::parse($date)->format('Y-m-d');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getGenderIdAttribute() {
|
public function getGenderIdAttribute() {
|
||||||
|
@ -70,4 +78,14 @@ class Member extends Model {
|
||||||
$this->attributes['gender_id'] = data_get($this->geschlechtMaps, $v, null);
|
$this->attributes['gender_id'] = data_get($this->geschlechtMaps, $v, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function getAttributeValue($key) {
|
||||||
|
$original = parent::getAttributeValue($key);
|
||||||
|
|
||||||
|
if (in_array($key, $this->nullable) && $original === '') {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return $original;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,7 +23,7 @@ class PullMemberTest extends TestCase
|
||||||
'other_country' => ['other_country', ['deutsch', null]],
|
'other_country' => ['other_country', ['deutsch', null]],
|
||||||
'address' => ['address', ['straße 1', 'straße 2']],
|
'address' => ['address', ['straße 1', 'straße 2']],
|
||||||
'further_address' => ['further_address', ['addrz', null]],
|
'further_address' => ['further_address', ['addrz', null]],
|
||||||
'zip' => ['zip', [12345, 5555]],
|
'zip' => ['zip', ['12345', '5555']],
|
||||||
'location' => ['location', ['SG', 'Köln']],
|
'location' => ['location', ['SG', 'Köln']],
|
||||||
'main_phone' => ['main_phone', ['+49888', '+49668']],
|
'main_phone' => ['main_phone', ['+49888', '+49668']],
|
||||||
'mobile_phone' => ['mobile_phone', ['+49176', '+49172']],
|
'mobile_phone' => ['mobile_phone', ['+49176', '+49172']],
|
||||||
|
@ -35,7 +35,7 @@ class PullMemberTest extends TestCase
|
||||||
'nationality_id' => ['nationality_id', [1054, null]],
|
'nationality_id' => ['nationality_id', [1054, null]],
|
||||||
'confession_id' => ['confession_id', [1, null]],
|
'confession_id' => ['confession_id', [1, null]],
|
||||||
'birthday' => ['birthday', ['1991-06-20', '1984-01-17']],
|
'birthday' => ['birthday', ['1991-06-20', '1984-01-17']],
|
||||||
'joined_at' => ['joined_at', ['2005-05-01', '2003-11-17']],
|
'joined_at' => ['joined_at', ['2005-05-01', null]],
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -53,7 +53,7 @@ class PullMemberTest extends TestCase
|
||||||
'email_parents' => ['email_parents', ['testp@example.com', 'test2p@example.com']],
|
'email_parents' => ['email_parents', ['testp@example.com', 'test2p@example.com']],
|
||||||
'gender_id' => ['gender_id', [19, null]],
|
'gender_id' => ['gender_id', [19, null]],
|
||||||
'birthday' => ['birthday', ['1991-06-20', '1984-01-17']],
|
'birthday' => ['birthday', ['1991-06-20', '1984-01-17']],
|
||||||
'joined_at' => ['joined_at', ['2005-05-01', '2003-11-17']],
|
'joined_at' => ['joined_at', ['2005-05-01', null]],
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -79,8 +79,8 @@ class PullMemberTest extends TestCase
|
||||||
|
|
||||||
$group = Nami::group(103);
|
$group = Nami::group(103);
|
||||||
|
|
||||||
$this->assertEquals($values[0], $group->member(16)->{$key});
|
$this->assertSame($values[0], $group->member(16)->{$key});
|
||||||
$this->assertEquals($values[1], $group->member(17)->{$key});
|
$this->assertSame($values[1], $group->member(17)->{$key});
|
||||||
|
|
||||||
Http::assertSentCount(5);
|
Http::assertSentCount(5);
|
||||||
}
|
}
|
||||||
|
@ -100,7 +100,7 @@ class PullMemberTest extends TestCase
|
||||||
|
|
||||||
Nami::login();
|
Nami::login();
|
||||||
|
|
||||||
$this->assertEquals([
|
$this->assertSame([
|
||||||
16 => $values[0],
|
16 => $values[0],
|
||||||
17 => $values[1]
|
17 => $values[1]
|
||||||
], Nami::group(103)->members()->pluck($key, 'id')->toArray());
|
], Nami::group(103)->members()->pluck($key, 'id')->toArray());
|
||||||
|
@ -123,7 +123,7 @@ class PullMemberTest extends TestCase
|
||||||
|
|
||||||
Nami::login();
|
Nami::login();
|
||||||
|
|
||||||
$this->assertEquals([
|
$this->assertSame([
|
||||||
16 => $values[0],
|
16 => $values[0],
|
||||||
17 => $values[1]
|
17 => $values[1]
|
||||||
], Nami::group(103)->members()->pluck($key, 'id')->toArray());
|
], Nami::group(103)->members()->pluck($key, 'id')->toArray());
|
||||||
|
@ -147,7 +147,7 @@ class PullMemberTest extends TestCase
|
||||||
|
|
||||||
$group = Nami::group(103);
|
$group = Nami::group(103);
|
||||||
|
|
||||||
$this->assertEquals($values[0], $group->member(16)->{$key});
|
$this->assertSame($values[0], $group->member(16)->{$key});
|
||||||
|
|
||||||
Http::assertSentCount(5);
|
Http::assertSentCount(5);
|
||||||
}
|
}
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
"mglTypeId": "MITGLIED",
|
"mglTypeId": "MITGLIED",
|
||||||
"beitragsart": "Voller Beitrag",
|
"beitragsart": "Voller Beitrag",
|
||||||
"nachname": "Nach2",
|
"nachname": "Nach2",
|
||||||
"eintrittsdatum": "2003-11-17 00:00:00",
|
"eintrittsdatum": "",
|
||||||
"rover": null,
|
"rover": null,
|
||||||
"region": "Nordrhein-Westfalen (Deutschland)",
|
"region": "Nordrhein-Westfalen (Deutschland)",
|
||||||
"status": "Aktiv",
|
"status": "Aktiv",
|
||||||
|
|
|
@ -37,7 +37,7 @@
|
||||||
"entries_geburtsDatum":"1991-06-20 00:00:00",
|
"entries_geburtsDatum":"1991-06-20 00:00:00",
|
||||||
"entries_staatangehoerigkeitText":"deutsch",
|
"entries_staatangehoerigkeitText":"deutsch",
|
||||||
"entries_nachname":"Nach1",
|
"entries_nachname":"Nach1",
|
||||||
"entries_eintrittsdatum":"2005-05-01 00:00:00",
|
"entries_eintrittsdatum":"2005-05-01",
|
||||||
"entries_austrittsDatum":"",
|
"entries_austrittsDatum":"",
|
||||||
"entries_genericField2":"",
|
"entries_genericField2":"",
|
||||||
"entries_telefax":"+55111"
|
"entries_telefax":"+55111"
|
||||||
|
|
Loading…
Reference in New Issue