#79 - Inviting to quizzes frontend

app/Actions/AssignToQuizAction.php

@@ -4,6 +4,7 @@
 
 namespace App\Actions;
 
+use App\Events\UserInvitedToQuiz;
 use App\Models\Quiz;
 use App\Models\User;
 use Illuminate\Support\Collection;
@@ -13,12 +14,16 @@ class AssignToQuizAction
     /**
      * @param Collection<int> $userIds
      */
-    public function execute(Quiz $quiz, Collection $userIds): void
+    public function execute(Quiz $quiz, Collection $userIds, User $inviter): void
     {
         $assignedUsers = $quiz->assignedUsers()->get();
         $users = User::query()->whereIn("id", $userIds)->get();
 
         $users = $users->filter(fn(User $user) => !$assignedUsers->contains($user));
         $quiz->assignedUsers()->attach($users);
+
+        foreach ($users as $user) {
+            event(new UserInvitedToQuiz($quiz, $user, $inviter));
+        }
     }
 }

app/Events/UserInvitedToQuiz.php

@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Events;
+
+use App\Models\Quiz;
+use App\Models\User;
+use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
+
+class UserInvitedToQuiz
+{
+    use Dispatchable;
+    use InteractsWithSockets;
+    use SerializesModels;
+
+    public function __construct(
+        public Quiz $quiz,
+        public User $invitee,
+        public User $inviter,
+    ) {}
+}

app/Http/Controllers/ContestController.php

@@ -5,10 +5,8 @@
 namespace App\Http\Controllers;
 
 use App\Http\Resources\QuizResource;
-use App\Http\Resources\SchoolResource;
 use App\Http\Resources\UserQuizResource;
 use App\Models\Quiz;
-use App\Models\School;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Inertia\Inertia;
@@ -18,13 +16,7 @@ class ContestController extends Controller
 {
     public function index(): Response
     {
-        $schools = School::query()
-            ->where("is_disabled", false)
-            ->where("is_admin_school", false)
-            ->orderBy("name")
-            ->get();
-
-        return Inertia::render("Home", ["schools" => SchoolResource::collection($schools)]);
+        return Inertia::render("Home");
     }
 
     public function create(Request $request): RedirectResponse|Response

app/Http/Controllers/InviteController.php

@@ -9,10 +9,8 @@
 use App\Helpers\SortHelper;
 use App\Http\Requests\InviteQuizRequest;
 use App\Http\Resources\QuizResource;
-use App\Http\Resources\SchoolResource;
 use App\Http\Resources\UserResource;
 use App\Models\Quiz;
-use App\Models\School;
 use App\Models\User;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Http\RedirectResponse;
@@ -25,17 +23,25 @@ class InviteController extends Controller
     public function index(Quiz $quiz, SortHelper $sort, Request $request): Response
     {
         $this->authorize("invite", $quiz);
+
         $query = User::query()->role("user")->with("school")->whereNotNull("email_verified_at");
         $query = $sort->sort($query, ["id"], ["name", "school"]);
         $query = $this->sortByName($query, $sort);
         $query = $this->sortBySchool($query, $sort);
-        $query = $this->filterByName($query, $request);
+        $query = $this->filterByMode($query, $request);
         $query = $this->filterBySchool($query, $request);
 
+        $quizzes = Quiz::query()
+            ->select("id", "title")
+            ->whereNotNull("scheduled_at")
+            ->where("scheduled_at", ">", now())
+            ->whereNotNull("locked_at")
+            ->get();
+
         return Inertia::render("Admin/Invite", [
             "users" => UserResource::collection($sort->paginate($query)),
             "quiz" => QuizResource::make($quiz),
-            "schools" => SchoolResource::collection(School::all()),
+            "quizzes" => $quizzes,
             "assigned" => $quiz->assignedUsers->pluck("id"),
         ]);
     }
@@ -44,11 +50,11 @@ public function assign(Quiz $quiz, InviteQuizRequest $request, AssignToQuizActio
     {
         $this->authorize("invite", $quiz);
 
-        $assignAction->execute($quiz, collect($request->input("ids")));
+        $assignAction->execute($quiz, collect($request->input("ids")), $request->user());
 
         return redirect()
             ->back()
-            ->with("status", "Użytkownicy zostali przypisani do quizu.");
+            ->with("status", "Użytkownicy zostali przypisani do testu. Za 15 minut zostaną o tym powiadomieni drogą mailową. Jeżeli w ciągu 15 minut anulujesz zaproszenie, e-mail nie zostanie wysłany.");
     }
 
     public function unassign(Quiz $quiz, InviteQuizRequest $request, UnassignFromQuizAction $unassignAction): RedirectResponse
@@ -59,7 +65,18 @@ public function unassign(Quiz $quiz, InviteQuizRequest $request, UnassignFromQui
 
         return redirect()
             ->back()
-            ->with("status", "Użytkownicy zostali wypisani z quizu.");
+            ->with("status", "Użytkownicy zostali wypisani z testu.");
+    }
+
+    private function filterByMode(Builder $query, Request $request)
+    {
+        $mode = $request->query("mode", "user");
+
+        if ($mode === "school") {
+            return $this->filterBySchoolName($query, $request);
+        }
+
+        return $this->filterByName($query, $request);
     }
 
     private function filterByName(Builder $query, Request $request): Builder
@@ -74,6 +91,19 @@ private function filterByName(Builder $query, Request $request): Builder
         return $query;
     }
 
+    private function filterBySchoolName(Builder $query, Request $request): Builder
+    {
+        $searchName = $request->query("search");
+
+        if ($searchName) {
+            return $query->whereHas("school", function (Builder $schoolQuery) use ($searchName): void {
+                $schoolQuery->where("name", "ilike", "%$searchName%");
+            });
+        }
+
+        return $query;
+    }
+
     private function filterBySchool(Builder $query, Request $request): Builder
     {
         $searchSchool = $request->query("schoolId");

app/Http/Controllers/QuizController.php

@@ -104,7 +104,7 @@ public function createUserQuiz(CreateUserQuizAction $action, Request $request, Q
 
     public function assign(AssignToQuizAction $action, Request $request, Quiz $quiz): RedirectResponse
     {
-        $action->execute($quiz, collect([$request->user()->id]));
+        $action->execute($quiz, collect([$request->user()->id]), $request->user());
 
         return redirect()
             ->back()

app/Http/Controllers/SchoolsController.php

@@ -8,13 +8,15 @@
 use App\Helpers\SortHelper;
 use App\Http\Requests\SchoolRequest;
 use App\Http\Resources\SchoolResource;
+use App\Http\Resources\SchoolSearchResource;
 use App\Jobs\FetchSchoolsJob;
 use App\Models\School;
 use Illuminate\Bus\Batch;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
+use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Support\Facades\Bus;
 use Illuminate\Support\Facades\Cache;
 use Inertia\Inertia;
@@ -29,16 +31,16 @@ class SchoolsController extends Controller
 {
     public function index(SortHelper $sorter, Request $request): Response
     {
-        $query = School::query()->where("is_admin_school", false);
-        $query = $sorter->sort($query, ["id", "name", "regon", "updated_at", "created_at"], ["students", "address"]);
-        $query = $this->sortByStudents($query, $sorter);
-        $query = $this->sortByAddress($query, $sorter);
-        $query = $this->filterDisabledSchools($query, $request);
-        $query = $sorter->search($query, "name");
+        $schools = $this->searchQuery($sorter, $request);
 
-        return Inertia::render("Admin/SchoolsPanel", [
-            "schools" => SchoolResource::collection($sorter->paginate($query)),
-        ]);
+        return Inertia::render("Admin/SchoolsPanel", ["schools" => SchoolResource::collection($schools)]);
+    }
+
+    public function search(SortHelper $sorter, Request $request): JsonResponse
+    {
+        $schools = $this->searchQuery($sorter, $request);
+
+        return SchoolSearchResource::collection($schools)->response();
     }
 
     public function store(SchoolRequest $request): RedirectResponse
@@ -134,6 +136,18 @@ protected function findBatch(): ?Batch
         return Bus::findBatch($batchId);
     }
 
+    private function searchQuery(SortHelper $sorter, Request $request): LengthAwarePaginator
+    {
+        $query = School::query()->where("is_admin_school", false);
+        $query = $sorter->sort($query, ["id", "name", "regon", "updated_at", "created_at"], ["students", "address"]);
+        $query = $this->sortByStudents($query, $sorter);
+        $query = $this->sortByAddress($query, $sorter);
+        $query = $this->filterDisabledSchools($query, $request);
+        $query = $sorter->search($query, "name");
+
+        return $sorter->paginate($query);
+    }
+
     private function sortByStudents(Builder $query, SortHelper $sorter): Builder
     {
         [$field, $order] = $sorter->getSortParameters();

app/Http/Controllers/UserController.php

@@ -6,9 +6,7 @@
 
 use App\Helpers\SortHelper;
 use App\Http\Requests\UserRequest;
-use App\Http\Resources\SchoolResource;
 use App\Http\Resources\UserResource;
-use App\Models\School;
 use App\Models\User;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Http\RedirectResponse;
@@ -21,10 +19,6 @@ class UserController extends Controller
     public function index(SortHelper $sorter, Request $request): Response
     {
         $users = User::query()->role("user")->with("school");
-        $schools = School::query()
-            ->where("is_admin_school", false)
-            ->orderBy("name")
-            ->get();
 
         $query = $sorter->sort($users, ["id", "email", "updated_at", "created_at"], ["firstname", "school"]);
         $query = $this->filterAnonymizedUsers($query, $request);
@@ -34,7 +28,6 @@ public function index(SortHelper $sorter, Request $request): Response
 
         return Inertia::render("Admin/UsersPanel", [
             "users" => UserResource::collection($query->paginate()),
-            "schools" => SchoolResource::collection($schools),
         ]);
     }
 

app/Http/Requests/Auth/ResetPasswordRequest.php

@@ -16,7 +16,7 @@ public function authorize(): bool
     public function rules(): array
     {
         return [
-            "token" => ["required"],
+            "token" => ["required", "max:255"],
             "email" => ["required", "email", "max:255"],
             "password" => ["required", "min:8", "max:255", "confirmed:password_confirmation"],
         ];

app/Http/Resources/SchoolSearchResource.php

@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Resources;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class SchoolSearchResource extends JsonResource
+{
+    /**
+     * @return array<string, mixed>
+     */
+    public function toArray(Request $request): array
+    {
+        return [
+            "id" => $this->id,
+            "name" => $this->name,
+            "city" => $this->city,
+        ];
+    }
+}

app/Jobs/SendInviteJob.php

@@ -12,6 +12,7 @@
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Foundation\Queue\Queueable;
 use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\Middleware\SkipIfBatchCancelled;
 use Illuminate\Queue\SerializesModels;
 
 class SendInviteJob implements ShouldQueue
@@ -27,8 +28,25 @@ public function __construct(
         protected Quiz $quiz,
     ) {}
 
+    public function middleware(): array
+    {
+        return [new SkipIfBatchCancelled()];
+    }
+
     public function handle(): void
     {
-        $this->user->notify(new InviteUserNotification($this->quiz));
+        if ($this->quiz->assignedUsers->contains("id", $this->user->id)) {
+            $this->user->notify(new InviteUserNotification($this->quiz));
+        }
+    }
+
+    public function getUser(): User
+    {
+        return $this->user;
+    }
+
+    public function getQuiz(): Quiz
+    {
+        return $this->quiz;
     }
 }

app/Listeners/SendInvitedToQuizNotification.php

@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Listeners;
+
+use App\Events\UserInvitedToQuiz;
+use App\Jobs\SendInviteJob;
+use Carbon\Carbon;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Support\Facades\Bus;
+use Illuminate\Support\Facades\Cache;
+
+class SendInvitedToQuizNotification implements ShouldQueue
+{
+    public function handle(UserInvitedToQuiz $event): void
+    {
+        $quiz = $event->quiz;
+        $busName = "send_invite-" . $quiz->id . "-" . $event->invitee->id;
+        $busId = Cache::get($busName);
+
+        if ($busId !== null) {
+            Bus::findBatch($busId)?->cancel();
+        }
+
+        $busId = Bus::batch([
+            (new SendInviteJob($event->invitee, $quiz))->delay(Carbon::now()->addMinutes(15)),
+        ])->dispatch()->id;
+
+        Cache::set($busName, $busId);
+    }
+}

app/Notifications/InviteUserNotification.php

@@ -30,6 +30,7 @@ public function toMail(object $notifiable): MailMessage
             ->view("emails.auth.invite-user", [
                 "user" => $notifiable,
                 "quiz" => $this->quiz,
+                "url" => url("/dashboard"),
             ]);
     }
 }