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

Add Activity Store And Update

This commit is contained in:
philipp lang 2023-02-17 01:50:44 +01:00
parent 8462a572ac
commit f106f2455a
3 changed files with 163 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
app/Activity/Actions/ActivityUpdateAction.php Normal file
View File

@ -0,0 +1,65 @@
<?php
namespace App\Activity\Actions;
use App\Activity;
use App\Subactivity;
use Illuminate\Http\RedirectResponse;
use Illuminate\Support\Facades\DB;
use Illuminate\Validation\ValidationException;
use Lorisleiva\Actions\ActionRequest;
use Lorisleiva\Actions\Concerns\AsAction;
class ActivityUpdateAction
{
use AsAction;
public function handle(Activity $activity, array $payload): void
{
DB::transaction(function() use ($activity, $payload) {
$activity->update($payload);
$activity->subactivities()->sync($payload['subactivities']);
});
}
public function rules(): array
{
return [
'name' => 'required|max:255',
'subactivities' => 'present|array'
];
}
public function asController(ActionRequest $request, Activity $activity): RedirectResponse
{
if ($activity->hasNami) {
$this->validateNami($activity, $request->validated());
}
$this->handle($activity, $request->validated());
return redirect()->route('activity.index');
}
/**
* @todo handle this with a model event on the pivot model
*/
private function validateNami(Activity $activity, array $payload): void
{
if ($activity->name !== data_get($payload, 'name', '')) {
throw ValidationException::withMessages(['nami_id' => 'Aktivität ist in NaMi. Update des Namens nicht möglich.']);
}
$removingSubactivities = $activity->subactivities()->whereNotIn('id', data_get($payload, 'subactivities'))->pluck('id');
if ($removingSubactivities->first(fn ($subactivity) => Subactivity::find($subactivity)->hasNami)) {
throw ValidationException::withMessages(['nami_id' => 'Untertätigkeit kann nicht entfernt werden.']);
}
$addingSubactivities = collect(data_get($payload, 'subactivities'))->filter(fn ($subactivityId) => $activity->subactivities->doesntContain($subactivityId));
if ($addingSubactivities->first(fn ($subactivity) => Subactivity::find($subactivity)->hasNami)) {
throw ValidationException::withMessages(['nami_id' => 'Untertätigkeit kann nicht hinzugefügt werden.']);
}
}
}

2
routes/web.php
View File

@ -1,6 +1,7 @@
<?php
use App\Activity\Actions\ActivityStoreAction;
use App\Activity\Actions\ActivityUpdateAction;
use App\Activity\Actions\IndexAction as ActivityIndexAction;
use App\Contribution\Actions\FormAction as ContributionFormAction;
use App\Contribution\ContributionController;
@ -50,4 +51,5 @@ Route::group(['middleware' => 'auth:web'], function (): void {
Route::get('/contribution/generate', [ContributionController::class, 'generate'])->name('contribution.generate');
Route::get('/activity', ActivityIndexAction::class)->name('activity.index');
Route::post('/activity', ActivityStoreAction::class)->name('activity.store');
Route::patch('/activity/{activity}', ActivityUpdateAction::class)->name('activity.update');
});

129
tests/Feature/Activity/UpdateTest.php
View File

