Feat/course registrations

app/Http/Controllers/Admin/AdminStudentController.php

@@ -5,13 +5,13 @@
 use App\Http\Controllers\Controller;
 use App\Http\Resources\UserCollection;
 use App\Services\Admin\AdminStudentService;
+use Illuminate\Http\Request;
 
 class AdminStudentController extends Controller
 {
     public function __construct(private readonly AdminStudentService $adminStudentService) {}
-
-    public function index(): UserCollection
+    public function index(Request $request): UserCollection
     {
-        return new UserCollection($this->adminStudentService->index());
+        return new UserCollection($this->adminStudentService->index($request)->paginate(self::PER_PAGE));
     }
 }

app/Http/Controllers/CourseRegistration/AdminCourseRegistrationController.php

@@ -5,6 +5,8 @@
 use App\Http\Controllers\Controller;
 use App\Http\Requests\CourseRegistration\StoreCourseRegistrationRequest;
 use App\Http\Resources\CourseRegistration\CourseRegistrationCollection;
+use App\Http\Resources\CourseRegistration\CourseRegistrationResource;
+use App\Http\Resources\CourseUserResource;
 use App\Models\CourseRegistration;
 use App\Services\CourseRegistrationService;
 use Illuminate\Http\JsonResponse;
@@ -19,24 +21,18 @@ public function index(): CourseRegistrationCollection
         return new CourseRegistrationCollection($this->courseRegistrationService->index());
     }
 
-    public function store(StoreCourseRegistrationRequest $request): JsonResponse
+    public function store(StoreCourseRegistrationRequest $request): CourseUserResource
     {
-        $this->courseRegistrationService->store($request->getRegistration());
-
-        return response()->json(['message' => 'Użytkownik został zapisany na kurs!'], Response::HTTP_CREATED);
+        return new CourseUserResource($this->courseRegistrationService->store($request->getRegistration()));
     }
 
-    public function accept(CourseRegistration $courseRegistration): JsonResponse
+    public function accept(CourseRegistration $courseRegistration): CourseRegistrationResource
     {
-        $this->courseRegistrationService->accept($courseRegistration);
-
-        return response()->json(['message' => 'Zgloszenie zostalo zaakceptowane i kursant zostal utworzony!'], Response::HTTP_OK);
+        return new CourseRegistrationResource($this->courseRegistrationService->accept($courseRegistration));
     }
 
-    public function decline(CourseRegistration $courseRegistration): JsonResponse
+    public function decline(CourseRegistration $courseRegistration): CourseRegistrationResource
     {
-        $this->courseRegistrationService->decline($courseRegistration);
-
-        return response()->json(['message' => 'Zgloszenie zostalo odrzucone!'], Response::HTTP_OK);
+        return new CourseRegistrationResource($this->courseRegistrationService->decline($courseRegistration));
     }
 }

app/Http/Controllers/CourseRegistration/GuestCourseRegistrationController.php

@@ -4,16 +4,16 @@
 
 use App\Http\Controllers\Controller;
 use App\Http\Requests\CourseRegistration\GuestCourseRegistrationRequest;
-use App\Http\Resources\CourseRegistration\GuestCourseRegistrationResource;
+use App\Http\Resources\CourseRegistration\CourseRegistrationResource;
 use App\Models\Course;
 use App\Services\GuestCourseRegistrationService;
 
 class GuestCourseRegistrationController extends Controller
 {
     public function __construct(protected GuestCourseRegistrationService $guestCourseRegistrationService) {}
 
-    public function store(GuestCourseRegistrationRequest $request, Course $course): GuestCourseRegistrationResource
+    public function store(GuestCourseRegistrationRequest $request, Course $course): CourseRegistrationResource
     {
-        return new GuestCourseRegistrationResource($this->guestCourseRegistrationService->store($request->getGuestCourseRegistration($course)));
+        return new CourseRegistrationResource($this->guestCourseRegistrationService->store($request->getGuestCourseRegistration($course)));
     }
 }

app/Http/Requests/CourseRegistration/GuestCourseRegistrationRequest.php

