Move nami delete member action
This commit is contained in:
parent
6dffb8d4ff
commit
0ae11f753f
|
@ -1,11 +1,11 @@
|
|||
<?php
|
||||
|
||||
namespace App\Member;
|
||||
namespace App\Member\Actions;
|
||||
|
||||
use App\Setting\NamiSettings;
|
||||
use Lorisleiva\Actions\Concerns\AsAction;
|
||||
|
||||
class DeleteAction
|
||||
class NamiDeleteMemberAction
|
||||
{
|
||||
use AsAction;
|
||||
|
|
@ -6,6 +6,7 @@ use App\Country;
|
|||
use App\Http\Controllers\Controller;
|
||||
use App\Lib\Events\ClientMessage;
|
||||
use App\Maildispatcher\Actions\ResyncAction;
|
||||
use App\Member\Actions\NamiDeleteMemberAction;
|
||||
use App\Setting\GeneralSettings;
|
||||
use App\Setting\NamiSettings;
|
||||
use Illuminate\Http\RedirectResponse;
|
||||
|
@ -86,7 +87,7 @@ class MemberController extends Controller
|
|||
public function destroy(Member $member): RedirectResponse
|
||||
{
|
||||
if ($member->nami_id) {
|
||||
DeleteAction::dispatch($member->nami_id);
|
||||
NamiDeleteMemberAction::dispatch($member->nami_id);
|
||||
}
|
||||
|
||||
$member->delete();
|
||||
|
|
|
@ -6,6 +6,7 @@ use App\Activity;
|
|||
use App\Group;
|
||||
use App\Invoice\BillKind;
|
||||
use App\Maildispatcher\Actions\ResyncAction;
|
||||
use App\Member\Actions\NamiDeleteMemberAction;
|
||||
use App\Member\Actions\NamiPutMemberAction;
|
||||
use App\Setting\NamiSettings;
|
||||
use App\Subactivity;
|
||||
|
@ -113,7 +114,7 @@ class MemberRequest extends FormRequest
|
|||
NamiPutMemberAction::run($member->fresh(), null, null);
|
||||
}
|
||||
if (!$this->input('has_nami') && null !== $member->nami_id) {
|
||||
DeleteAction::dispatch($member->nami_id);
|
||||
NamiDeleteMemberAction::dispatch($member->nami_id);
|
||||
}
|
||||
ResyncAction::dispatch();
|
||||
}
|
||||
|
|
|
@ -4,7 +4,7 @@ namespace Tests\Feature\Member;
|
|||
|
||||
use App\Course\Models\Course;
|
||||
use App\Course\Models\CourseMember;
|
||||
use App\Member\DeleteAction;
|
||||
use App\Member\Actions\NamiDeleteMemberAction;
|
||||
use App\Member\Member;
|
||||
use Carbon\Carbon;
|
||||
use Illuminate\Foundation\Testing\DatabaseTransactions;
|
||||
|
@ -26,7 +26,7 @@ class DeleteTest extends TestCase
|
|||
|
||||
$response->assertRedirect('/member');
|
||||
|
||||
DeleteAction::assertPushed();
|
||||
NamiDeleteMemberAction::assertPushed();
|
||||
$this->assertDatabaseMissing('members', [
|
||||
'id' => $member->id,
|
||||
]);
|
||||
|
@ -42,7 +42,7 @@ class DeleteTest extends TestCase
|
|||
|
||||
$response->assertRedirect('/member');
|
||||
|
||||
Queue::assertNotPushed(DeleteAction::class);
|
||||
Queue::assertNotPushed(NamiDeleteMemberAction::class);
|
||||
$this->assertDatabaseMissing('members', [
|
||||
'id' => $member->id,
|
||||
]);
|
||||
|
@ -54,7 +54,7 @@ class DeleteTest extends TestCase
|
|||
$this->withoutExceptionHandling()->login()->loginNami();
|
||||
$member = Member::factory()->defaults()->inNami(123)->create();
|
||||
|
||||
DeleteAction::dispatch(123);
|
||||
NamiDeleteMemberAction::dispatch(123);
|
||||
|
||||
app(MemberFake::class)->assertDeleted(123, Carbon::parse('yesterday'));
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue