From d65d576fe18a623a30b2a9b08217cb1843b08cae Mon Sep 17 00:00:00 2001
From: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com>
Date: Thu, 30 May 2024 00:56:11 +0100
Subject: [PATCH] Move Requests into Http\Requests

Signed-off-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com>
---
 README.md                                                    | 2 +-
 resources/models/locationsettings.php                        | 4 ++--
 src/Extension.php                                            | 2 +-
 src/Http/Controllers/Locations.php                           | 4 ++--
 src/Http/Controllers/Reviews.php                             | 2 +-
 src/{ => Http}/Requests/LocationAreaRequest.php              | 2 +-
 src/{ => Http}/Requests/LocationRequest.php                  | 2 +-
 src/{Requests/Review.php => Http/Requests/ReviewRequest.php} | 4 ++--
 src/{ => Http}/Requests/WorkingHourRequest.php               | 2 +-
 tests/Requests/LocationTest.php                              | 2 +-
 10 files changed, 13 insertions(+), 13 deletions(-)
 rename src/{ => Http}/Requests/LocationAreaRequest.php (98%)
 rename src/{ => Http}/Requests/LocationRequest.php (98%)
 rename src/{Requests/Review.php => Http/Requests/ReviewRequest.php} (95%)
 rename src/{ => Http}/Requests/WorkingHourRequest.php (97%)

