refactor: order http files by application

Author: mascam97

app/Http/Controllers/Api/NotesController.php

@@ -8,14 +8,14 @@
 use App\Domain\Notes\Dtos\UpdateNoteData;
 use App\Domain\Notes\Exceptions\NoteExceptions;
 use App\Domain\Subscriptions\Exceptions\SubscriptionExceptions;
-use App\Http\Controllers\Controller;
-use App\Http\Controllers\NoteResource;
-use App\Http\Requests\UpdateNoteRequest;
 use App\Domain\Notes\Models\Note;
 use App\Domain\Users\Models\User;
+use App\Http\Requests\Api\StoreNoteRequest;
+use App\Http\Requests\Api\UpdateNoteRequest;
+use App\Http\Resources\Api\NoteResource;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
-use App\Http\Requests\StoreNoteRequest;
+use Inertia\Controller;
 
 class NotesController extends Controller
 {

app/Http/Controllers/NotesController.php renamed to app/Http/Controllers/Web/NotesController.php

@@ -1,20 +1,21 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\Web;
 
 use App\Domain\Notes\Actions\StoreNoteAction;
 use App\Domain\Notes\Actions\UpdateNoteAction;
 use App\Domain\Notes\Dtos\StoreNoteData;
 use App\Domain\Notes\Dtos\UpdateNoteData;
 use App\Domain\Notes\Exceptions\NoteExceptions;
 use App\Domain\Subscriptions\Exceptions\SubscriptionExceptions;
-use App\Http\Requests\UpdateNoteRequest;
 use App\Domain\Notes\Models\Note;
 use App\Domain\Users\Models\User;
+use App\Http\Controllers\Controller;
+use App\Http\Requests\Web\StoreNoteRequest;
+use App\Http\Requests\Web\UpdateNoteRequest;
 use Illuminate\Http\RedirectResponse;
 use Inertia\Inertia;
 use Illuminate\Http\Request;
-use App\Http\Requests\StoreNoteRequest;
 use Inertia\Response;
 
 class NotesController extends Controller

app/Http/Requests/StoreNoteRequest.php renamed to app/Http/Requests/Api/StoreNoteRequest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Http\Requests\Api;
 
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Facades\Auth;

app/Http/Requests/UpdateNoteRequest.php renamed to app/Http/Requests/Api/UpdateNoteRequest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Http\Requests\Api;
 
 use App\Domain\Notes\Models\Note;
 use Illuminate\Foundation\Http\FormRequest;

app/Http/Requests/Web/StoreNoteRequest.php

@@ -0,0 +1,49 @@
+<?php
+
+namespace App\Http\Requests\Web;
+
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Validation\Rule;
+
+class StoreNoteRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        /** @var int $authUserId */
+        $authUserId = Auth::id();
+
+        return [
+            'title' => [
+                'bail',
+                'required',
+                'string',
+                'max:40',
+                'min:6',
+                Rule::unique('notes')
+                    ->where('user_id', $authUserId)
+            ],
+            'content' => [
+                'bail',
+                'required',
+                'string',
+                'min:20'
+            ],
+        ];
+    }
+}

app/Http/Requests/Web/UpdateNoteRequest.php

@@ -0,0 +1,53 @@
+<?php
+
+namespace App\Http\Requests\Web;
+
+use App\Domain\Notes\Models\Note;
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Validation\Rule;
+
+class UpdateNoteRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        /** @var int $authUserId */
+        $authUserId = Auth::id();
+        /** @var Note $note */
+        $note = $this->route('note');
+
+        return [
+            'title' => [
+                'bail',
+                'nullable',
+                'string',
+                'max:40',
+                'min:6',
+                Rule::unique('notes')
+                    ->where('user_id', $authUserId)
+                    ->ignoreModel($note)
+            ],
+            'content' => [
+                'bail',
+                'nullable',
+                'string',
+                'min:20'
+            ],
+        ];
+    }
+}

app/Http/Controllers/NoteResource.php renamed to app/Http/Resources/Api/NoteResource.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Http\Resources\Api;
 
 use App\Domain\Notes\Models\Note;
 use Illuminate\Http\Resources\Json\JsonResource;
@@ -15,7 +15,6 @@ public function toArray($request): array
         return [
             'id' => $this->id,
             'title' => $this->title,
-            'excerpt' => $this->excerpt,
             'content' => $this->content,
             'created_at' => $this->created_at,
             'updated_at' => $this->updated_at,

routes/web.php

@@ -1,5 +1,6 @@
 <?php
 
+use App\Http\Controllers\Web\NotesController;
 use Illuminate\Foundation\Application;
 use Illuminate\Support\Facades\Route;
 use Inertia\Inertia;
@@ -28,5 +29,5 @@
     return Inertia::render('Dashboard');
 })->name('dashboard');
 
-Route::resource('notes', App\Http\Controllers\NotesController::class)
+Route::resource('notes', NotesController::class)
     ->middleware(['auth:sanctum', 'note.logged.user']);

tests/Feature/Http/Controllers/Api/Notes/IndexNotesControllerTest.php

@@ -34,7 +34,6 @@ public function test_index_notes()
                 '*' => [
                     'id',
                     'title',
-                    'excerpt',
                     'content',
                     'created_at',
                     'updated_at',

tests/Feature/Http/Controllers/Api/Notes/ShowNoteControllerTest.php

@@ -40,7 +40,6 @@ public function test_show()
                     $data->where('id', $this->note->id)
                     ->where('title', $this->note->title)
                     ->where('content', $this->note->content)
-                    ->where('excerpt', $this->note->excerpt)
                     ->has('created_at')
                     ->has('updated_at');
                 })->etc();