Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: recurring incomes and expenses acl between panels #32

Merged
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
use Filament\Forms\Form;
use Filament\Tables\Actions\BulkActionGroup;
use Filament\Tables\Actions\DeleteAction;
use Filament\Tables\Actions\DeleteBulkAction;
use Filament\Tables\Actions\EditAction;
use Filament\Tables\Columns\TextColumn;
use Filament\Tables\Filters\SelectFilter;
Expand All @@ -25,6 +24,8 @@
*/
trait RecurringIncomeRecurringExpenseTrait
{
use BulkDeleter, UserFilterable;

public static function form(Form $form): Form
{
return $form
Expand Down Expand Up @@ -82,6 +83,8 @@ public static function table(Table $table): Table
{
return $table
->columns([
self::getUserColumn(),

TextColumn::make('person.name')
->searchable()
->sortable(),
Expand All @@ -105,6 +108,8 @@ public static function table(Table $table): Table
TextColumn::make('remaining_recurrences'),
])
->filters([
self::getUserFilter(),

SelectFilter::make('frequency')
->options(Frequency::class),
])
Expand All @@ -115,7 +120,7 @@ public static function table(Table $table): Table
])
->bulkActions([
BulkActionGroup::make([
DeleteBulkAction::make(),
self::deleteBulkAction(),
]),
]);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,15 @@

namespace App\Filament\Resources\RecurringExpenseResource\Pages;

use App\Filament\Concerns\UserFilterable;
use App\Filament\Resources\RecurringExpenseResource;
use Filament\Actions\CreateAction;
use Filament\Resources\Pages\ListRecords;
use Illuminate\Database\Eloquent\Builder;

class ListRecurringExpenses extends ListRecords
{
use UserFilterable;

protected static string $resource = RecurringExpenseResource::class;

protected function getHeaderActions(): array
Expand All @@ -17,10 +19,4 @@ protected function getHeaderActions(): array
CreateAction::make(),
];
}

public function filterTableQuery(Builder $query): Builder
{
return parent::filterTableQuery($query)
->where('user_id', auth()->id());
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,15 @@

namespace App\Filament\Resources\RecurringIncomeResource\Pages;

use App\Filament\Concerns\UserFilterable;
use App\Filament\Resources\RecurringIncomeResource;
use Filament\Actions\CreateAction;
use Filament\Resources\Pages\ListRecords;
use Illuminate\Database\Eloquent\Builder;

class ListRecurringIncomes extends ListRecords
{
use UserFilterable;

protected static string $resource = RecurringIncomeResource::class;

protected function getHeaderActions(): array
Expand All @@ -17,10 +19,4 @@ protected function getHeaderActions(): array
CreateAction::make(),
];
}

public function filterTableQuery(Builder $query): Builder
{
return parent::filterTableQuery($query)
->where('user_id', auth()->id());
}
}
11 changes: 10 additions & 1 deletion app/Policies/RecurringExpensePolicy.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

namespace App\Policies;

use App\Enums\PanelId;
use App\Models\RecurringExpense;
use App\Models\User;
use Illuminate\Auth\Access\HandlesAuthorization;
Expand All @@ -22,16 +23,24 @@ public function view(User $user, RecurringExpense $recurringExpense): bool

public function create(User $user): bool
{
return true;
return PanelId::APP->isCurrentPanel();
}

public function update(User $user, RecurringExpense $recurringExpense): bool
{
if (PanelId::FAMILY->isCurrentPanel()) {
return false;
}

return $recurringExpense->user_id === $user->id;
}

public function delete(User $user, RecurringExpense $recurringExpense): bool
{
if (PanelId::FAMILY->isCurrentPanel()) {
return false;
}

return $recurringExpense->user_id === $user->id;
}
}
11 changes: 10 additions & 1 deletion app/Policies/RecurringIncomePolicy.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

namespace App\Policies;

use App\Enums\PanelId;
use App\Models\RecurringIncome;
use App\Models\User;
use Illuminate\Auth\Access\HandlesAuthorization;
Expand All @@ -22,16 +23,24 @@ public function view(User $user, RecurringIncome $recurringIncome): bool

public function create(User $user): bool
{
return true;
return PanelId::APP->isCurrentPanel();
}

public function update(User $user, RecurringIncome $recurringIncome): bool
{
if (PanelId::FAMILY->isCurrentPanel()) {
return false;
}

return $recurringIncome->user_id === $user->id;
}

public function delete(User $user, RecurringIncome $recurringIncome): bool
{
if (PanelId::FAMILY->isCurrentPanel()) {
return false;
}

return $recurringIncome->user_id === $user->id;
}
}
68 changes: 68 additions & 0 deletions tests/Feature/RecurringExpense/RecurringExpenseFamilyViewTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
<?php

use App\Enums\PanelId;
use App\Filament\Resources\RecurringExpenseResource;
use App\Filament\Resources\RecurringExpenseResource\Pages\ListRecurringExpenses;
use App\Models\RecurringExpense;
use App\Models\User;
use Illuminate\Foundation\Testing\RefreshDatabase;

use function Pest\Livewire\livewire;

uses(RefreshDatabase::class);

beforeEach(function () {
$this->user = User::factory()->create();
$this->actingAs($this->user);

$this->recurringExpense = RecurringExpense::factory()->for($this->user)->create([
'description' => 'User 1 RecurringExpense',
]);

PanelId::FAMILY->setCurrentPanel();
});

it('cannot display create action', function () {
livewire(ListRecurringExpenses::class)
->assertActionHidden('create');
});

it('cannot display edit action', function () {
livewire(ListRecurringExpenses::class)
->assertTableActionHidden('edit', $this->recurringExpense->id);
});

it('cannot display delete action', function () {
livewire(ListRecurringExpenses::class)
->assertTableActionHidden('delete', $this->recurringExpense->id);
});

it('cannot display import action', function () {
livewire(ListRecurringExpenses::class)
->assertTableActionHidden('delete', $this->recurringExpense->id);
});

it('cannot display bulk delete action', function () {
livewire(ListRecurringExpenses::class)
->set('selectedTableRecords', [$this->recurringExpense])
->assertTableBulkActionHidden('delete');
});

it('cannot render create recurringExpense page', function () {
$this->get(RecurringExpenseResource::getUrl('create'))
->assertForbidden();
});

it('cannot perform recurringExpense update action', function () {
livewire(RecurringExpenseResource\Pages\EditRecurringExpense::class, [
'record' => $this->recurringExpense->getRouteKey(),
])
->assertForbidden();
});

it('cannot perform delete recurringExpense action', function () {
livewire(RecurringExpenseResource\Pages\EditRecurringExpense::class, [
'record' => $this->recurringExpense->getRouteKey(),
])
->assertForbidden();
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<?php

use App\Enums\PanelId;
use App\Filament\Resources\RecurringExpenseResource\Pages\ListRecurringExpenses;
use App\Models\RecurringExpense;
use App\Models\User;
use Illuminate\Foundation\Testing\RefreshDatabase;

use function Pest\Livewire\livewire;

uses(RefreshDatabase::class);

beforeEach(function () {
$this->user = User::factory()->create();
$this->actingAs($this->user);

$this->recurringExpense1 = RecurringExpense::factory()->for($this->user)->create([
'description' => 'User 1 RecurringExpense',
]);

$this->recurringExpense2 = RecurringExpense::factory()->for(User::factory())->create([
'description' => 'User 2 RecurringExpense',
]);

PanelId::FAMILY->setCurrentPanel();
});

it('can display user filter', function () {
livewire(ListRecurringExpenses::class)
->assertTableFilterVisible('user');
});

it('can display user columns', function () {
livewire(ListRecurringExpenses::class)
->assertTableColumnVisible('user.name');
});

it('display user columns', function () {
livewire(ListRecurringExpenses::class)
->assertSee([$this->recurringExpense1->description])
->assertSee([$this->recurringExpense2->description]);
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<?php

use App\Enums\PanelId;
use App\Filament\Resources\RecurringExpenseResource\Pages\ListRecurringExpenses;
use App\Models\RecurringExpense;
use App\Models\User;
use Illuminate\Foundation\Testing\RefreshDatabase;

use function Pest\Livewire\livewire;

uses(RefreshDatabase::class);

beforeEach(function () {
$this->user = User::factory()->create();
$this->actingAs($this->user);

$this->recurringExpense = RecurringExpense::factory()->for($this->user)->create([
'description' => 'User 1 RecurringExpense',
]);

PanelId::APP->setCurrentPanel();
});

it('can display create action', function () {
livewire(ListRecurringExpenses::class)
->assertActionVisible('create');
});

it('can display edit action', function () {
livewire(ListRecurringExpenses::class)
->assertTableActionVisible('edit', $this->recurringExpense->id);
});

it('can display delete action', function () {
livewire(ListRecurringExpenses::class)
->assertTableActionVisible('delete', $this->recurringExpense->id);
});

it('can display bulk delete action', function () {
livewire(ListRecurringExpenses::class)
->set('selectedTableRecords', [$this->recurringExpense])
->assertTableBulkActionVisible('delete');
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<?php

use App\Enums\PanelId;
use App\Filament\Resources\RecurringExpenseResource\Pages\ListRecurringExpenses;
use App\Models\RecurringExpense;
use App\Models\User;
use Illuminate\Foundation\Testing\RefreshDatabase;

use function Pest\Livewire\livewire;

uses(RefreshDatabase::class);

beforeEach(function () {
$this->user = User::factory()->create();
$this->actingAs($this->user);

$this->recurringExpense1 = RecurringExpense::factory()->for($this->user)->create([
'description' => 'User 1 RecurringExpense',
]);

$this->recurringExpense2 = RecurringExpense::factory(User::factory())->create([
'description' => 'User 2 RecurringExpense',
]);

PanelId::APP->setCurrentPanel();
});

it('cannot display user filter', function () {
livewire(ListRecurringExpenses::class)
->assertTableFilterHidden('user');
});

it('cannot display user columns', function () {
livewire(ListRecurringExpenses::class)
->assertTableColumnHidden('user.name');
});

it('can only list auth user recurringExpenses', function () {
livewire(ListRecurringExpenses::class)
->assertSee([$this->recurringExpense1->description])
->assertDontSee([$this->recurringExpense2->description]);
});
Loading