@@ -24,28 +24,10 @@ public function authorize(): bool
     public function rules(): array
     {
         return [
-            'name' => [
-                'required',
-                'string',
-                'min:2',
-                'max:30',
-                'regex:/^[a-zA-ZÀ-ž\s\'-]+$/',
-            ],
-            'last_name' => [
-                'required',
-                'string',
-                'min:2',
-                'max:30',
-                'regex:/^[a-zA-ZÀ-ž\s\'-]+$/',
-            ],
-            'email' => [
-                'required',
-                'email',
-            ],
-            'phone' => [
-                'required',
-                'regex:/^\+?\d{9,15}$/',
-            ],
+            'name' => 'required|string|min:2|max:30|regex:/^[a-zA-ZÀ-ž\s\'-]+$/',
+            'last_name' => 'required|string|min:2|max:30|regex:/^[a-zA-ZÀ-ž\s\'-]+$/',
+            'email' => 'required|email|unique:users,email',
+            'phone' => 'required|regex:/^\+?\d{9,15}$/',
         ];
     }
 

app/Http/Resources/CourseRegistration/GuestCourseRegistrationResource.php → app/Http/Resources/CourseRegistration/CourseRegistrationResource.php

@@ -5,7 +5,7 @@
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
-class GuestCourseRegistrationResource extends JsonResource
+class CourseRegistrationResource extends JsonResource
 {
     /**
      * Transform the resource into an array.

app/Http/Resources/CourseUserResource.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Http\Resources;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class CourseUserResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @return array<string, mixed>
+     */
+    public function toArray(Request $request): array
+    {
+        return parent::toArray($request);
+    }
+}

app/Services/Admin/AdminStudentService.php

@@ -3,12 +3,23 @@
 namespace App\Services\Admin;
 
 use App\Models\User;
-use Illuminate\Support\Collection;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Http\Request;
 
 class AdminStudentService
 {
-    public function index(): Collection
+    public function index(Request $request): Builder
     {
-        return User::role('driver')->get();
+
+        $user =  User::role('driver');
+
+        if ($request->has('search')) {
+            $search = strtolower($request->input('search'));
+            $user->where(function ($q) use ($search) {
+                $q->whereRaw('LOWER(name) LIKE ?', ["%{$search}%"])
+                    ->orWhereRaw('LOWER(last_name) LIKE ?', ["%{$search}%"]);
+            });
+        }
+        return $user;
     }
 }

app/Services/CourseRegistrationService.php

@@ -17,7 +17,7 @@ public function index(): Collection
         return CourseRegistration::all();
     }
 
-    public function store(CreateCourseRegistration $data): void
+    public function store(CreateCourseRegistration $data): CourseRegistration
     {
         $user = User::find($data->getUserId());
         $courseId = $data->getCourseId();
@@ -27,9 +27,10 @@ public function store(CreateCourseRegistration $data): void
         }
 
         $user->courses()->attach($courseId);
+        return CourseRegistration::where('user_id', $user->id)->where('course_id', $courseId)->first();
     }
 
-    public function accept(CourseRegistration $courseRegistration): User
+    public function accept(CourseRegistration $courseRegistration): CourseRegistration
     {
         $user = User::create([
             'name' => $courseRegistration->name,
@@ -40,16 +41,17 @@ public function accept(CourseRegistration $courseRegistration): User
         ]);
 
         $user->assignRole('driver');
-        $courseRegistration->update(['status' => RegistrationStatus::ACCEPTED->value]);
+        $courseRegistration->update(['status' => RegistrationStatus::ACCEPTED->value, 'user_id' => $user->id,]);
 
         // do wyslania maila z haslem
         //Mail::to($user->email)->send(new RegistrationApproved($user, $password));
 
-        return $user;
+        return $courseRegistration;
     }
 
-    public function decline(CourseRegistration $courseRegistration): void
+    public function decline(CourseRegistration $courseRegistration): CourseRegistration
     {
         $courseRegistration->update(['status' => RegistrationStatus::REJECTED->value]);
+        return $courseRegistration;
     }
 }

routes/api/api.php

@@ -3,6 +3,7 @@
 use App\Http\Controllers\Admin\AdminStudentController;
 use App\Http\Controllers\AuthController;
 use App\Http\Controllers\CourseController;
+use App\Http\Controllers\CourseRegistration\AdminCourseRegistrationController;
 use App\Http\Controllers\CourseRegistration\GuestCourseRegistrationController;
 use App\Http\Controllers\CreditCardController;
 use App\Http\Controllers\GoogleAuthController;