Add leader-based permissions to Meetup event tests and editable scope

- 🔒 Ensure leader users are required for Meetup event tests to simulate accurate permissions.
-  Add `editableBy` scope to `MeetupEvent` model for consistent editable event handling.
- 🛠️ Refactor `mine` API endpoint and MCP tool to leverage `editableBy` scope.
- 🧪 Update tests to verify leader-based accessibility for Meetup events.
This commit is contained in:
HolgerHatGarKeineNode
2026-06-17 20:05:39 +02:00
parent 7c142fb37a
commit dc1d679e4b
8 changed files with 61 additions and 15 deletions
@@ -136,16 +136,17 @@ class MeetupEventController extends Controller
}
/**
* Eigene Meetup-Events auflisten
* Bearbeitbare Meetup-Events auflisten
*
* Liefert alle vom authentifizierten Nutzer erstellten Meetup-Events, nach Startzeit absteigend sortiert.
* Liefert alle Meetup-Events, die der authentifizierte Nutzer bearbeiten darf
* (selbst angelegt ODER Leader des zugehörigen Meetups), nach Startzeit absteigend sortiert.
*/
public function mine(Request $request): AnonymousResourceCollection
{
Gate::authorize('viewAny', MeetupEvent::class);
$meetupEvents = MeetupEvent::query()
->where('created_by', $request->user()->id)
->editableBy($request->user()->id)
->orderByDesc('start')
->get();
@@ -12,7 +12,7 @@ use Laravel\Mcp\Server\Tool;
use Laravel\Mcp\Server\Tools\Annotations\IsReadOnly;
#[IsReadOnly]
#[Description('Listet alle vom authentifizierten Nutzer erstellten Meetup-Termine, nach Startzeitpunkt absteigend sortiert.')]
#[Description('Listet alle Meetup-Termine, die der authentifizierte Nutzer bearbeiten darf (selbst angelegt oder Leader des Meetups), nach Startzeitpunkt absteigend sortiert.')]
class ListMyMeetupEventsTool extends Tool
{
public function handle(Request $request): Response
@@ -24,7 +24,7 @@ class ListMyMeetupEventsTool extends Tool
}
$meetupEvents = MeetupEvent::query()
->where('created_by', $user->getAuthIdentifier())
->editableBy((int) $user->getAuthIdentifier())
->orderByDesc('start')
->get();
+1 -1
View File
@@ -292,7 +292,7 @@ class Meetup extends Model implements HasMedia
*/
public function scopeLedBy(Builder $query, int $userId): void
{
$query->whereHas('users', fn (Builder $user) => $user->whereKey($userId)->wherePivot('is_leader', true));
$query->whereHas('users', fn (Builder $user) => $user->whereKey($userId)->where('meetup_user.is_leader', true));
}
/**
+13
View File
@@ -6,6 +6,7 @@ use App\Enums\RecurrenceType;
use App\Enums\RsvpStatus;
use App\Observers\MeetupEventObserver;
use Illuminate\Database\Eloquent\Attributes\ObservedBy;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -55,6 +56,18 @@ class MeetupEvent extends Model
});
}
/**
* Termine, die der Nutzer bearbeiten darf: selbst angelegt ODER Leader des
* zugehörigen Meetups (deckungsgleich mit MeetupEventPolicy::update).
*/
public function scopeEditableBy(Builder $query, int $userId): void
{
$query->where(function (Builder $query) use ($userId) {
$query->where('created_by', $userId)
->orWhereHas('meetup', fn (Builder $meetup) => $meetup->ledBy($userId));
});
}
public function createdBy(): BelongsTo
{
return $this->belongsTo(User::class, 'created_by');