Romain/portal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add guest invitation read & valide with route

Browse Source
This commit is contained in:
Romulus21
2020-08-21 11:37:52 +02:00
parent 0a819fbadf
commit bddf4e5c09
12 changed files with 271 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
app/Http/Controllers/EventController.php
View File

@@ -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\Models\EventGuestsNonUsers;
use App\User;
use Illuminate\Http\Request;
@@ -150,4 +151,39 @@ class EventController extends Controller
return response([], 204);
}
public function addGuestWithEmail(Event $event)
{
$data = request()->validate([
'email' => 'required|email',
]);
$event->emailedGuests()->save(new EventGuestsNonUsers(['email' => $data['email']]));
return (new EventResource($event))
->response()
->setStatusCode(201);
}
public function guestCanReadEvent(Event $event)
{
$guest = request()->guest;
if (!$guest->read_at) {
$guest->update(['read_at' => now()->toDateTimeString()]);
}
return (new EventResource($event))
->response()
->setStatusCode(200);
}
public function guestCanConfirmEvent(Event $event)
{
$guest = request()->guest;
$guest->update(['validated_at' => now()->toDateTimeString()]);
return (new EventResource($event))
->response()
->setStatusCode(200);
}
}

1
app/Http/Kernel.php
View File

@@ -63,5 +63,6 @@ class Kernel extends HttpKernel
'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class,
'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
'guest-mail' => \App\Http\Middleware\EventGuestWithEmail::class,
];
}

32
app/Http/Middleware/EventGuestWithEmail.php Normal file
View File

@@ -0,0 +1,32 @@
<?php
namespace App\Http\Middleware;
use App\Models\EventGuestsNonUsers;
use Closure;
class EventGuestWithEmail
{
/**
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @return mixed
*/
public function handle($request, Closure $next)
{
$data = request()->validate([
'email' => 'required|email',
'token' => 'required|uuid',
]);
$guest = EventGuestsNonUsers::where('email', $data['email'])->where('token', $data['token'])->first();
if ($guest) {
$request->guest = $guest;
return $next($request);
}
return response([], 403);
}
}

4
app/Http/Resources/Event.php
View File

@@ -3,6 +3,7 @@
namespace App\Http\Resources;
use App\Http\Resources\User as UserResource;
use App\Http\Resources\EventGuestWithoutEmail as GuestsWithoutEmailResource;
use Illuminate\Http\Resources\Json\JsonResource;
class Event extends JsonResource
@@ -32,6 +33,9 @@ class Event extends JsonResource
],
],
'invitations' => UserResource::collection($this->guests),
'invitations-with-email' => [
'data' => GuestsWithoutEmailResource::collection($this->emailedGuests)
],
]
],
],

23
app/Http/Resources/EventGuestWithoutEmail.php Normal file
View File

@@ -0,0 +1,23 @@
<?php
namespace App\Http\Resources;
use Illuminate\Http\Resources\Json\JsonResource;
class EventGuestWithoutEmail extends JsonResource
{
/**
* Transform the resource into an array.
*
* @param \Illuminate\Http\Request $request
* @return array
*/
public function toArray($request)
{
return [
'email' => $this->email,
'read_at' => $this->read_at,
'validated_at' => $this->validated_at,
];
}
}

6
app/Models/Event.php
View File

@@ -5,6 +5,7 @@ namespace App\Models;
use App\User;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
use Illuminate\Database\Eloquent\Relations\HasMany;
class Event extends Model
{
@@ -16,4 +17,9 @@ class Event extends Model
->withPivot('is_staff', 'validated_at')
->withTimestamps();
}
public function emailedGuests() :HasMany
{
return $this->hasMany(EventGuestsNonUsers::class, 'event_id');
}
}

12
app/Models/EventGuestsNonUsers.php Normal file
View File

@@ -0,0 +1,12 @@
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Model;
class EventGuestsNonUsers extends Model
{
protected $table = 'event_non_user_guests';
protected $guarded = [];
}

2
database/factories/EventFactory.php
View File

@@ -15,7 +15,7 @@ $factory->define(Event::class, function (Faker $faker) {
'category_id' => factory(EventCategory::class),
'name' => $faker->words(3, [false]),
'description' => $faker->words(rand(10, 300), [false]),
'private' => rand(0,1),
'private' => !(rand(0,1)),
'start_date' => $startDate,
'end_date' => $endDate,
'location' => $faker->city,

46
database/migrations/2020_08_20_131741_create_event_non_user_guests_table.php Normal file
View File

@@ -0,0 +1,46 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class CreateEventNonUserGuestsTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('event_non_user_guests', function (Blueprint $table) {
$table->id();
$table->foreignId('event_id');
$table->string('email');
$table->uuid('token')->default(\Illuminate\Support\Str::uuid());
$table->timestamp('read_at')->nullable();
$table->timestamp('validated_at')->nullable();
$table->timestamps();
$table->foreign('event_id')
->references('id')
->on('events')
->onDelete('restrict')
->onUpdate('restrict');
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::table('event_non_user_guests', function (Blueprint $table) {
$table->dropForeign(['event_id']);
});
Schema::dropIfExists('event_non_user_guests');
}
}

6
routes/api.php
View File

@@ -14,6 +14,11 @@ use Illuminate\Support\Facades\Route;
|
*/
Route::middleware('guest-mail')->group(function () {
Route::get('/events/{event}/with-email', 'EventController@guestCanReadEvent');
Route::patch('/events/{event}/with-email', 'EventController@guestCanConfirmEvent');
});
Route::middleware('auth:api')->group(function () {
Route::get('auth-user', 'AuthUserController@show');
@@ -22,6 +27,7 @@ Route::middleware('auth:api')->group(function () {
Route::delete('/events/{event}/invite/delete', 'EventController@userDeleteInvitation');
Route::delete('/events/{event}/invite/validation', 'EventController@userConfirmParticipation');
Route::post('/events/{event}/invite/with-email', 'EventController@addGuestWithEmail');
Route::post('/events/{event}/invite/{user}', 'EventController@inviteUser');
Route::delete('/events/{event}/invite/{user}', 'EventController@removeInviteUser');
Route::post('/events/{event}/staff/{user}', 'EventController@addGuestToStaffEvent');

107
tests/Feature/EventsTest.php
View File

@@ -4,11 +4,10 @@ namespace Tests\Feature;
use App\Models\Event;
use App\Models\EventCategory;
use App\Models\Memo;
use App\Models\EventGuestsNonUsers;
use App\User;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Illuminate\Foundation\Testing\WithFaker;
use Symfony\Component\HttpFoundation\Response;
use Illuminate\Support\Str;
use Tests\TestCase;
class EventsTest extends TestCase
@@ -641,7 +640,107 @@ class EventsTest extends TestCase
$this->assertCount(0, $event->guests);
}
// owner_can_invite_a_non_user_with_an_email
/** @test */
public function owner_or_staff_can_invite_a_non_user_with_an_email()
{
$this->withoutExceptionHandling();
$this->actingAs($user = factory(User::class)->create(), 'api');
$event = factory(Event::class)->create(['user_id' => $user->id, 'private' => false]);
$response = $this->post('api/events/'.$event->id.'/invite/with-email', ['email' => 'test@mail.fr']);
$event = $event->fresh();
$this->assertCount(1, $event->emailedGuests);
$response->assertJson([
'data' => [
'event_id' => $event->id,
'attributes' => [
'data' => [
'invitations-with-email' => [
'data' => [
[
'email' => 'test@mail.fr',
'read_at' => null,
'validated_at' => null,
]
],
],
]
]
]
]);
}
/** @test */
public function a_guest_with_an_email_can_read_event()
{
$user = factory(User::class)->create();
$event = factory(Event::class)->create(['user_id' => $user->id, 'private' => false]);
$token = (string) Str::uuid();
$guest = new EventGuestsNonUsers(['event_id' => $event->id, 'email' => 'test@mail.fr', 'token' => $token]);
$guest->save();
$response = $this->get('api/events/'.$event->id.'/with-email?email=test@mail.fr&token='.$token);
$response->assertStatus(200);
$this->assertCount(0, $event->guests);
$this->assertCount(1, $event->emailedGuests);
$response->assertJson([
'data' => [
'event_id' => $event->id,
'attributes' => [
'data' => [
'invitations-with-email' => [
'data' => [
[
'email' => 'test@mail.fr',
'read_at' => now()->toDateTimeString(),
'validated_at' => null,
]
],
],
]
]
]
]);
}
/** @test */
public function a_guest_with_an_email_can_confirm_participation()
{
$this->withoutExceptionHandling();
$user = factory(User::class)->create();
$event = factory(Event::class)->create(['user_id' => $user->id, 'private' => false]);
$token = (string) Str::uuid();
$guest = new EventGuestsNonUsers(['event_id' => $event->id, 'email' => 'test@mail.fr', 'token' => $token]);
$guest->save();
$response = $this->patch('api/events/'.$event->id.'/with-email', [ 'email' => 'test@mail.fr', 'token' => $token ]);
$response->assertStatus(200);
$this->assertCount(1, $event->emailedGuests);
$response->assertJson([
'data' => [
'event_id' => $event->id,
'attributes' => [
'data' => [
'invitations-with-email' => [
'data' => [
[
'validated_at' => now()->toDateTimeString(),
]
],
],
]
]
]
]);
}
// an_invitation_mail_is_seed_to_new_guest
// a_guest_can_confirm_participation_in_mail
private function data()
{

2
tests/Feature/MemosTest.php
View File

@@ -34,7 +34,7 @@ class MemosTest extends TestCase
$memo = Memo::first();
// $this->assertCount(1, Contact::all());
$this->assertCount(1, Memo::all());
$this->assertEquals('Test Name', $memo->name);
$this->assertEquals('Test Memo', $memo->memo);