Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion app/Http/Controllers/Api/ActivityController.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
use App\Actions\CreateActivityAction;
use App\Http\Requests\CreateActivityRequest;
use App\Models\Project;
use Illuminate\Http\Request;
use Illuminate\Http\Response;

final readonly class ActivityController
Expand Down
4 changes: 3 additions & 1 deletion app/Http/Requests/CreateActivityRequest.php
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
<?php

declare(strict_types=1);

namespace App\Http\Requests;

use App\Enums\EventType;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Rule;

class CreateActivityRequest extends FormRequest
final class CreateActivityRequest extends FormRequest
{
/**
* Get the validation rules that apply to the request.
Expand Down
22 changes: 22 additions & 0 deletions app/Policies/ProjectPolicy.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?php

declare(strict_types=1);

namespace App\Policies;

use App\Models\Project;
use App\Models\User;
use Illuminate\Auth\Access\HandlesAuthorization;

final readonly class ProjectPolicy
{
use HandlesAuthorization;

/**
* Determine whether the user can view the project.
*/
public function view(User $authUser, Project $project): bool
{
return $authUser->id === $project->user_id;
}
}
12 changes: 12 additions & 0 deletions app/Providers/AppServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,13 @@

namespace App\Providers;

use App\Models\Project;
use App\Policies\ProjectPolicy;
use Carbon\CarbonImmutable;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Facades\Date;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Gate;
use Illuminate\Support\Facades\URL;
use Illuminate\Support\Facades\Vite;
use Illuminate\Support\ServiceProvider;
Expand All @@ -32,6 +35,7 @@ public function boot(): void
$this->configureDates();
$this->configureUrls();
$this->configureVite();
$this->configurePolicies();
}

/**
Expand Down Expand Up @@ -77,4 +81,12 @@ private function configureVite(): void
{
Vite::useAggressivePrefetching();
}

/**
* Configure the application's policies.
*/
private function configurePolicies(): void
{
Gate::policy(Project::class, ProjectPolicy::class);
}
}
7 changes: 6 additions & 1 deletion database/factories/UserFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,17 @@

namespace Database\Factories;

use App\Models\User;
use Illuminate\Database\Eloquent\Factories\Factory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Collection;
use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Str;

/**
* @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\User>
* @method Collection<User>|User create($attributes = [], ?Model $parent = null)
*
* @extends Factory<User>
*/
final class UserFactory extends Factory
{
Expand Down
2 changes: 1 addition & 1 deletion routes/web.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
});

Route::prefix('api')->group(function () {
Route::prefix('{project}')->group(function () {
Route::prefix('{project}')->middleware('can:view,project')->group(function () {
Route::post('activities', [ActivityController::class, 'store'])->name('api.activities.store');
});
});
74 changes: 49 additions & 25 deletions tests/Feature/Http/Api/ActivityControllerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,26 @@
use App\Enums\EventType;
use App\Jobs\IngestActivity;
use App\Models\Project;
use App\Models\User;
use Illuminate\Support\Facades\Queue;

beforeEach()->only();

it('can create an activity', function () {
// Arrange...
Queue::fake([IngestActivity::class]);
$project = Project::factory()->create()->fresh();
$authUser = User::factory()->create();
$project = Project::factory()->for($authUser)->create()->fresh();

$events = [
EventType::view('/about'),
];

// Act...
$response = $this->postJson(route('api.activities.store', $project), [
'events' => $events,
]);
$response = $this->actingAs($authUser)
->postJson(route('api.activities.store', $project), [
'events' => $events,
]);

// Assert...
$response->assertStatus(201);
Expand All @@ -32,15 +35,34 @@
Queue::assertPushed(IngestActivity::class, 1);
});

it('cannot create an activity for a project that does not belong to the user', function () {
Queue::fake([IngestActivity::class]);
$project = Project::factory()->create();

$this->actingAs(User::factory()->create())
->postJson(route('api.activities.store', $project), [
'events' => [
EventType::view('/about'),
],
])
->assertStatus(403);

$this->assertDatabaseCount('activities', 0);

Queue::assertNotPushed(IngestActivity::class);
});

it('does not handle empty events', function () {
// Arrange...
Queue::fake([IngestActivity::class]);
$project = Project::factory()->create()->fresh();
$authUser = User::factory()->create();
$project = Project::factory()->for($authUser)->create()->fresh();

// Act...
$response = $this->postJson(route('api.activities.store', $project), [
'events' => [],
]);
$response = $this->actingAs($authUser)
->postJson(route('api.activities.store', $project), [
'events' => [],
]);

// Assert...
$response->assertStatus(422)->assertJsonValidationErrors([
Expand All @@ -56,27 +78,29 @@
it('does not handle corrupted events', function () {
// Arrange...
Queue::fake([IngestActivity::class]);
$project = Project::factory()->create()->fresh();
$authUser = User::factory()->create();
$project = Project::factory()->for($authUser)->create()->fresh();

// Act...
$response = $this->postJson(route('api.activities.store', $project), [
'events' => [
1,
'string',
[
$response = $this->actingAs($authUser)
->postJson(route('api.activities.store', $project), [
'events' => [
1,
],
[
'type' => 'view',
],
[
'type' => 'view',
'payload' => [
//
'string',
[
1,
],
]
],
]);
[
'type' => 'view',
],
[
'type' => 'view',
'payload' => [
//
],
],
],
]);

// Assert...
$response->assertStatus(422)->assertJsonValidationErrors([
Expand Down
23 changes: 23 additions & 0 deletions tests/Unit/Policies/ProjectPolicyTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?php

declare(strict_types=1);

use App\Models\Project;
use App\Models\User;
use App\Policies\ProjectPolicy;

it('can view a project', function () {
$user = User::factory()->create();
$project = Project::factory()->for($user)->create();

expect((new ProjectPolicy())->view($user, $project))
->toBeTrue();
});

it('cannot view a project that does not belong to the user', function () {
$user = User::factory()->create();
$project = Project::factory()->create();

expect((new ProjectPolicy())->view($user, $project))
->toBeFalse();
});