Add index for activity
continuous-integration/drone/push Build is failing
Details
continuous-integration/drone/push Build is failing
Details
This commit is contained in:
parent
45f26ee8f8
commit
9b0a052cbe
|
@ -0,0 +1,28 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Activity\Actions;
|
||||||
|
|
||||||
|
use App\Activity;
|
||||||
|
use App\Activity\Resources\ActivityResource;
|
||||||
|
use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
|
||||||
|
use Inertia\Inertia;
|
||||||
|
use Inertia\Response;
|
||||||
|
use Lorisleiva\Actions\ActionRequest;
|
||||||
|
use Lorisleiva\Actions\Concerns\AsAction;
|
||||||
|
|
||||||
|
class IndexAction
|
||||||
|
{
|
||||||
|
use AsAction;
|
||||||
|
|
||||||
|
public function handle(): AnonymousResourceCollection
|
||||||
|
{
|
||||||
|
return ActivityResource::collection(Activity::local()->paginate(20));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function asController(ActionRequest $request): Response
|
||||||
|
{
|
||||||
|
return Inertia::render('activity/Index', [
|
||||||
|
'data' => $this->handle(),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,27 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Activity\Resources;
|
||||||
|
|
||||||
|
use App\Activity;
|
||||||
|
use Illuminate\Http\Resources\Json\JsonResource;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @mixin Activity
|
||||||
|
*/
|
||||||
|
class ActivityResource extends JsonResource
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Transform the resource into an array.
|
||||||
|
*
|
||||||
|
* @param \Illuminate\Http\Request $request
|
||||||
|
*
|
||||||
|
* @return array{id: int, name: string}
|
||||||
|
*/
|
||||||
|
public function toArray($request)
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'name' => $this->name,
|
||||||
|
'id' => $this->id,
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
|
@ -2,6 +2,8 @@
|
||||||
|
|
||||||
namespace App\Nami;
|
namespace App\Nami;
|
||||||
|
|
||||||
|
use Illuminate\Database\Eloquent\Builder;
|
||||||
|
|
||||||
trait HasNamiField
|
trait HasNamiField
|
||||||
{
|
{
|
||||||
public static function nami(int $id): ?self
|
public static function nami(int $id): ?self
|
||||||
|
@ -13,4 +15,14 @@ trait HasNamiField
|
||||||
{
|
{
|
||||||
return null !== $this->nami_id;
|
return null !== $this->nami_id;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param Builder<self> $query
|
||||||
|
*
|
||||||
|
* @return Builder<self>
|
||||||
|
*/
|
||||||
|
public static function scopeLocal(Builder $query): Builder
|
||||||
|
{
|
||||||
|
return $query->whereNull('nami_id');
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
use App\Activity\Actions\IndexAction as ActivityIndexAction;
|
||||||
use App\Contribution\Actions\FormAction as ContributionFormAction;
|
use App\Contribution\Actions\FormAction as ContributionFormAction;
|
||||||
use App\Contribution\ContributionController;
|
use App\Contribution\ContributionController;
|
||||||
use App\Course\Controllers\CourseController;
|
use App\Course\Controllers\CourseController;
|
||||||
|
@ -46,4 +47,5 @@ Route::group(['middleware' => 'auth:web'], function (): void {
|
||||||
Route::get('/member/{member}/resync', MemberResyncAction::class)->name('member.resync');
|
Route::get('/member/{member}/resync', MemberResyncAction::class)->name('member.resync');
|
||||||
Route::get('/contribution', ContributionFormAction::class)->name('contribution.form');
|
Route::get('/contribution', ContributionFormAction::class)->name('contribution.form');
|
||||||
Route::get('/contribution/generate', [ContributionController::class, 'generate'])->name('contribution.generate');
|
Route::get('/contribution/generate', [ContributionController::class, 'generate'])->name('contribution.generate');
|
||||||
|
Route::get('/activity', ActivityIndexAction::class)->name('activity.index');
|
||||||
});
|
});
|
||||||
|
|
|
@ -0,0 +1,24 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Tests\Feature\Activity;
|
||||||
|
|
||||||
|
use App\Activity;
|
||||||
|
use Illuminate\Foundation\Testing\DatabaseTransactions;
|
||||||
|
use Tests\TestCase;
|
||||||
|
|
||||||
|
class IndexTest extends TestCase
|
||||||
|
{
|
||||||
|
use DatabaseTransactions;
|
||||||
|
|
||||||
|
public function testItDisplaysLocalActivities(): void
|
||||||
|
{
|
||||||
|
$this->login()->withoutExceptionHandling();
|
||||||
|
$local = Activity::factory()->name('Local')->create();
|
||||||
|
$remote = Activity::factory()->name('Remote')->inNami(123)->create();
|
||||||
|
|
||||||
|
$response = $this->get('/activity');
|
||||||
|
|
||||||
|
$this->assertInertiaHas('Local', $response, 'data.data.0.name');
|
||||||
|
$this->assertCount(1, $this->inertia($response, 'data.data'));
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue