merge dev into branch and resolve conflicts

Author: Finnick223

app/Enums/RegistrationStatus.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Enums;
+
+enum RegistrationStatus: string
+{
+    case PENDING = 'pending';
+    case ACCEPTED = 'accepted';
+    case REJECTED = 'rejected';
+
+    // get all enum values as an array
+    public static function values(): array
+    {
+        return array_column(self::cases(), 'value');
+    }
+
+    public static function acceptedAndRejectedValues(): array
+    {
+        return [
+            self::ACCEPTED->value,
+            self::REJECTED->value,
+        ];
+    }
+}

app/Filters/FullNameFilter.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+use Spatie\QueryBuilder\Filters\Filter;
+
+class FullNameFilter implements Filter
+{
+    public function __invoke(Builder $query, $value, string $property): void
+    {
+        $value = strtolower(trim($value));
+
+        $parts = preg_split('/\s+/', $value); // rozdzielenie po spacjach (zeby wyszukiwalo jesli podamy i imie, i nazwisko)
+
+        $query->where(function ($q) use ($parts) {
+            if (count($parts) === 1) {
+                $q->whereRaw('LOWER(name) LIKE ?', ["%{$parts[0]}%"])
+                    ->orWhereRaw('LOWER(last_name) LIKE ?', ["%{$parts[0]}%"]);
+            } else {
+                foreach ($parts as $part) {
+                    $q->where(function ($subQ) use ($part) {
+                        $subQ->whereRaw('LOWER(name) LIKE ?', ["%{$part}%"])
+                            ->orWhereRaw('LOWER(last_name) LIKE ?', ["%{$part}%"]);
+                    });
+                }
+            }
+        });
+    }
+}

app/Http/Controllers/Admin/AdminStudentController.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+use App\Filters\FullNameFilter;
+use App\Http\Controllers\Controller;
+use App\Http\Resources\UserCollection;
+use App\Models\User;
+use Spatie\QueryBuilder\AllowedFilter;
+use Spatie\QueryBuilder\QueryBuilder;
+
+class AdminStudentController extends Controller
+{
+    public function __construct() {}
+
+    public function index(): UserCollection
+    {
+        return new UserCollection(QueryBuilder::for(User::role('driver'))
+            ->allowedFilters(AllowedFilter::custom('search', new FullNameFilter))
+            ->paginate(self::PER_PAGE));
+    }
+}

app/Http/Controllers/AuthController.php

@@ -12,6 +12,7 @@
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Facades\Log;
 use Illuminate\Validation\ValidationException;
 use Symfony\Component\HttpFoundation\Response;
 
@@ -73,6 +74,16 @@ public function login(LoginRequest $request): JsonResponse
         ], Response::HTTP_OK);
     }
 
+    public function logout(Request $request): JsonResponse
+    {
+        $request->user()->currentAccessToken()->delete();
+
+        return response()->json([
+            'success' => true,
+            'message' => 'Logout successful',
+        ]);
+    }
+
     public function show(User $user): UserResource
     {
         return new UserResource($this->userService->show($user));

app/Http/Controllers/CourseRegistration/AdminCourseRegistrationController.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace App\Http\Controllers\CourseRegistration;
+
+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\Request;
+
+class AdminCourseRegistrationController extends Controller
+{
+    public function __construct(protected CourseRegistrationService $courseRegistrationService) {}
+
+    public function index(Request $request): CourseRegistrationCollection
+    {
+        return new CourseRegistrationCollection($this->courseRegistrationService->index($request)->paginate(self::PER_PAGE));
+    }
+
+    public function store(StoreCourseRegistrationRequest $request): CourseUserResource
+    {
+        return new CourseUserResource($this->courseRegistrationService->store($request->getRegistration()));
+    }
+
+    public function accept(CourseRegistration $courseRegistration): CourseRegistrationResource
+    {
+        return new CourseRegistrationResource($this->courseRegistrationService->accept($courseRegistration));
+    }
+
+    public function decline(CourseRegistration $courseRegistration): CourseRegistrationResource
+    {
+        return new CourseRegistrationResource($this->courseRegistrationService->decline($courseRegistration));
+    }
+}

app/Http/Controllers/CourseRegistration/GuestCourseRegistrationController.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Http\Controllers\CourseRegistration;
+
+use App\Http\Controllers\Controller;
+use App\Http\Requests\CourseRegistration\GuestCourseRegistrationRequest;
+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): CourseRegistrationResource
+    {
+        return new CourseRegistrationResource($this->guestCourseRegistrationService->store($request->getGuestCourseRegistration($course)));
+    }
+}

app/Http/Requests/CourseRegistration/GuestCourseRegistrationRequest.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace App\Http\Requests\CourseRegistration;
+
+use App\Models\Course;
+use App\ValueObjects\StoreGuestCourseRegistration;
+use Illuminate\Foundation\Http\FormRequest;
+
+class GuestCourseRegistrationRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     */
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
+     */
+    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|unique:users,email',
+            'phone' => 'phone:PL,INTERNATIONAL',
+            'phone_country' => 'required_with:phone_number|string|size:2',
+        ];
+    }
+
+    public function getGuestCourseRegistration(Course $course): StoreGuestCourseRegistration
+    {
+        return new StoreGuestCourseRegistration(
+            $course->id,
+            $this->get('name'),
+            $this->get('last_name'),
+            $this->get('email'),
+            $this->get('phone'),
+            $this->get('phone_country')
+        );
+    }
+}

app/Http/Requests/CourseRegistration/StoreCourseRegistrationRequest.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Http\Requests\CourseRegistration;
+
+use App\ValueObjects\CreateCourseRegistration;
+use Illuminate\Foundation\Http\FormRequest;
+
+class StoreCourseRegistrationRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     */
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
+     */
+    public function rules(): array
+    {
+        return [
+            'user_id' => 'required|exists:users,id',
+            'course_id' => 'required|exists:courses,id',
+        ];
+    }
+
+    public function getRegistration(): CreateCourseRegistration
+    {
+        return new CreateCourseRegistration(
+            $this->get('user_id'),
+            $this->get('course_id')
+        );
+    }
+}

app/Http/Requests/UpdateUserRequest.php

@@ -25,7 +25,8 @@ public function rules(): array
             'name' => 'string|min:2|max:30|regex:/^[a-zA-ZÀ-ž\s\'-]+$/',
             'last_name' => 'string|min:2|max:30|regex:/^[a-zA-ZÀ-ž\s\'-]+$/',
             'email' => 'email|max:255|unique:users,email,'.$this->user->id,
-            'phone_number' => 'string|regex:/^\+?\d{9,15}$/',
+            'phone_number' => 'phone:PL,INTERNATIONAL',
+            'phone_country' => 'required_with:phone_number|string|size:2',
             'voivodship' => 'string|min:1|max:30',
             'city' => 'string|min:1|max:30',
             'zip_code' => 'string|regex:/^\d{2}-\d{3}$/',

app/Http/Resources/CourseRegistration/CourseRegistrationCollection.php

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