From ec837fdb0a8a1ec347b7f70dbf345affd7a5df7f Mon Sep 17 00:00:00 2001 From: Romulus21 Date: Sun, 9 Aug 2020 20:45:41 +0200 Subject: [PATCH] start guest invitation on event --- app/Http/Controllers/EventController.php | 34 +++++++ app/Http/Resources/Event.php | 2 + app/Http/Resources/User.php | 3 + app/Models/Event.php | 9 ++ app/Models/User.php | 9 ++ ..._08_09_173607_create_event_guest_table.php | 43 +++++++++ routes/api.php | 4 + tests/Feature/EventsTest.php | 90 +++++++++++++++++++ 8 files changed, 194 insertions(+) create mode 100644 database/migrations/2020_08_09_173607_create_event_guest_table.php diff --git a/app/Http/Controllers/EventController.php b/app/Http/Controllers/EventController.php index 34acf4a..f8555e6 100644 --- a/app/Http/Controllers/EventController.php +++ b/app/Http/Controllers/EventController.php @@ -5,6 +5,7 @@ namespace App\Http\Controllers; use App\Http\Requests\EventRequest; use App\Models\Event; use App\Http\Resources\Event as EventResource; +use App\User; use Illuminate\Http\Request; class EventController extends Controller @@ -82,4 +83,37 @@ class EventController extends Controller return response([], 204); } + + public function inviteUser(Event $event, User $user) { + + $this->authorize('update', $event); + + $event->guests()->attach($user); + + return (new EventResource($event)) + ->response() + ->setStatusCode(200); + } + + public function removeInviteUser(Event $event, User $user) { + + $this->authorize('delete', $event); + + $event->guests()->detach($user); + + return (new EventResource($event)) + ->response() + ->setStatusCode(204); + } + + public function addGuestToStaffEvent(Event $event, User $user) { + + $this->authorize('delete', $event); + + $event->guests()->updateExistingPivot($user, array('is_staff' => 1), false); + + return (new EventResource($event)) + ->response() + ->setStatusCode(200); + } } diff --git a/app/Http/Resources/Event.php b/app/Http/Resources/Event.php index d1d33b3..0e20697 100644 --- a/app/Http/Resources/Event.php +++ b/app/Http/Resources/Event.php @@ -2,6 +2,7 @@ namespace App\Http\Resources; +use App\Http\Resources\User as UserResource; use Illuminate\Http\Resources\Json\JsonResource; class Event extends JsonResource @@ -30,6 +31,7 @@ class Event extends JsonResource 'category_id' => $this->category_id ], ], + 'invitations' => UserResource::collection($this->guests), ] ], ], diff --git a/app/Http/Resources/User.php b/app/Http/Resources/User.php index 08402fe..22b2880 100644 --- a/app/Http/Resources/User.php +++ b/app/Http/Resources/User.php @@ -27,6 +27,9 @@ class User extends JsonResource 'thumbnail_cover_image' => new ImageResource($this->thumbnailImage), 'last_login' => optional($this->login_at)->diffForHumans(), 'is_admin' => $this->isAdmin(), + 'is_staff' => $this->whenPivotLoaded('event_guest', function() { + return $this->pivot->is_staff; + }), ], ], 'links' => [ diff --git a/app/Models/Event.php b/app/Models/Event.php index bc96b28..338235f 100644 --- a/app/Models/Event.php +++ b/app/Models/Event.php @@ -2,9 +2,18 @@ namespace App\Models; +use App\User; use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\Relations\BelongsToMany; class Event extends Model { protected $guarded = []; + + public function guests() :BelongsToMany + { + return $this->belongsToMany(User::class, 'event_guest') + ->withPivot('is_staff', 'validated_at') + ->withTimestamps(); + } } diff --git a/app/Models/User.php b/app/Models/User.php index 9b49667..7ca4f09 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -8,12 +8,14 @@ use App\Models\Image; use App\Models\Memo; use App\Models\ToDoList; use Illuminate\Contracts\Auth\MustVerifyEmail; +use Illuminate\Database\Eloquent\Relations\BelongsToMany; use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\Relations\MorphMany; use Illuminate\Database\Eloquent\Relations\MorphOne; use Illuminate\Foundation\Auth\User as Authenticatable; use Illuminate\Notifications\Notifiable; use Laravel\Passport\HasApiTokens; +use phpDocumentor\Reflection\Types\Boolean; class User extends Authenticatable { @@ -110,4 +112,11 @@ class User extends Authenticatable { return $this->hasMany(Event::class); } + + public function invitedEvent(): BelongsToMany + { + return $this->belongsToMany(Event::class, 'event_guest') + ->withPivot('is_staff', 'validated_at') + ->withTimestamps(); + } } diff --git a/database/migrations/2020_08_09_173607_create_event_guest_table.php b/database/migrations/2020_08_09_173607_create_event_guest_table.php new file mode 100644 index 0000000..4c9f852 --- /dev/null +++ b/database/migrations/2020_08_09_173607_create_event_guest_table.php @@ -0,0 +1,43 @@ +id(); + $table->foreignId('event_id'); + $table->foreignId('user_id'); + $table->boolean('is_staff')->default(false); + $table->timestamp('validated_at')->nullable(); + $table->timestamps(); + + $table->foreign('event_id')->references('id')->on('events'); + $table->foreign('user_id')->references('id')->on('users'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('event_guest', function (Blueprint $table) { + $table->dropForeign(['event_id']); + $table->dropForeign(['user_id']); + }); + + Schema::dropIfExists('event_guest'); + } +} diff --git a/routes/api.php b/routes/api.php index be41cd2..e607aa2 100644 --- a/routes/api.php +++ b/routes/api.php @@ -20,6 +20,10 @@ Route::middleware('auth:api')->group(function () { Route::get('/memos/home', 'MemosController@home'); + Route::get('/events/{event}/invite/{user}', 'EventController@inviteUser'); + Route::delete('/events/{event}/invite/{user}', 'EventController@removeInviteUser'); + Route::get('/events/{event}/staff/{user}', 'EventController@addGuestToStaffEvent'); + Route::apiResources([ '/users' => 'UserController', '/memos' => 'MemosController', diff --git a/tests/Feature/EventsTest.php b/tests/Feature/EventsTest.php index 86fbdb7..634e5b9 100644 --- a/tests/Feature/EventsTest.php +++ b/tests/Feature/EventsTest.php @@ -386,6 +386,96 @@ class EventsTest extends TestCase $response->assertStatus(403); } + /** @test */ + public function owner_can_invite_user_to_an_event() + { + $this->withoutExceptionHandling(); + $this->actingAs($user = factory(User::class)->create(), 'api'); + $event = factory(Event::class)->create(['user_id' => $user->id]); + $userTwo = factory(User::class)->create(); + + $response = $this->get('api/events/'.$event->id.'/invite/'.$userTwo->id); + $response->assertStatus(200); + $response->assertJson([ + 'data' => [ + 'event_id' => $event->id, + 'attributes' => [ + 'data' => [ + 'invitations' => [ + [ + 'data' => [ + 'user_id' => $userTwo->id, + ] + ] + ], + ] + ] + ] + ]); + } + + /** @test */ + public function owner_can_remove_invitation() + { + $this->withoutExceptionHandling(); + $this->actingAs($user = factory(User::class)->create(), 'api'); + $event = factory(Event::class)->create(['user_id' => $user->id]); + $userTwo = factory(User::class)->create(); + $event->guests()->attach($userTwo); + + $response = $this->delete('api/events/'.$event->id.'/invite/'.$userTwo->id); + + $event = $event->fresh(); + + $this->assertCount(0, $event->guests); + + $response->assertStatus(204); + } + + /** @test */ + public function owner_can_add_guest_to_staff_event() + { + $this->withoutExceptionHandling(); + $this->actingAs($user = factory(User::class)->create(), 'api'); + $event = factory(Event::class)->create(['user_id' => $user->id]); + $userTwo = factory(User::class)->create(); + $event->guests()->attach($userTwo); + + $response = $this->get('api/events/'.$event->id.'/staff/'.$userTwo->id); + $response->assertStatus(200); + $response->assertJson([ + 'data' => [ + 'event_id' => $event->id, + 'attributes' => [ + 'data' => [ + 'invitations' => [ + [ + 'data' => [ + 'user_id' => $userTwo->id, + 'attributes' => [ + 'is_staff' => true, + ] + + ], + 'links' => [ + 'self' => url('/users/'.$userTwo->id), + ], + ] + ], + ] + ] + ] + ]); + } + + // owner_can_remove_guest_to_staff_event + + // staff_can_add_guest + + // guest_can_validate_event_participation + + // guest_can_delete_invitation + private function data() { return [