silva
/
adrema
2
1
Fork 0
Code Issues 23 Pull Requests 1 Projects 1 Releases 106 Wiki Activity

dev #46

Open
arwed wants to merge 8 commits from dev into master
Conversation 0 Commits 8 Files Changed 9 +490 -463
9 changed files with 490 additions and 463 deletions

5
app/Member/MemberRequest.php
View File

@ -84,6 +84,9 @@ class MemberRequest extends FormRequest
'salutation' => '',
'comment' => '',
'keepdata' => 'boolean',
'bank_account' => 'array|exclude',
'bank_account.iban' => 'nullable|string|max:255',
'bank_account.bic' => 'nullable|string|max:255',
];
}
@ -94,6 +97,7 @@ class MemberRequest extends FormRequest
'group_id' => Group::where('nami_id', $settings->default_group_id)->firstOrFail()->id,
]);
$member->updatePhoneNumbers()->save();
$member->bankAccount->update($this->input('bank_account'));
if ($this->input('has_nami')) {
$this->storeFreshMemberInNami($member);
@ -117,6 +121,7 @@ class MemberRequest extends FormRequest
$namiSync = $member->isDirty(Member::$namiFields);
$member->save();
$member->bankAccount->update($this->input('bank_account'));
if ($this->input('has_nami') && null === $member->nami_id) {
$this->storeFreshMemberInNami($member);

5
database/factories/Member/MemberFactory.php
View File

@ -93,6 +93,11 @@ class MemberFactory extends Factory
return $this->state(['nami_id' => $namiId]);
}
public function notInNami(): self
{
return $this->state(['nami_id' => null]);
}
public function withBankAccount(BankAccountFactory $factory): self
{
return $this->afterCreating(function ($member) use ($factory) {

5
database/migrations/2025_03_30_035130_create_bank_accounts_table.php
View File

@ -1,5 +1,6 @@
<?php
use App\Member\Member;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
@ -22,6 +23,10 @@ return new class extends Migration
$table->string('account_number')->nullable();
$table->timestamps();
});
foreach (Member::get() as $member) {
$member->bankAccount()->create([]);
}
}
/**

2
packages/laravel-nami

@ -1 +1 @@
Subproject commit f905c316ee7913cbf85c386021fbaa28b4b2a158
Subproject commit c20cf930f2037ddda4400dd7d35bf9ef707356eb

431
tests/Feature/Member/StoreTest.php
View File

@ -17,277 +17,242 @@ use App\Region;
use App\Subactivity;
use Illuminate\Foundation\Testing\DatabaseTransactions;
use Tests\Lib\MergesAttributes;
use Tests\RequestFactories\MemberStoreRequestFactory;
use Tests\TestCase;
use Zoomyboy\LaravelNami\Fakes\MemberFake;
class StoreTest extends TestCase
{
use DatabaseTransactions;
use MergesAttributes;
uses(DatabaseTransactions::class);
public function testItCanStoreAMember(): void
{
app(MemberFake::class)->stores(55, 103);
Fee::factory()->create();
$this->withoutExceptionHandling()->login()->loginNami();
$country = Country::factory()->create();
$gender = Gender::factory()->create();
$region = Region::factory()->create();
$nationality = Nationality::factory()->create();
$activity = Activity::factory()->inNami(89)->create();
$subactivity = Subactivity::factory()->inNami(90)->create();
$subscription = Subscription::factory()->forFee()->create();
$confesstion = Confession::factory()->create(['is_null' => true]);
PullMemberAction::shouldRun();
PullMembershipsAction::shouldRun();
beforeEach(function () {
Confession::factory()->create(['is_null' => true]);
PullMemberAction::shouldRun();
PullMembershipsAction::shouldRun();
});
$response = $this
->from('/member/create')
->post('/member', $this->attributes([
'country_id' => $country->id,
'gender_id' => $gender->id,
'region_id' => $region->id,
'nationality_id' => $nationality->id,
'first_activity_id' => $activity->id,
'first_subactivity_id' => $subactivity->id,
'subscription_id' => $subscription->id,
'bill_kind' => 'Post',
'salutation' => 'Doktor',
'comment' => 'Lorem bla',
]))->assertSessionHasNoErrors();
it('can store a member', function () {
app(MemberFake::class)->stores(55, 103);
Fee::factory()->create();
$this->withoutExceptionHandling()->login()->loginNami();
$country = Country::factory()->create();
$gender = Gender::factory()->create();
$region = Region::factory()->create();
$nationality = Nationality::factory()->create();
$activity = Activity::factory()->inNami(89)->create();
$subactivity = Subactivity::factory()->inNami(90)->create();
$subscription = Subscription::factory()->forFee()->create();
$response->assertRedirect('/member')->assertSessionHasNoErrors();
$member = Member::firstWhere('firstname', 'Joe');
$this->assertDatabaseHas('members', [
'address' => 'Bavert 50',
'bill_kind' => 'Post',
'birthday' => '2013-02-19',
'children_phone' => '+49 176 70512778',
$response = $this
->from('/member/create')
->post('/member', MemberStoreRequestFactory::new()->create([
'country_id' => $country->id,
'email_parents' => 'osloot@aol.com',
'firstname' => 'Joe',
'gender_id' => $gender->id,
'joined_at' => '2022-08-12',
'lastname' => 'Muster',
'letter_address' => null,
'location' => 'Solingen',
'main_phone' => '+49 212 337056',
'mobile_phone' => '+49 176 70512774',
'nationality_id' => $nationality->id,
'region_id' => $region->id,
'send_newspaper' => '1',
'nationality_id' => $nationality->id,
'first_activity_id' => $activity->id,
'first_subactivity_id' => $subactivity->id,
'subscription_id' => $subscription->id,
'zip' => '42719',
'fax' => '+49 212 4732223',
'bill_kind' => 'Post',
'salutation' => 'Doktor',
'comment' => 'Lorem bla',
]);
]))->assertSessionHasNoErrors();
app(MemberFake::class)->assertStored(55, [
'ersteTaetigkeitId' => 89,
'ersteUntergliederungId' => 90,
]);
}
$response->assertRedirect('/member')->assertSessionHasNoErrors();
$this->assertDatabaseHas('members', [
'address' => 'Bavert 50',
'bill_kind' => 'Post',
'birthday' => '2013-02-19',
'children_phone' => '+49 176 70512778',
'country_id' => $country->id,
'email_parents' => 'osloot@aol.com',
'firstname' => 'Joe',
'gender_id' => $gender->id,
'joined_at' => '2022-08-12',
'lastname' => 'Muster',
'letter_address' => null,
'location' => 'Solingen',
'main_phone' => '+49 212 337056',
'mobile_phone' => '+49 176 70512774',
'nationality_id' => $nationality->id,
'region_id' => $region->id,
'send_newspaper' => '1',
'subscription_id' => $subscription->id,
'zip' => '42719',
'fax' => '+49 212 4732223',
'salutation' => 'Doktor',
'comment' => 'Lorem bla',
]);
public function testItStoresWiederverwendenFlag(): void
{
app(MemberFake::class)->stores(55, 103);
Fee::factory()->create();
$this->withoutExceptionHandling()->login()->loginNami();
$activity = Activity::factory()->inNami(89)->create();
$subactivity = Subactivity::factory()->inNami(90)->create();
$subscription = Subscription::factory()->forFee()->create();
$confesstion = Confession::factory()->create(['is_null' => true]);
PullMemberAction::shouldRun();
PullMembershipsAction::shouldRun();
app(MemberFake::class)->assertStored(55, [
'ersteTaetigkeitId' => 89,
'ersteUntergliederungId' => 90,
]);
});
$this
->from('/member/create')
->post('/member', $this->attributes([
'first_activity_id' => $activity->id,
'first_subactivity_id' => $subactivity->id,
'subscription_id' => $subscription->id,
'keepdata' => true,
]))->assertSessionHasNoErrors();
it('can store iban and bic', function () {
app(MemberFake::class)->stores(55, 103);
Fee::factory()->create();
$this->withoutExceptionHandling()->login()->loginNami();
$this->assertDatabaseHas('members', [
$this->post('/member', MemberStoreRequestFactory::new()->create([
'bank_account.iban' => '666',
'bank_account.bic' => 'SOLSDE',
]))->assertSessionHasNoErrors();
$this->assertDatabaseHas('bank_accounts', [
'iban' => '666',
'bic' => 'SOLSDE',
'member_id' => Member::first()->id,
]);
app(MemberFake::class)->assertStored(55, function ($payload) {
$bank = json_decode($payload['kontoverbindung'], true);
return $bank['iban'] === '666' && $bank['bic'] === 'SOLSDE';
});
});
it('testItStoresWiederverwendenFlag', function () {
app(MemberFake::class)->stores(55, 103);
Fee::factory()->create();
$this->withoutExceptionHandling()->login()->loginNami();
$activity = Activity::factory()->inNami(89)->create();
$subactivity = Subactivity::factory()->inNami(90)->create();
$subscription = Subscription::factory()->forFee()->create();
$this
->from('/member/create')
->post('/member', MemberStoreRequestFactory::new()->create([
'first_activity_id' => $activity->id,
'first_subactivity_id' => $subactivity->id,
'subscription_id' => $subscription->id,
'keepdata' => true,
]);
app(MemberFake::class)->assertStored(55, [
'wiederverwendenFlag' => true,
]);
}
]))->assertSessionHasNoErrors();
public function testItCanStoreAMemberWithoutNami(): void
{
$this->withoutExceptionHandling()->login()->loginNami();
$activity = Activity::factory()->create();
$subactivity = Subactivity::factory()->create();
$this->assertDatabaseHas('members', [
'keepdata' => true,
]);
app(MemberFake::class)->assertStored(55, [
'wiederverwendenFlag' => true,
]);
});
$response = $this
->from('/member/create')
->post('/member', $this->attributes([
'first_activity_id' => $activity->id,
'first_subactivity_id' => $subactivity->id,
'has_nami' => false,
]));
it('testItCanStoreAMemberWithoutNami', function () {
$this->withoutExceptionHandling()->login()->loginNami();
$activity = Activity::factory()->create();
$subactivity = Subactivity::factory()->create();
$response->assertSessionHasNoErrors();
$this->assertDatabaseHas('members', [
'nami_id' => null,
]);
NamiPutMemberAction::spy()->shouldNotHaveReceived('handle');
}
public function testItUpdatesPhoneNumber(): void
{
$this->withoutExceptionHandling()->login()->loginNami();
$this->post('/member', $this->attributes([
$response = $this
->from('/member/create')
->post('/member', MemberStoreRequestFactory::new()->create([
'first_activity_id' => $activity->id,
'first_subactivity_id' => $subactivity->id,
'has_nami' => false,
'main_phone' => '02103 4455129',
'fax' => '02103 4455130',
'children_phone' => '02103 4455130',
]));
$this->assertDatabaseHas('members', [
'main_phone' => '+49 2103 4455129',
'fax' => '+49 2103 4455130',
'children_phone' => '+49 2103 4455130',
]);
}
$response->assertSessionHasNoErrors();
$this->assertDatabaseHas('members', [
'nami_id' => null,
]);
NamiPutMemberAction::spy()->shouldNotHaveReceived('handle');
});
public function testItHasErrorWhenPhoneNumberIsInvalid(): void
{
$this->login()->loginNami();
it('testItUpdatesPhoneNumber', function () {
$this->withoutExceptionHandling()->login()->loginNami();
$response = $this->post('/member', $this->attributes([
'has_nami' => false,
'main_phone' => '1111111111111111',
'mobile_phone' => '1111111111111111',
'fax' => '1111111111111111',
'children_phone' => '1111111111111111',
]));
$this->post('/member', MemberStoreRequestFactory::new()->create([
'has_nami' => false,
'main_phone' => '02103 4455129',
'fax' => '02103 4455130',
'children_phone' => '02103 4455130',
]));
$response->assertSessionHasErrors([
'main_phone' => 'Telefon (Eltern) ist keine valide Nummer.',
'mobile_phone' => 'Handy (Eltern) ist keine valide Nummer.',
'children_phone' => 'Telefon (Kind) ist keine valide Nummer.',
'fax' => 'Fax ist keine valide Nummer.',
]);
}
$this->assertDatabaseHas('members', [
'main_phone' => '+49 2103 4455129',
'fax' => '+49 2103 4455130',
'children_phone' => '+49 2103 4455130',
]);
});
public function testItDoesntRequireBirthdayWhenNotInNami(): void
{
$this->login()->loginNami();
it('testItHasErrorWhenPhoneNumberIsInvalid', function () {
$this->login()->loginNami();
$this
->post('/member', $this->attributes([
'nationality_id' => null,
'birthday' => null,
'has_nami' => false,
'address' => null,
'zip' => null,
'location' => null,
'joined_at' => null,
]))->assertSessionDoesntHaveErrors();
$this->assertDatabaseHas('members', [
$response = $this->post('/member', MemberStoreRequestFactory::new()->create([
'has_nami' => false,
'main_phone' => '1111111111111111',
'mobile_phone' => '1111111111111111',
'fax' => '1111111111111111',
'children_phone' => '1111111111111111',
]));
$response->assertSessionHasErrors([
'main_phone' => 'Telefon (Eltern) ist keine valide Nummer.',
'mobile_phone' => 'Handy (Eltern) ist keine valide Nummer.',
'children_phone' => 'Telefon (Kind) ist keine valide Nummer.',
'fax' => 'Fax ist keine valide Nummer.',
]);
});
it('testItDoesntRequireBirthdayWhenNotInNami', function () {
$this->login()->loginNami();
$this
->post('/member', MemberStoreRequestFactory::new()->create([
'nationality_id' => null,
'birthday' => null,
'has_nami' => false,
'address' => null,
'zip' => null,
'location' => null,
'joined_at' => null,
]);
}
]))->assertSessionDoesntHaveErrors();
$this->assertDatabaseHas('members', [
'nationality_id' => null,
'birthday' => null,
'address' => null,
'zip' => null,
'location' => null,
'joined_at' => null,
]);
});
public function testItDoesntNeedSubscription(): void
{
$this->login()->loginNami();
it('testItDoesntNeedSubscription', function () {
$this->login()->loginNami();
$this
->post('/member', $this->attributes([
'has_nami' => false,
'subscription_id' => null,
]))->assertSessionDoesntHaveErrors();
$this->assertDatabaseHas('members', [
$this
->post('/member', MemberStoreRequestFactory::new()->create([
'has_nami' => false,
'subscription_id' => null,
]);
}
]))->assertSessionDoesntHaveErrors();
$this->assertDatabaseHas('members', [
'subscription_id' => null,
]);
});
public function testItRequiresFields(): void
{
$this->login()->loginNami();
it('testItRequiresFields', function () {
$this->login()->loginNami();
$this
->post('/member', $this->attributes([
'nationality_id' => null,
'birthday' => '',
'address' => '',
'zip' => '',
'location' => '',
'joined_at' => '',
]))
->assertSessionHasErrors(['nationality_id', 'birthday', 'address', 'zip', 'location', 'joined_at']);
}
$this
->post('/member', MemberStoreRequestFactory::new()->create([
'nationality_id' => null,
'birthday' => '',
'address' => '',
'zip' => '',
'location' => '',
'joined_at' => '',
]))
->assertSessionHasErrors(['nationality_id', 'birthday', 'address', 'zip', 'location', 'joined_at']);
});
public function testSubscriptionIsRequiredIfFirstActivityIsPaid(): void
{
$this->login()->loginNami();
$activity = Activity::factory()->name('€ Mitglied')->create();
$subactivity = Subactivity::factory()->create();
it('testSubscriptionIsRequiredIfFirstActivityIsPaid', function () {
$this->login()->loginNami();
$activity = Activity::factory()->name('€ Mitglied')->create();
$subactivity = Subactivity::factory()->create();
$this
->from('/member/create')
->post('/member', $this->attributes([
'first_activity_id' => $activity->id,
'first_subactivity_id' => $subactivity->id,
'subscription_id' => null,
]))
->assertSessionHasErrors(['subscription_id' => 'Beitragsart ist erforderlich.']);
}
/**
* @return array<string, mixed>
*/
public function defaults(): array
{
$country = Country::factory()->create();
$nationality = Nationality::factory()->create();
$subscription = Subscription::factory()->forFee()->create();
return [
'address' => 'Bavert 50',
'birthday' => '2013-02-19',
'children_phone' => '+49 176 70512778',
'efz' => '',
'email' => '',
'email_parents' => 'osloot@aol.com',
'fax' => '+49 212 4732223',
'firstname' => 'Joe',
'further_address' => '',
'has_nami' => true,
'has_svk' => false,
'has_vk' => false,
'joined_at' => '2022-08-12',
'lastname' => 'Muster',
'letter_address' => '',
'location' => 'Solingen',
'main_phone' => '+49 212 337056',
'mobile_phone' => '+49 176 70512774',
'more_ps_at' => '',
'multiply_more_pv' => false,
'multiply_pv' => false,
'other_country' => '',
'ps_at' => '',
'send_newspaper' => true,
'without_education_at' => '',
'without_efz_at' => '',
'work_phone' => '',
'zip' => '42719',
'country_id' => $country->id,
'nationality_id' => $nationality->id,
'subscription_id' => $subscription->id,
];
}
}
$this
->from('/member/create')
->post('/member', MemberStoreRequestFactory::new()->create([
'first_activity_id' => $activity->id,
'first_subactivity_id' => $subactivity->id,
'subscription_id' => null,
]))
->assertSessionHasErrors(['subscription_id' => 'Beitragsart ist erforderlich.']);
});