@ -14,76 +14,139 @@ class UpdateTest extends TestCase
public function testItCannotUpdateAnActivityFromNami(): void
{
$this->login()->loginNami();
$activity = Activity::factory()->inNami(67)->create();
$activity = Activity::factory()->inNami(67)->name('abc')->create();
$response = $this->patch(route('activity.update', ['activity' => $activity]), [
'name' => 'Lorem',
'subactivities' => [],
]);
$response->assertStatus(403);
$response->assertSessionHasErrors(['nami_id' => 'Aktivität ist in NaMi. Update des Namens nicht möglich.']);
}
public function testItUpdatesName(): void
public function testItCanUpdateSubactivitiesOfNamiActivity(): void
{
$this->login()->loginNami()->withoutExceptionHandling();
$activity = Activity::factory()->name('before')->create();
$this->login()->loginNami();
$activity = Activity::factory()->inNami(67)->name('abc')->create();
$subactivity = Subactivity::factory()->create();
$response = $this->from("/activity/{$activity->id}")->patch(route('activity.update', ['activity' => $activity]), [
'name' => 'after',
$this->patch(route('activity.update', ['activity' => $activity]), [
'name' => 'abc',
'subactivities' => [$subactivity->id],
]);
$this->assertDatabaseHas('activity_subactivity', ['activity_id' => $activity->id, 'subactivity_id' => $subactivity->id]);
}
public function testItCannotRemoveANamiSubactivityFromANamiActivity(): void
{
$this->login()->loginNami();
$activity = Activity::factory()->inNami(67)->name('abc')->has(Subactivity::factory()->inNami(69))->create();
$response = $this->patch(route('activity.update', ['activity' => $activity]), [
'name' => 'abc',
'subactivities' => [],
]);
$response->assertRedirect('/activity');
$this->assertDatabaseHas('activities', [
'name' => 'Lorem',
'nami_id' => null,
$response->assertSessionHasErrors(['nami_id' => 'Untertätigkeit kann nicht entfernt werden.']);
}
public function testItCannotAddANamiSubactivityToANamiActivity(): void
{
$this->login()->loginNami();
$activity = Activity::factory()->inNami(67)->name('abc')->create();
$subactivity = Subactivity::factory()->inNami(60)->create();
$response = $this->patch(route('activity.update', ['activity' => $activity]), [
'name' => 'abc',
'subactivities' => [$subactivity->id],
]);
$this->assertDatabaseCount('activity_subactivity', 0);
$response->assertSessionHasErrors(['nami_id' => 'Untertätigkeit kann nicht hinzugefügt werden.']);
}
public function testItCannotRemoveANamiSubactivityFromANamiActivityAndSetAnother(): void
{
$this->login()->loginNami();
$activity = Activity::factory()->inNami(67)->name('abc')->has(Subactivity::factory()->inNami(69))->create();
$otherSubactivity = Subactivity::factory()->create();
$response = $this->patch(route('activity.update', ['activity' => $activity]), [
'name' => 'abc',
'subactivities' => [$otherSubactivity->id],
]);
$response->assertSessionHasErrors(['nami_id' => 'Untertätigkeit kann nicht entfernt werden.']);
}
public function testNameIsRequired(): void
{
$this->login()->loginNami();
$activity = Activity::factory()->name('before')->create();
$response = $this->post(route('activity.store'), []);
$activity = Activity::factory()->create();
$response->assertSessionHasErrors([
'name' => 'Name ist erforderlich.',
'subactivities' => 'Untergliederungen muss vorhanden sein.',
$response = $this->patch(route('activity.update', ['activity' => $activity]), [
'name' => '',
]);
$response->assertSessionHasErrors(['name' => 'Name ist erforderlich.']);
$response->assertSessionHasErrors(['subactivities' => 'Untergliederungen muss vorhanden sein.']);
}
public function testNamiIdIsNotSet(): void
public function testItUpdatesName(): void
{
$this->login()->loginNami()->withoutExceptionHandling();
$this->login()->loginNami();
$activity = Activity::factory()->name('UUU')->create();
$response = $this->post(route('activity.store'), [
$response = $this->patch(route('activity.update', ['activity' => $activity]), [
'name' => 'Lorem',
'nami_id' => 556,
'subactivities' => [],
]);
$this->assertDatabaseHas('activities', [
'nami_id' => null,
]);
$response->assertRedirect('/activity');
$this->assertDatabaseHas('activities', ['name' => 'Lorem']);
}
public function testItCanStoreASubactivityWithTheActivity(): void
public function testItSetsSubactivities(): void
{
$this->login()->loginNami()->withoutExceptionHandling();
$this->login()->loginNami();
$activity = Activity::factory()->create();
$subactivity = Subactivity::factory()->create();
$response = $this->from('/activity')->post(route('activity.store'), [
$this->patch(route('activity.update', ['activity' => $activity]), [
'name' => 'Lorem',
'subactivities' => [$subactivity->id],
]);
$this->assertDatabaseCount('activity_subactivity', 1);
$this->assertDatabaseHas('activity_subactivity', [
'activity_id' => Activity::firstWhere('name', 'Lorem')->id,
'subactivity_id' => $subactivity->id,
]);
$this->assertDatabaseHas('activity_subactivity', ['activity_id' => $activity->id, 'subactivity_id' => $subactivity->id]);
}
public function testItCannotSetNamiId(): void
{
$this->login()->loginNami();
$activity = Activity::factory()->create();
$this->patch(route('activity.update', ['activity' => $activity]), [
'name' => 'Lorem',
'nami_id' => 66,
'subactivities' => [],
]);
$this->assertDatabaseHas('activities', ['nami_id' => null]);
}
public function testItUnsetsSubactivities(): void
{
$this->login()->loginNami();
$activity = Activity::factory()
->hasAttached(Subactivity::factory())
->create();
$this->patch(route('activity.update', ['activity' => $activity]), [
'name' => 'Lorem',
'subactivities' => [],
]);
$this->assertDatabaseEmpty('activity_subactivity');
}
}