refactor: CourseRegistration - enum, migration, requests and routes

skni-kod · Jan 19, 2025 · 85c81ec · 85c81ec
1 parent 9db9200
commit 85c81ec
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 23 deletions.
diff --git a/app/Enums/RegistrationStatus.php b/app/Enums/RegistrationStatus.php
@@ -13,4 +13,11 @@ public static function values(): array
     {
         return array_column(self::cases(), 'value');
     }
+    public static function acceptedAndRejectedValues(): array
+    {
+        return [
+            self::ACCEPTED->value,
+            self::REJECTED->value,
+        ];
+    }
 }
diff --git a/app/Http/Controllers/CourseRegistrationController.php b/app/Http/Controllers/CourseRegistrationController.php
@@ -6,6 +6,7 @@
 use App\Http\Requests\UpdateCourseRegistrationRequest;
 use App\Http\Resources\CourseRegistrationCollection;
 use App\Http\Resources\CourseRegistrationResource;
+use App\Models\Course;
 use App\Models\CourseRegistration;
 use App\Services\CourseRegistrationService;
 
@@ -18,9 +19,9 @@ public function index(): CourseRegistrationCollection
         return new CourseRegistrationCollection($this->courseRegistrationService->index());
     }
 
-    public function store(StoreCourseRegistrationRequest $request): CourseRegistrationResource
+    public function store(StoreCourseRegistrationRequest $request, Course $course): CourseRegistrationResource
     {
-        return new CourseRegistrationResource($this->courseRegistrationService->create($request->getCourseRegistration()));
+        return new CourseRegistrationResource($this->courseRegistrationService->create($request->getCourseRegistration($course)));
     }
 
     public function update(UpdateCourseRegistrationRequest $request, CourseRegistration $courseRegistration): CourseRegistrationResource

diff --git a/app/Http/Requests/StoreCourseRegistrationRequest.php b/app/Http/Requests/StoreCourseRegistrationRequest.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Requests;
 
+use App\Models\Course;
 use App\ValueObjects\CreateCourseRegistration;
 use Illuminate\Foundation\Http\FormRequest;
 
@@ -22,15 +23,13 @@ public function authorize(): bool
      */
     public function rules(): array
     {
-        return [
-            'course_id' => 'required|integer|exists:courses,id',
-        ];
+        return[];
     }
 
-    public function getCourseRegistration(): CreateCourseRegistration
+    public function getCourseRegistration(Course $course): CreateCourseRegistration
     {
         return new CreateCourseRegistration(
-            $this->get('course_id'),
+            $course->id,
             auth()->id()
         );
     }

diff --git a/app/Http/Requests/UpdateCourseRegistrationRequest.php b/app/Http/Requests/UpdateCourseRegistrationRequest.php
@@ -27,7 +27,7 @@ public function rules(): array
         return [
             'status' => [
                 'required',
-                Rule::in(RegistrationStatus::values()),
+                Rule::in(RegistrationStatus::acceptedAndRejectedValues()),
             ],
         ];
     }

diff --git a/database/migrations/2025_01_08_183400_create_course_registrations_table.php b/database/migrations/2025_01_08_183400_create_course_registrations_table.php
@@ -4,6 +4,7 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
+use Illuminate\Validation\Rule;
 
 return new class extends Migration
 {
@@ -16,11 +17,8 @@ public function up(): void
             $table->id();
             $table->foreignId('course_id')->constrained();
             $table->foreignId('user_id')->constrained();
-            $table->enum('status', [
-                RegistrationStatus::PENDING->value,
-                RegistrationStatus::ACCEPTED->value,
-                RegistrationStatus::REJECTED->value,
-            ])->default(RegistrationStatus::PENDING->value);
+            $table->enum('status',
+                RegistrationStatus::values())->default(RegistrationStatus::PENDING->value);
             $table->timestamps();
         });
     }

diff --git a/routes/api.php b/routes/api.php
@@ -13,15 +13,17 @@
         Route::get('user/{user}', 'show');
         Route::put('user/{user}', 'update');
     });
-});
 
-Route::middleware('auth:sanctum')->group(function () {
     Route::controller(CreditCardController::class)->group(function () {
         Route::get('user/{user}/credit-card', 'show');
         Route::put('user/{user}/credit-card', 'update');
     });
+
+    // Course Registrations
+    Route::resource('courses.registrations', CourseRegistrationController::class)->shallow();
 });
 
+
 Route::get('/user', function (Request $request) {
     return $request->user();
 })->middleware('auth:sanctum');
@@ -35,11 +37,4 @@
 Route::get('/google/redirect', [GoogleAuthController::class, 'redirectToGoogle']);
 Route::get('/google/callback', [GoogleAuthController::class, 'handleGoogleCallback']);
 
-// CourseRegistrations
-Route::middleware('auth:sanctum')->group(function () {
-    Route::controller(CourseRegistrationController::class)->group(function () {
-        Route::get('course-registrations', 'index');
-        Route::post('course-registrations', 'store');
-        Route::put('course-registrations/{courseRegistration}', 'update');
-    });
-});
+