451
tests/Feature/Member/UpdateTest.php
View File

@ -6,238 +6,239 @@ use App\Actions\PullMemberAction;
use App\Actions\PullMembershipsAction;
use App\Activity;
use App\Confession;
use App\Country;
use App\Fee;
use App\Group;
use App\Member\Actions\NamiPutMemberAction;
use App\Member\Member;
use App\Nationality;
use App\Payment\Subscription;
use App\Subactivity;
use Illuminate\Foundation\Testing\DatabaseTransactions;
use Illuminate\Support\Facades\Http;
use Tests\TestCase;
use Tests\RequestFactories\MemberUpdateRequestFactory;
use Zoomyboy\LaravelNami\Fakes\MemberFake;
class UpdateTest extends TestCase
uses(DatabaseTransactions::class);
function singleMemberUrl(int $gruppierungId, int $memberId): string
{
use DatabaseTransactions;
public function testItRedirectsToMemberOverview(): void
{
$this->withoutExceptionHandling()->login()->loginNami();
$member = $this->member();
$this->fakeRequest();
NamiPutMemberAction::allowToRun();
$response = $this
->from("/member/{$member->id}")
->patch("/member/{$member->id}", array_merge($member->getAttributes(), ['has_nami' => true]));
$response->assertRedirect('/member');
NamiPutMemberAction::spy()->shouldHaveReceived('handle')->withArgs(
fn (Member $memberParam, ?Activity $activityParam, ?Subactivity $subactivityParam) => $memberParam->is($member)
&& null === $activityParam
&& null === $subactivityParam
)->once();
}
public function testItChecksVersion(): void
{
$this->login()->loginNami()->withoutExceptionHandling();
$member = $this->member();
$member->update(['version' => 43]);
$this->fakeRequest();
$response = $this
->from("/member/{$member->id}")
->patch("/member/{$member->id}", array_merge($member->getAttributes(), ['has_nami' => true, 'firstname' => '::firstname::']));
$response->assertRedirect("/member/{$member->id}/edit?conflict=1");
}
public function testItUpdatesPhoneNumber(): void
{
$this->withoutExceptionHandling()->login()->loginNami();
$member = $this->member();
$this->fakeRequest();
NamiPutMemberAction::allowToRun();
$this->patch("/member/{$member->id}", array_merge($member->getAttributes(), [
'main_phone' => '02103 4455129',
'fax' => '02103 4455130',
'children_phone' => '02103 4455130',
'has_nami' => true,
]));
$this->assertDatabaseHas('members', [
'main_phone' => '+49 2103 4455129',
'fax' => '+49 2103 4455130',
'children_phone' => '+49 2103 4455130',
]);
}
public function testItUpdatesWiederverwendenFlag(): void
{
$this->withoutExceptionHandling()->login()->loginNami();
$member = $this->member();
$this->fakeRequest();
NamiPutMemberAction::allowToRun();
$this->patch("/member/{$member->id}", array_merge($member->getAttributes(), [
'keepdata' => true,
'has_nami' => true,
]));
$this->assertDatabaseHas('members', [
'keepdata' => true,
]);
}
public function testItSetsLocationToNull(): void
{
$this->withoutExceptionHandling()->login()->loginNami();
$member = $this->member(['location' => 'Hilden', 'nami_id' => null]);
$this->fakeRequest();
NamiPutMemberAction::allowToRun();
$this->patch("/member/{$member->id}", array_merge($member->getAttributes(), [
'location' => null,
]));
$this->assertDatabaseHas('members', [
'location' => null,
]);
}
public function testItUpdatesContact(): void
{
$this->withoutExceptionHandling()->login()->loginNami();
$member = $this->member(['nami_id' => null]);
$this->fakeRequest();
$response = $this
->from("/member/{$member->id}")
->patch("/member/{$member->id}", array_merge($member->getAttributes(), [
'other_country' => 'englisch',
]));
$this->assertEquals('englisch', $member->fresh()->other_country);
}
public function testItCreatesMemberWithFirstActivityId(): void
{
$this->login()->loginNami()->withoutExceptionHandling();
$member = Member::factory()->defaults()->create();
app(MemberFake::class)->stores($member->group->nami_id, 103);
$activity = Activity::factory()->inNami(89)->create();
$subactivity = Subactivity::factory()->inNami(90)->create();
Confession::factory()->create(['is_null' => true]);
PullMemberAction::shouldRun();
PullMembershipsAction::shouldRun();
$this->patch("/member/{$member->id}", [
...$member->getAttributes(),
'has_nami' => true,
'first_activity_id' => $activity->id,
'first_subactivity_id' => $subactivity->id,
])->assertSessionHasNoErrors();
app(MemberFake::class)->assertStored($member->group->nami_id, [
'ersteTaetigkeitId' => 89,
'ersteUntergliederungId' => 90,
]);
}
public function testItRequiresFirstActivityId(): void
{
$this->login()->loginNami();
$member = Member::factory()->defaults()->create();
app(MemberFake::class)->stores($member->group->nami_id, 103);
Confession::factory()->create(['is_null' => true]);
PullMemberAction::shouldRun();
PullMembershipsAction::shouldRun();
$this->patch("/member/{$member->id}", [
...$member->getAttributes(),
'has_nami' => true,
'first_activity_id' => null,
'first_subactivity_id' => null,
])->assertSessionHasErrors([
'first_activity_id' => 'Erste Tätigkeit ist erforderlich.',
'first_subactivity_id' => 'Erste Untergliederung ist erforderlich.',
]);
}
public function testItUpdatesCriminalRecord(): void
{
$this->withoutExceptionHandling()->login()->loginNami();
$member = $this->member(['nami_id' => null]);
$this->fakeRequest();
$response = $this
->from("/member/{$member->id}")
->patch("/member/{$member->id}", array_merge($member->getAttributes(), [
'ps_at' => '2021-02-01',
'more_ps_at' => '2021-02-02',
'has_svk' => true,
'has_vk' => true,
'efz' => '2021-02-03',
'without_education_at' => '2021-02-04',
'without_efz_at' => '2021-02-05',
'recertified_at' => '2021-02-08',
'has_nami' => false,
'multiply_pv' => true,
'multiply_more_pv' => true,
'salutation' => 'Doktor',
]));
$this->assertEquals('2021-02-01', $member->fresh()->ps_at->format('Y-m-d'));
$this->assertEquals('2021-02-02', $member->fresh()->more_ps_at->format('Y-m-d'));
$this->assertTrue($member->fresh()->has_svk);
$this->assertTrue($member->fresh()->has_vk);
$this->assertTrue($member->fresh()->multiply_pv);
$this->assertTrue($member->fresh()->multiply_more_pv);
$this->assertEquals('2021-02-03', $member->fresh()->efz->format('Y-m-d'));
$this->assertEquals('2021-02-04', $member->fresh()->without_education_at->format('Y-m-d'));
$this->assertEquals('2021-02-05', $member->fresh()->without_efz_at->format('Y-m-d'));
$this->assertEquals('2021-02-08', $member->fresh()->recertified_at->format('Y-m-d'));
$this->assertEquals('Doktor', $member->fresh()->salutation);
}
/**
* @param array<string, string|Activity|null> $overwrites
*/
private function member(array $overwrites = []): Member
{
return Member::factory()
->for(Group::factory()->state(['nami_id' => 10]))
->for(Confession::factory())
->for(Nationality::factory())
->for(Subscription::factory()->forFee())
->for(Country::factory())
->create(['nami_id' => 135, ...$overwrites]);
}
private function fakeRequest(): void
{
Http::fake(function ($request) {
if ($request->url() === $this->singleMemberUrl(10, 135) && 'GET' === $request->method()) {
return Http::response('{ "success": true, "data": {"missingkey": "missingvalue", "kontoverbindung": {"a": "b"} } }', 200);
}
if ($request->url() === $this->singleMemberUrl(10, 135) && 'PUT' === $request->method() && 43 === $request['version']) {
return Http::response('{ "success": false, "message": "Update nicht möglich. Der Datensatz wurde zwischenzeitlich verändert." }', 200);
}
if ($request->url() === $this->singleMemberUrl(10, 135) && 'PUT' === $request->method()) {
return Http::response('{ "success": true, "data": { "version": 44 } }', 200);
}
});
}
private function singleMemberUrl(int $gruppierungId, int $memberId): string
{
return "https://nami.dpsg.de/ica/rest/nami/mitglied/filtered-for-navigation/gruppierung/gruppierung/{$gruppierungId}/{$memberId}";
}
return "https://nami.dpsg.de/ica/rest/nami/mitglied/filtered-for-navigation/gruppierung/gruppierung/{$gruppierungId}/{$memberId}";
}
beforeEach(function () {
Confession::factory()->create(['is_null' => true]);
});
function fakeRequest(): void
{
Http::fake(function ($request) {
if ($request->url() === singleMemberUrl(10, 135) && 'GET' === $request->method()) {
return Http::response('{ "success": true, "data": {"missingkey": "missingvalue", "kontoverbindung": {"a": "b"} } }', 200);
}
if ($request->url() === singleMemberUrl(10, 135) && 'PUT' === $request->method() && 43 === $request['version']) {
return Http::response('{ "success": false, "message": "Update nicht möglich. Der Datensatz wurde zwischenzeitlich verändert." }', 200);
}
if ($request->url() === singleMemberUrl(10, 135) && 'PUT' === $request->method()) {
return Http::response('{ "success": true, "data": { "version": 44 } }', 200);
}
});
}
function factory()
{
return Member::factory()
->defaults()
->for(Group::factory()->state(['nami_id' => 10]))
->state(['nami_id' => 135]);
}
it('calls put action', function () {
$this->withoutExceptionHandling()->login()->loginNami();
$member = factory()->create();
fakeRequest();
NamiPutMemberAction::allowToRun();
$this->patch("/member/{$member->id}", MemberUpdateRequestFactory::new()->create());
NamiPutMemberAction::spy()->shouldHaveReceived('handle')->withArgs(
fn (Member $memberParam, ?Activity $activityParam, ?Subactivity $subactivityParam) => $memberParam->is($member)
&& null === $activityParam
&& null === $subactivityParam
)->once();
});
it('redirects to member overview', function () {
$this->withoutExceptionHandling()->login()->loginNami();
$member = factory()->create();
fakeRequest();
NamiPutMemberAction::allowToRun();
$this->patch("/member/{$member->id}", MemberUpdateRequestFactory::new()->create())
->assertRedirect('/member');
});
it('testItChecksVersion', function () {
$this->login()->loginNami()->withoutExceptionHandling();
$member = tap(factory()->create(), fn ($member) => $member->update(['version' => 43]));
fakeRequest();
$this->patch("/member/{$member->id}", array_merge($member->getAttributes(), MemberUpdateRequestFactory::new()->create()))
->assertRedirect("/member/{$member->id}/edit?conflict=1");
});
it('testItUpdatesPhoneNumber', function () {
$this->withoutExceptionHandling()->login()->loginNami();
$member = factory()->create();
fakeRequest();
NamiPutMemberAction::allowToRun();
$this->patch("/member/{$member->id}", MemberUpdateRequestFactory::new()->create([
'main_phone' => '02103 4455129',
'fax' => '02103 4455130',
'children_phone' => '02103 4455130',
]));
$this->assertDatabaseHas('members', [
'main_phone' => '+49 2103 4455129',
'fax' => '+49 2103 4455130',
'children_phone' => '+49 2103 4455130',
]);
});
it('testItUpdatesBankAccount', function () {
$this->withoutExceptionHandling()->login()->loginNami();
$member = factory()->create();
fakeRequest();
NamiPutMemberAction::allowToRun();
$this->patch("/member/{$member->id}", MemberUpdateRequestFactory::new()->create([
'bank_account' => [
'iban' => 'DE1122',
'bic' => 'SOLSDE',
'person' => 'Max'
]
]));
$this->assertDatabaseHas('bank_accounts', [
'iban' => 'DE1122',
'bic' => 'SOLSDE',
'person' => 'Max',
'member_id' => $member->id,
]);
});
it('testItUpdatesWiederverwendenFlag', function () {
$this->withoutExceptionHandling()->login()->loginNami();
$member = factory()->create();
fakeRequest();
NamiPutMemberAction::allowToRun();
$this->patch("/member/{$member->id}", MemberUpdateRequestFactory::new()->create([
'keepdata' => true,
]));
$this->assertDatabaseHas('members', [
'keepdata' => true,
]);
});
it('testItSetsLocationToNull', function () {
$this->withoutExceptionHandling()->login()->loginNami();
$member = factory()->notInNami()->create(['location' => 'Hilden']);
fakeRequest();
NamiPutMemberAction::allowToRun();
$this->patch("/member/{$member->id}", MemberUpdateRequestFactory::new()->noNami()->create([
'location' => null,
'bank_account' => []
]));
$this->assertDatabaseHas('members', [
'location' => null,
]);
});
it('testItUpdatesContact', function () {
$this->withoutExceptionHandling()->login()->loginNami();
$member = factory()->notInNami()->create();
fakeRequest();
$this->patch("/member/{$member->id}", MemberUpdateRequestFactory::new()->noNami()->create([
'other_country' => 'englisch',
'bank_account' => []
]));
$this->assertEquals('englisch', $member->fresh()->other_country);
});
it('testItCreatesMemberWithFirstActivityId', function () {
$this->login()->loginNami()->withoutExceptionHandling();
$member = factory()->new()->defaults()->create();
app(MemberFake::class)->stores($member->group->nami_id, 103);
$activity = Activity::factory()->inNami(89)->create();
$subactivity = Subactivity::factory()->inNami(90)->create();
Confession::factory()->create(['is_null' => true]);
PullMemberAction::shouldRun();
PullMembershipsAction::shouldRun();
$this->patch("/member/{$member->id}", MemberUpdateRequestFactory::new()->create([
'first_activity_id' => $activity->id,
'first_subactivity_id' => $subactivity->id,
]))->assertSessionHasNoErrors();
app(MemberFake::class)->assertStored($member->group->nami_id, [
'ersteTaetigkeitId' => 89,
'ersteUntergliederungId' => 90,
]);
});
it('testItRequiresFirstActivityId', function () {
$this->login()->loginNami();
$member = factory()->new()->defaults()->create();
app(MemberFake::class)->stores($member->group->nami_id, 103);
Confession::factory()->create(['is_null' => true]);
PullMemberAction::shouldRun();
PullMembershipsAction::shouldRun();
$this->patch("/member/{$member->id}", MemberUpdateRequestFactory::new()->create([
'first_activity_id' => null,
'first_subactivity_id' => null,
]))->assertSessionHasErrors([
'first_activity_id' => 'Erste Tätigkeit ist erforderlich.',
'first_subactivity_id' => 'Erste Untergliederung ist erforderlich.',
]);
});
it('testItUpdatesCriminalRecord', function () {
$this->withoutExceptionHandling()->login()->loginNami();
$member = factory()->notInNami()->create();
fakeRequest();
$this
->patch("/member/{$member->id}", MemberUpdateRequestFactory::new()->noNami()->create([
'ps_at' => '2021-02-01',
'more_ps_at' => '2021-02-02',
'has_svk' => true,
'has_vk' => true,
'efz' => '2021-02-03',
'without_education_at' => '2021-02-04',
'without_efz_at' => '2021-02-05',
'recertified_at' => '2021-02-08',
'has_nami' => false,
'multiply_pv' => true,
'multiply_more_pv' => true,
'salutation' => 'Doktor',
'bank_account' => []
]));
$this->assertEquals('2021-02-01', $member->fresh()->ps_at->format('Y-m-d'));
$this->assertEquals('2021-02-02', $member->fresh()->more_ps_at->format('Y-m-d'));
$this->assertTrue($member->fresh()->has_svk);
$this->assertTrue($member->fresh()->has_vk);
$this->assertTrue($member->fresh()->multiply_pv);
$this->assertTrue($member->fresh()->multiply_more_pv);
$this->assertEquals('2021-02-03', $member->fresh()->efz->format('Y-m-d'));
$this->assertEquals('2021-02-04', $member->fresh()->without_education_at->format('Y-m-d'));
$this->assertEquals('2021-02-05', $member->fresh()->without_efz_at->format('Y-m-d'));
$this->assertEquals('2021-02-08', $member->fresh()->recertified_at->format('Y-m-d'));
$this->assertEquals('Doktor', $member->fresh()->salutation);
});

