Consider request method when validating for required fields

Author: antoniozh

app/admin/requests/Location.php

@@ -31,17 +31,19 @@ public function attributes()
 
     public function rules()
     {
-        return [
-            'location_name' => ['sometimes', 'required', 'between:2,32'],
-            'location_email' => ['sometimes', 'required', 'email:filter', 'max:96'],
+        $method = Request::method();
+
+        $rules = [
+            'location_name' => ['between:2,32'],
+            'location_email' => ['email:filter', 'max:96'],
             'location_telephone' => ['sometimes'],
-            'location_address_1' => ['sometimes', 'required', 'between:2,128'],
+            'location_address_1' => ['between:2,128'],
             'location_address_2' => ['max:128'],
             'location_city' => ['max:128'],
             'location_state' => ['max:128'],
             'location_postcode' => ['max:10'],
-            'location_country_id' => ['sometimes', 'required', 'integer'],
-            'options.auto_lat_lng' => ['sometimes', 'required', 'boolean'],
+            'location_country_id' => ['integer'],
+            'options.auto_lat_lng' => ['boolean'],
             'location_lat' => ['sometimes', 'numeric'],
             'location_lng' => ['sometimes', 'numeric'],
             'description' => ['max:3028'],
@@ -50,5 +52,15 @@ public function rules()
             'gallery.title' => ['max:128'],
             'gallery.description' => ['max:255'],
         ];
+
+        if ($method == 'post') {
+            $rules['location_name'][] = 'required';
+            $rules['location_email'][] = 'required';
+            $rules['options.auto_lat_lng'][] = 'required';
+            $rules['location_lng'][] = 'required';
+            $rules['location_country_id'][] = 'required';
+        }
+
+        return $rules;
     }
 }

app/admin/requests/Menu.php

@@ -26,19 +26,31 @@ public function attributes()
 
     public function rules()
     {
-        return [
-            'menu_name' => ['required', 'between:2,255'],
+        $method = Request::method();
+
+        $rules = [
+            'menu_name' => ['between:2,255'],
             'menu_description' => ['between:2,1028'],
-            'menu_price' => ['required', 'numeric', 'min:0'],
-            'categories.*' => ['sometimes', 'required', 'integer'],
+            'menu_price' => ['numeric', 'min:0'],
+            'categories.*' => ['sometimes', 'integer'],
             'locations.*' => ['integer'],
             'stock_qty' => ['nullable', 'integer'],
-            'minimum_qty' => ['sometimes', 'required', 'integer', 'min:1'],
-            'subtract_stock' => ['sometimes', 'required', 'boolean'],
+            'minimum_qty' => ['sometimes', 'integer', 'min:1'],
+            'subtract_stock' => ['sometimes', 'boolean'],
             'order_restriction.*' => ['nullable', 'string'],
             'menu_status' => ['boolean'],
             'mealtime_id' => ['nullable', 'integer'],
             'menu_priority' => ['min:0', 'integer'],
         ];
+
+        if ($method == 'post') {
+            $rules['menu_name'][] = 'required';
+            $rules['menu_price'][] = 'required';
+            $rules['categories.*'][] = 'required';
+            $rules['minimum_qty'][] = 'required';
+            $rules['subtract_stock'][] = 'required';
+        }
+
+        return $rules;
     }
 }

app/admin/requests/Reservation.php

@@ -22,16 +22,29 @@ public function attributes()
 
     public function rules()
     {
+        $method = Request::method();
+
         return [
-            'location_id' => ['sometimes', 'required', 'integer'],
-            'first_name' => ['required', 'between:1,48'],
-            'last_name' => ['required', 'between:1,48'],
+            'location_id' => ['integer'],
+            'first_name' => ['between:1,48'],
+            'last_name' => ['between:1,48'],
             'email' => ['email:filter', 'max:96'],
             'telephone' => ['sometimes'],
-            'reserve_date' => ['required', 'valid_date'],
-            'reserve_time' => ['required', 'valid_time'],
-            'guest_num' => ['required', 'integer', 'min:1'],
+            'reserve_date' => ['valid_date'],
+            'reserve_time' => ['valid_time'],
+            'guest_num' => ['integer', 'min:1'],
             'duration' => ['integer', 'min:1'],
         ];
+
+        if ($method == 'post') {
+            $rules['location_id'][] = 'required';
+            $rules['first_name'][] = 'required';
+            $rules['last_name'][] = 'required';
+            $rules['reserve_date'][] = 'required';
+            $rules['reserve_time'][] = 'required';
+            $rules['guest_num'][] = 'required';
+        }
+
+        return $rules;
     }
 }