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

Fixed tests

This commit is contained in:
philipp lang 2023-02-07 01:38:27 +01:00
parent 07fbba1d6a
commit e2c07a597b
7 changed files with 27 additions and 420 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/Actions/PullMemberAction.php
View File

@ -19,16 +19,13 @@ class PullMemberAction
{
use AsAction;
public function handle(int $groupId, int $memberId): void
public function handle(int $groupId, int $memberId): Member
{
$member = $this->api()->member($groupId, $memberId);
if (!$member->joinedAt) {
return;
}
$region = Region::firstWhere('nami_id', $member->regionId ?: -1);
Member::updateOrCreate(['nami_id' => $member->id], [
return Member::updateOrCreate(['nami_id' => $member->id], [
'firstname' => $member->firstname,
'lastname' => $member->lastname,
'joined_at' => $member->joinedAt,

2
app/Console/Kernel.php
View File

@ -2,6 +2,7 @@
namespace App\Console;
use App\Initialize\Actions\InitializeAction;
use App\Letter\Actions\LetterSendAction;
use Illuminate\Console\Scheduling\Schedule;
use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
@ -16,6 +17,7 @@ class Kernel extends ConsoleKernel
*/
protected $commands = [
LetterSendAction::class,
InitializeAction::class,
];
/**

16
app/Initialize/Actions/InitializeAction.php
View File

@ -4,6 +4,7 @@ namespace App\Initialize\Actions;
use App\Initialize\InitializeJob;
use App\Setting\NamiSettings;
use Illuminate\Console\Command;
use Illuminate\Http\RedirectResponse;
use Illuminate\Validation\ValidationException;
use Lorisleiva\Actions\ActionRequest;
@ -14,6 +15,8 @@ class InitializeAction
{
use AsAction;
public $commandSignature = 'initialize {--mglnr=} {--password=} {--group=}';
public function handle(int $mglnr, string $password, int $groupId): void
{
InitializeJob::dispatch();
@ -62,4 +65,17 @@ class InitializeAction
return redirect()->route('home')->success('Initialisierung beauftragt. Wir benachrichtigen dich per Mail wenn alles fertig ist.');
}
public function asCommand(Command $command, NamiSettings $settings): void
{
$mglnr = (int) $command->option('mglnr');
$password = $command->option('password');
$group = (int) $command->option('group');
$api = Nami::login($mglnr, $password);
$settings->mglnr = $mglnr;
$settings->password = $password;
$settings->default_group_id = $group;
$settings->save();
$this->handle((int) $mglnr, (string) $password, (int) $group);
}
}

9
app/Initialize/InitializeMembers.php
View File

@ -3,9 +3,9 @@
namespace App\Initialize;
use App\Actions\PullMemberAction;
use App\Actions\PullMembershipsAction;
use DB;
use Zoomyboy\LaravelNami\Api;
use Zoomyboy\LaravelNami\Member as NamiMember;
class InitializeMembers
{
@ -20,9 +20,10 @@ class InitializeMembers
{
$allMembers = collect([]);
$this->api->search([])->each(
fn (NamiMember $member) => app(PullMemberAction::class)->api($this->api)->member($member->group_id, $member->id)->execute()
);
$this->api->search([])->each(function ($member) {
$localMember = app(PullMemberAction::class)->handle($member->groupId, $member->id);
app(PullMembershipsAction::class)->handle($localMember);
});
}
public function restore(): void

2
packages/laravel-nami

@ -1 +1 @@
Subproject commit 5eef3074d76dba843fa053e04d7637f056c05457
Subproject commit 5890d0dbe1b1428c1e1c82039d362bfbb224cb4c

406
tests/Feature/Initialize/InitializeTest.php
View File

@ -1,406 +0,0 @@
<?php
namespace Tests\Feature\Initialize;
use App\Activity;
use App\Country;
use App\Course\Models\Course;
use App\Gender;
use App\Group;
use App\Initialize\InitializeJob;
use App\Member\Member;
use App\Nationality;
use App\Subactivity;
use Illuminate\Foundation\Testing\DatabaseTransactions;
use Illuminate\Support\Facades\Http;
use Tests\TestCase;
use Zoomyboy\LaravelNami\Backend\FakeBackend;
use Zoomyboy\LaravelNami\Fakes\GroupFake;
class InitializeTest extends TestCase
{
use DatabaseTransactions;
public function initializeProvider(callable $callback = null): void
{
app(GroupFake::class)
->fetches(null, [1000 => ['name' => 'testgroup']])
->fetches(1000, []);
$backend = app(FakeBackend::class)
->addSearch(123, ['entries_vorname' => '::firstname::', 'entries_nachname' => '::lastname::', 'entries_gruppierungId' => 1000])
->fakeNationalities([['name' => 'deutsch', 'id' => 291]])
->fakeFees(1000, [['name' => 'Family', 'id' => 300]])
->fakeConfessions([['name' => 'Konf', 'id' => 301]])
->fakeCountries([['name' => 'Germany', 'id' => 302]])
->fakeGenders([['name' => 'Male', 'id' => 303]])
->fakeRegions([['name' => 'nrw', 'id' => 304]])
->fakeCourses([['name' => '1a', 'id' => 506]])
->fakeActivities(1000, [['name' => '€ leiter', 'id' => 305]]);
if (!$callback) {
$backend->fakeMember([
'vorname' => '::firstname::',
'nachname' => '::lastname::',
'beitragsartId' => 300,
'geburtsDatum' => '2014-07-11 00:00:00',
'gruppierungId' => 1000,
'id' => 411,
'eintrittsdatum' => '2020-11-17 00:00:00',
'geschlechtId' => 303,
'landId' => 302,
'staatsangehoerigkeitId' => 291,
'zeitschriftenversand' => true,
'strasse' => '::street',
'plz' => '12346',
'ort' => '::location::',
'gruppierung' => 'testgroup',
'version' => 40,
]);
} else {
$callback($backend);
}
$backend->fakeSubactivities([
305 => [['name' => 'wö', 'id' => 306]],
]);
}
public function testItInitializesAll(): void
{
$this->withoutExceptionHandling()->login()->loginNami();
$this->initializeProvider();
InitializeJob::dispatch();
$this->assertDatabaseHas('regions', [
'name' => 'nrw',
'nami_id' => 304,
]);
$this->assertDatabaseHas('genders', [
'name' => 'Male',
'nami_id' => 303,
]);
$this->assertDatabaseHas('nationalities', [
'name' => 'deutsch',
'nami_id' => 291,
]);
$this->assertDatabaseHas('fees', [
'name' => 'Family',
'nami_id' => 300,
]);
$this->assertDatabaseHas('confessions', [
'name' => 'Konf',
'nami_id' => 301,
]);
$this->assertDatabaseHas('countries', [
'name' => 'Germany',
'nami_id' => 302,
]);
$this->assertDatabaseHas('activities', [
'name' => '€ Leiter',
'nami_id' => 305,
]);
$this->assertDatabaseHas('courses', [
'name' => '1a',
'nami_id' => 506,
]);
$this->assertDatabaseHas('groups', ['nami_id' => 1000, 'name' => 'testgroup']);
$this->assertDatabaseHas('members', [
'nami_id' => 411,
'gender_id' => Gender::nami(303)->id,
'country_id' => Country::nami(302)->id,
'nationality_id' => Nationality::nami(291)->id,
'send_newspaper' => 1,
'address' => '::street',
'zip' => '12346',
'location' => '::location::',
'version' => 40,
]);
$this->assertEquals([306], Activity::where('nami_id', 305)->firstOrFail()->subactivities()->pluck('nami_id')->toArray());
Http::assertSentCount(17);
}
public function testSyncCoursesOfMember(): void
{
$this->withoutExceptionHandling()->login()->loginNami();
$this->initializeProvider(function ($backend) {
$backend->fakeMembers([
$this->member(['courses' => [['bausteinId' => 506, 'id' => 788, 'veranstalter' => 'KJA', 'vstgName' => 'eventname', 'vstgTag' => '2021-11-12 00:00:00']]]),
]);
});
$this->login();
InitializeJob::dispatch();
$this->assertDatabaseHas('course_members', [
'member_id' => Member::where('firstname', '::firstname::')->firstOrFail()->id,
'course_id' => Course::where('name', '1a')->firstOrFail()->id,
'event_name' => 'eventname',
'completed_at' => '2021-11-12',
'organizer' => 'KJA',
'nami_id' => 788,
]);
}
public function membershipDataProvider(): array
{
return [
'dont_fetch_activity_from_group' => [
[
'gruppierung' => '::newgroup:: 22',
'id' => 1077,
'taetigkeit' => '::newtaetigkeit:: (9001)',
],
function ($db) {
$db->assertDatabaseCount('memberships', 0);
},
function ($backend) {
return $backend->fakeSingleMembership(116, 1077, [
'aktivVon' => '2021-08-22 00:00:00',
'aktivBis' => '',
'gruppierungId' => 9056,
'gruppierung' => '::newgroup::',
'id' => 1077,
'taetigkeit' => '::newtaetigkeit::',
'taetigkeitId' => 4000,
'untergliederungId' => 306,
])
->fakeActivities(9056, []);
},
],
'fetch_subactivity_from_group' => [
[
'gruppierung' => '::newgroup:: 22',
'id' => 1077,
'untergliederung' => '::newuntertaetigkeit::',
],
function ($db) {
$db->assertDatabaseHas('subactivities', ['name' => 'wö2', 'nami_id' => 3007]);
$db->assertDatabaseHas('activity_subactivity', [
'activity_id' => Activity::where('nami_id', 305)->firstOrFail()->id,
'subactivity_id' => Subactivity::where('nami_id', 3007)->firstOrFail()->id,
]);
$db->assertDatabaseHas('memberships', [
'activity_id' => Activity::where('nami_id', 305)->firstOrFail()->id,
'subactivity_id' => Subactivity::where('nami_id', 3007)->firstOrFail()->id,
'group_id' => Group::where('nami_id', 9056)->firstOrFail()->id,
'nami_id' => 1077,
]);
},
function ($backend) {
return $backend->fakeSingleMembership(116, 1077, [
'aktivVon' => '2021-08-22 00:00:00',
'aktivBis' => '',
'gruppierungId' => 9056,
'gruppierung' => '::newgroup::',
'id' => 1077,
'taetigkeitId' => 305, // default
'taetigkeit' => 'wö',
'untergliederung' => '::newuntertaetigkeit::',
'untergliederungId' => 3007,
])
->fakeActivities(9056, [['name' => '€ leiter', 'id' => 305]])
->fakeSubactivities([
305 => [
['name' => 'wö', 'id' => 306],
['name' => 'wö2', 'id' => 3007],
],
]);
},
],
'fetch_activity_from_group' => [
[
'gruppierung' => '::newgroup:: 22',
'id' => 1077,
'taetigkeit' => '::newtaetigkeit:: (9001)',
],
function ($db) {
$db->assertDatabaseHas('activities', ['name' => '::newtaetigkeit::', 'nami_id' => 4000]);
$db->assertDatabaseHas('groups', ['name' => '::newgroup::', 'nami_id' => 9056]);
$db->assertDatabaseHas('activity_subactivity', [
'activity_id' => Activity::where('nami_id', 4000)->firstOrFail()->id,
'subactivity_id' => Subactivity::where('nami_id', 306)->firstOrFail()->id,
]);
$db->assertDatabaseHas('memberships', [
'activity_id' => Activity::where('nami_id', 4000)->firstOrFail()->id,
'group_id' => Group::where('nami_id', 9056)->firstOrFail()->id,
'nami_id' => 1077,
]);
},
function ($backend) {
return $backend->fakeSingleMembership(116, 1077, [
'aktivVon' => '2021-08-22 00:00:00',
'aktivBis' => '',
'gruppierungId' => 9056,
'gruppierung' => '::newgroup::',
'id' => 1077,
'taetigkeit' => '::newtaetigkeit::',
'taetigkeitId' => 4000,
'untergliederungId' => 306,
])
->fakeActivities(9056, [['name' => '::newtaetigkeit::', 'id' => 4000]])
->fakeSubactivities([
4000 => [['name' => 'wö', 'id' => 306]],
]);
},
],
'new_group' => [
[
'gruppierung' => '::new group:: 5555',
],
function ($db) {
$db->assertDatabaseHas('groups', ['name' => '::new group::', 'nami_id' => 5555]);
},
function ($backend) {
return $backend->fakeSingleMembership(116, 1077, [
'aktivVon' => '2021-08-22 00:00:00',
'aktivBis' => '',
'gruppierungId' => 5555,
'gruppierung' => '::new group::',
'id' => 1077,
'taetigkeitId' => 305,
'untergliederungId' => 306,
])
->fakeActivities(5555, [['name' => 'mitglied', 'id' => 310]])
->fakeSubactivities([
310 => [['name' => 'wö', 'id' => 306]],
]);
},
],
'no_subactivity' => [
[
'untergliederung' => '',
],
function ($db) {
$db->assertDatabaseHas('memberships', ['subactivity_id' => null]);
},
],
'wrong_dates' => [
[
'aktivVon' => '1014-04-01 00:00:00',
],
function ($db) {
$db->assertDatabaseHas('memberships', [
'from' => '1014-04-01 00:00:00',
]);
},
],
'not_inactive' => [
[
'aktivBis' => '2021-08-25 00:00:00',
],
function ($db) {
$db->assertDatabaseCount('memberships', 0);
},
],
];
}
/**
* @dataProvider membershipDataProvider
*/
public function testSyncMembershipsOfMember(array $membership, callable $dbcheck, ?callable $backendCallback = null): void
{
if (!$backendCallback) {
$backendCallback = function ($backend) { return $backend; };
}
$this->withoutExceptionHandling()->login()->loginNami();
$this->initializeProvider(function ($backend) use ($membership, $backendCallback) {
$backend->fakeMembers([
$this->member([
'memberships' => [array_merge([
'aktivVon' => '2021-08-22 00:00:00',
'aktivBis' => '',
'gruppierung' => 'testgroup',
'id' => 1077,
'taetigkeit' => 'leiter (305)',
'untergliederung' => 'wö',
], $membership)],
]),
]);
$backendCallback($backend);
});
InitializeJob::dispatch();
$dbcheck($this);
}
public function testItDoesntGetMembersWithNoJoinedAtDate(): void
{
$this->withoutExceptionHandling()->login()->loginNami();
$this->initializeProvider(function ($backend) {
$backend->fakeMembers([$this->member(['eintrittsdatum' => null])]);
});
$this->login();
InitializeJob::dispatch();
$this->assertDatabaseCount('members', 0);
}
/**
* @return array<int, array<int, int>>
*/
public function pageProvider(): array
{
return [
[99],
[100],
[101],
[199],
[200],
[201],
];
}
/**
* @dataProvider pageProvider
*/
public function testItInitializesPages(int $num): void
{
$this->withoutExceptionHandling()->login()->loginNami();
$this->initializeProvider(function ($backend) use ($num) {
$members = collect([]);
foreach (range(1, $num) as $i) {
$members->push($this->member(['id' => $i]));
}
$backend->fakeMembers($members->toArray());
});
$this->login();
InitializeJob::dispatch();
$this->assertDatabaseCount('members', $num);
}
/**
* @param array<string, mixed> $overwrites
*
* @return array<string, mixed>
*/
private function member(array $overwrites): array
{
return array_merge([
'vorname' => '::firstname::',
'nachname' => '::lastname::',
'beitragsartId' => 300,
'geburtsDatum' => '2014-07-11 00:00:00',
'gruppierungId' => 1000,
'geschlechtId' => 303,
'id' => 116,
'eintrittsdatum' => '2020-11-17 00:00:00',
'landId' => 302,
'staatsangehoerigkeitId' => 291,
'zeitschriftenversand' => true,
'strasse' => '::street',
'plz' => '12346',
'ort' => '::location::',
'version' => 40,
'gruppierung' => 'testgroup',
], $overwrites);
}
}

3
tests/Feature/Member/NamiPutMemberActionTest.php
View File

@ -8,7 +8,6 @@ use App\Activity;
use App\Confession;
use App\Country;
use App\Fee;
use App\Gender;
use App\Group;
use App\Member\Actions\NamiPutMemberAction;
use App\Member\Member;
@ -32,7 +31,6 @@ class NamiPutMemberActionTest extends TestCase
$this->stubIo(PullMembershipsAction::class, fn ($mock) => $mock);
$this->withoutExceptionHandling()->login()->loginNami();
$country = Country::factory()->create();
$gender = Gender::factory()->create();
$region = Region::factory()->create();
$nationality = Nationality::factory()->inNami(565)->create();
$subscription = Subscription::factory()->create();
@ -47,7 +45,6 @@ class NamiPutMemberActionTest extends TestCase
->for($subscription)
->for($region)
->for($nationality)
->for($gender)
->for($group)
->emailBillKind()
->create(['email_parents' => 'a@b.de']);