22
tests/RequestFactories/MemberRequestFactory.php
View File

@ -2,6 +2,9 @@
namespace Tests\RequestFactories;
use App\Country;
use App\Nationality;
use App\Payment\Subscription;
use Worksome\RequestFactories\RequestFactory;
class MemberRequestFactory extends RequestFactory
@ -11,14 +14,18 @@ class MemberRequestFactory extends RequestFactory
*/
public function definition(): array
{
$country = Country::factory()->create();
$nationality = Nationality::factory()->create();
$subscription = Subscription::factory()->forFee()->create();
return [
'address' => 'Bavert 50',
'birthday' => '2013-02-19',
'children_phone' => '+49 123 44444',
'children_phone' => '+49 176 70512778',
'efz' => '',
'email' => '',
'email_parents' => 'osloot@aol.com',
'fax' => '+49 666',
'fax' => '+49 212 4732223',
'firstname' => 'Joe',
'further_address' => '',
'has_nami' => true,
@ -28,8 +35,8 @@ class MemberRequestFactory extends RequestFactory
'lastname' => 'Muster',
'letter_address' => '',
'location' => 'Solingen',
'main_phone' => '+49 212 2334322',
'mobile_phone' => '+49 157 53180451',
'main_phone' => '+49 212 337056',
'mobile_phone' => '+49 176 70512774',
'more_ps_at' => '',
'multiply_more_pv' => false,
'multiply_pv' => false,
@ -40,6 +47,13 @@ class MemberRequestFactory extends RequestFactory
'without_efz_at' => '',
'work_phone' => '',
'zip' => '42719',
'bank_account' => [
'iban' => '',
'bic' => '',
],
'country_id' => $country->id,
'nationality_id' => $nationality->id,
'subscription_id' => $subscription->id,
];
}
}

21
tests/RequestFactories/MemberStoreRequestFactory.php Normal file
View File

@ -0,0 +1,21 @@
<?php
namespace Tests\RequestFactories;
use App\Activity;
use App\Subactivity;
class MemberStoreRequestFactory extends MemberRequestFactory
{
public function definition(): array
{
$activity = Activity::factory()->inNami(89)->create();
$subactivity = Subactivity::factory()->inNami(90)->create();
return [
...parent::definition(),
'first_activity_id' => $activity->id,
'first_subactivity_id' => $subactivity->id,
];
}
}

11
tests/RequestFactories/MemberUpdateRequestFactory.php Normal file
View File

@ -0,0 +1,11 @@
<?php
namespace Tests\RequestFactories;
class MemberUpdateRequestFactory extends MemberRequestFactory
{
public function noNami(): self
{
return $this->state(['has_nami' => false]);
}
}