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

Move nami delete member action

This commit is contained in:
philipp lang 2023-08-15 23:00:01 +02:00
parent 6dffb8d4ff
commit 0ae11f753f
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Member/DeleteAction.php → app/Member/Actions/NamiDeleteMemberAction.php
View File

@ -1,11 +1,11 @@
<?php <?php
namespace App\Member; namespace App\Member\Actions;
use App\Setting\NamiSettings; use App\Setting\NamiSettings;
use Lorisleiva\Actions\Concerns\AsAction; use Lorisleiva\Actions\Concerns\AsAction;
class DeleteAction class NamiDeleteMemberAction
{ {
use AsAction; use AsAction;

3
app/Member/MemberController.php
View File

@ -6,6 +6,7 @@ use App\Country;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use App\Lib\Events\ClientMessage; use App\Lib\Events\ClientMessage;
use App\Maildispatcher\Actions\ResyncAction; use App\Maildispatcher\Actions\ResyncAction;
use App\Member\Actions\NamiDeleteMemberAction;
use App\Setting\GeneralSettings; use App\Setting\GeneralSettings;
use App\Setting\NamiSettings; use App\Setting\NamiSettings;
use Illuminate\Http\RedirectResponse; use Illuminate\Http\RedirectResponse;
@ -86,7 +87,7 @@ class MemberController extends Controller
public function destroy(Member $member): RedirectResponse public function destroy(Member $member): RedirectResponse
{ {
if ($member->nami_id) { if ($member->nami_id) {
DeleteAction::dispatch($member->nami_id); NamiDeleteMemberAction::dispatch($member->nami_id);
} }
$member->delete(); $member->delete();

3
app/Member/MemberRequest.php
View File

@ -6,6 +6,7 @@ use App\Activity;
use App\Group; use App\Group;
use App\Invoice\BillKind; use App\Invoice\BillKind;
use App\Maildispatcher\Actions\ResyncAction; use App\Maildispatcher\Actions\ResyncAction;
use App\Member\Actions\NamiDeleteMemberAction;
use App\Member\Actions\NamiPutMemberAction; use App\Member\Actions\NamiPutMemberAction;
use App\Setting\NamiSettings; use App\Setting\NamiSettings;
use App\Subactivity; use App\Subactivity;
@ -113,7 +114,7 @@ class MemberRequest extends FormRequest
NamiPutMemberAction::run($member->fresh(), null, null); NamiPutMemberAction::run($member->fresh(), null, null);
} }
if (!$this->input('has_nami') && null !== $member->nami_id) { if (!$this->input('has_nami') && null !== $member->nami_id) {
DeleteAction::dispatch($member->nami_id); NamiDeleteMemberAction::dispatch($member->nami_id);
} }
ResyncAction::dispatch(); ResyncAction::dispatch();
} }

8
tests/Feature/Member/DeleteTest.php
View File

@ -4,7 +4,7 @@ namespace Tests\Feature\Member;
use App\Course\Models\Course; use App\Course\Models\Course;
use App\Course\Models\CourseMember; use App\Course\Models\CourseMember;
use App\Member\DeleteAction; use App\Member\Actions\NamiDeleteMemberAction;
use App\Member\Member; use App\Member\Member;
use Carbon\Carbon; use Carbon\Carbon;
use Illuminate\Foundation\Testing\DatabaseTransactions; use Illuminate\Foundation\Testing\DatabaseTransactions;
@ -26,7 +26,7 @@ class DeleteTest extends TestCase
$response->assertRedirect('/member'); $response->assertRedirect('/member');
DeleteAction::assertPushed(); NamiDeleteMemberAction::assertPushed();
$this->assertDatabaseMissing('members', [ $this->assertDatabaseMissing('members', [
'id' => $member->id, 'id' => $member->id,
]); ]);
@ -42,7 +42,7 @@ class DeleteTest extends TestCase
$response->assertRedirect('/member'); $response->assertRedirect('/member');
Queue::assertNotPushed(DeleteAction::class); Queue::assertNotPushed(NamiDeleteMemberAction::class);
$this->assertDatabaseMissing('members', [ $this->assertDatabaseMissing('members', [
'id' => $member->id, 'id' => $member->id,
]); ]);
@ -54,7 +54,7 @@ class DeleteTest extends TestCase
$this->withoutExceptionHandling()->login()->loginNami(); $this->withoutExceptionHandling()->login()->loginNami();
$member = Member::factory()->defaults()->inNami(123)->create(); $member = Member::factory()->defaults()->inNami(123)->create();
DeleteAction::dispatch(123); NamiDeleteMemberAction::dispatch(123);
app(MemberFake::class)->assertDeleted(123, Carbon::parse('yesterday')); app(MemberFake::class)->assertDeleted(123, Carbon::parse('yesterday'));
} }