diff --git a/README.md b/README.md
index 93deb86..d8e2c27 100644
--- a/README.md
+++ b/README.md
@@ -540,7 +540,7 @@ Add the following code to your [form definition file](https://tastyigniter.com/d
     'label' => 'Map Area',
     'type' => 'maparea',
     'form' => 'locationarea',
-    'request' => \Igniter\Local\Requests\LocationAreaRequest::class,
+    'request' => \Igniter\Local\Http\Requests\LocationAreaRequest::class,
  ],
 ```
 
diff --git a/resources/models/locationsettings.php b/resources/models/locationsettings.php
index dda6265..ce5526a 100644
--- a/resources/models/locationsettings.php
+++ b/resources/models/locationsettings.php
@@ -22,7 +22,7 @@
             'tab' => 'lang:igniter.local::default.text_tab_schedules',
             'type' => 'scheduleeditor',
             'form' => 'workinghour',
-            'request' => \Igniter\Local\Requests\WorkingHourRequest::class,
+            'request' => \Igniter\Local\Http\Requests\WorkingHourRequest::class,
         ],
 
         'delivery_areas' => [
@@ -30,7 +30,7 @@
             'label' => 'lang:igniter.local::default.text_delivery_area',
             'type' => 'maparea',
             'form' => 'locationarea',
-            'request' => \Igniter\Local\Requests\LocationAreaRequest::class,
+            'request' => \Igniter\Local\Http\Requests\LocationAreaRequest::class,
             'commentAbove' => 'lang:igniter.local::default.help_delivery_areas',
         ],
 
diff --git a/src/Extension.php b/src/Extension.php
index 870f4cf..792d467 100644
--- a/src/Extension.php
+++ b/src/Extension.php
@@ -11,6 +11,7 @@
 use Igniter\Flame\Igniter;
 use Igniter\Local\Classes\Location;
 use Igniter\Local\Facades\Location as LocationFacade;
+use Igniter\Local\Http\Requests\LocationRequest;
 use Igniter\Local\Listeners\MaxOrderPerTimeslotReached;
 use Igniter\Local\MainMenuWidgets\LocationPicker;
 use Igniter\Local\Models\Location as LocationModel;
@@ -18,7 +19,6 @@
 use Igniter\Local\Models\Review;
 use Igniter\Local\Models\ReviewSettings;
 use Igniter\Local\Models\Scopes\LocationScope;
-use Igniter\Local\Requests\LocationRequest;
 use Igniter\Reservation\Models\Reservation;
 use Igniter\User\Facades\Auth;
 use Igniter\User\Models\User;
diff --git a/src/Http/Controllers/Locations.php b/src/Http/Controllers/Locations.php
index 1ff5245..cc77f3c 100644
--- a/src/Http/Controllers/Locations.php
+++ b/src/Http/Controllers/Locations.php
@@ -32,14 +32,14 @@ class Locations extends \Igniter\Admin\Classes\AdminController
             'redirect' => 'locations/edit/{location_id}',
             'redirectClose' => 'locations',
             'redirectNew' => 'locations/create',
-            'request' => \Igniter\Local\Requests\LocationRequest::class,
+            'request' => \Igniter\Local\Http\Requests\LocationRequest::class,
         ],
         'edit' => [
             'title' => 'lang:igniter::admin.form.edit_title',
             'redirect' => 'locations/edit/{location_id}',
             'redirectClose' => 'locations',
             'redirectNew' => 'locations/create',
-            'request' => \Igniter\Local\Requests\LocationRequest::class,
+            'request' => \Igniter\Local\Http\Requests\LocationRequest::class,
         ],
         'settings' => [
             'title' => 'lang:igniter.local::default.settings_title',
diff --git a/src/Http/Controllers/Reviews.php b/src/Http/Controllers/Reviews.php
index eb4bc09..ce4dc53 100644
--- a/src/Http/Controllers/Reviews.php
+++ b/src/Http/Controllers/Reviews.php
@@ -26,7 +26,7 @@ class Reviews extends \Igniter\Admin\Classes\AdminController
     public array $formConfig = [
         'name' => 'lang:igniter.local::default.reviews.text_form_name',
         'model' => \Igniter\Local\Models\Review::class,
-        'request' => \Igniter\Local\Requests\Review::class,
+        'request' => \Igniter\Local\Http\Requests\ReviewRequest::class,
         'create' => [
             'title' => 'lang:admin::lang.form.create_title',
             'redirect' => 'igniter/local/reviews/edit/{review_id}',
diff --git a/src/Requests/LocationAreaRequest.php b/src/Http/Requests/LocationAreaRequest.php
similarity index 98%
rename from src/Requests/LocationAreaRequest.php
rename to src/Http/Requests/LocationAreaRequest.php
index 920a344..6af5928 100644
--- a/src/Requests/LocationAreaRequest.php
+++ b/src/Http/Requests/LocationAreaRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Igniter\Local\Requests;
+namespace Igniter\Local\Http\Requests;
 
 use Igniter\System\Classes\FormRequest;
 
diff --git a/src/Requests/LocationRequest.php b/src/Http/Requests/LocationRequest.php
similarity index 98%
rename from src/Requests/LocationRequest.php
rename to src/Http/Requests/LocationRequest.php
index fbcf19a..c80dbd6 100644
--- a/src/Requests/LocationRequest.php
+++ b/src/Http/Requests/LocationRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Igniter\Local\Requests;
+namespace Igniter\Local\Http\Requests;
 
 use Igniter\System\Classes\FormRequest;
 
diff --git a/src/Requests/Review.php b/src/Http/Requests/ReviewRequest.php
similarity index 95%
rename from src/Requests/Review.php
rename to src/Http/Requests/ReviewRequest.php
index b6a1760..c0c259c 100644
--- a/src/Requests/Review.php
+++ b/src/Http/Requests/ReviewRequest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Igniter\Local\Requests;
+namespace Igniter\Local\Http\Requests;
 
 use Igniter\System\Classes\FormRequest;
 
-class Review extends FormRequest
+class ReviewRequest extends FormRequest
 {
     public function attributes()
     {
diff --git a/src/Requests/WorkingHourRequest.php b/src/Http/Requests/WorkingHourRequest.php
similarity index 97%
rename from src/Requests/WorkingHourRequest.php
rename to src/Http/Requests/WorkingHourRequest.php
index 146ef59..2bc7acb 100644
--- a/src/Requests/WorkingHourRequest.php
+++ b/src/Http/Requests/WorkingHourRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Igniter\Local\Requests;
+namespace Igniter\Local\Http\Requests;
 
 use Igniter\System\Classes\FormRequest;
 
diff --git a/tests/Requests/LocationTest.php b/tests/Requests/LocationTest.php
index 0ac3b92..6047fb3 100644
--- a/tests/Requests/LocationTest.php
+++ b/tests/Requests/LocationTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Admin\Requests;
 
-use Igniter\Local\Requests\LocationRequest;
+use Igniter\Local\Http\Requests\LocationRequest;
 
 it('has required rule for location_name, location_email and ...', function() {
     expect('required')->toBeIn(array_get((new LocationRequest)->rules(), 'location_name'))