Fix issue where role null never allowed a category to be created

ushahidi · Jun 17, 2020 · 48edfb6 · 48edfb6
1 parent 6891e3c
commit 48edfb6
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/v4/Http/Controllers/CategoryController.php b/v4/Http/Controllers/CategoryController.php
@@ -81,7 +81,7 @@ public function store(Request $request)
             return response()->json($category->errors, 422);
         }
 
-        $category = DB::transaction(function() use ($id, $input, $request, $category) {
+        $category = DB::transaction(function () use ($id, $input, $request, $category) {
             $category = Category::create(
                 array_merge(
                     $input,
@@ -160,7 +160,7 @@ public function update(int $id, Request $request)
         if (!$category->validate($input)) {
             return response()->json($category->errors, 422);
         }
-        $category = DB::transaction(function() use ($id, $input, $request, $category) {
+        $category = DB::transaction(function () use ($id, $input, $request, $category) {
             $category->update($request->input());
             $this->updateTranslations($request->input('translations'), $category->id, 'category');
             return $category;
@@ -209,7 +209,7 @@ public function delete(int $id, Request $request)
     {
         $category = Category::find($id);
         $this->authorize('delete', $category);
-        $success = DB::transaction(function() use ($id, $request, $category) {
+        $success = DB::transaction(function () use ($id, $request, $category) {
             $category->translations()->delete();
             $success = $category->delete();
             return $success;
@@ -227,6 +227,5 @@ public function delete(int $id, Request $request)
                 500
             );
         }
-
     }//end delete()
 }//end class
diff --git a/v4/Models/Category.php b/v4/Models/Category.php
@@ -7,6 +7,7 @@
 use Illuminate\Support\Facades\Validator;
 use Ushahidi\Core\Entity\Permission;
 use Illuminate\Support\Facades\Input;
+
 class Category extends Model
 {
     public $errors;
@@ -201,16 +202,15 @@ public function getRules()
                 'numeric'
              ],
              'role' => [
-                 Rule::exists('roles', 'name'),
-                 function($attribute, $value, $fail) {
-                     $has_parent = Input::get('parent_id'); // Retrieve status
+                    function ($attribute, $value, $fail) {
+                        $has_parent = Input::get('parent_id'); // Retrieve status
 
-                     $parent = $has_parent ? Category::find(Input::get('parent_id')) : null;
-                     // ... and check if the role matches its parent
-                     if ($parent && $parent->role != $value) {
-                         return $fail(trans('validation.child_parent_role_match'));
-                     }
-                 }
+                        $parent = $has_parent ? Category::find(Input::get('parent_id')) : null;
+                        // ... and check if the role matches its parent
+                        if ($parent && $parent->role != $value) {
+                            return $fail(trans('validation.child_parent_role_match'));
+                        }
+                    }
              ]
         ];
     }//end validationMessages()
@@ -367,6 +367,9 @@ public static function makeSlug($value)
     public function validate($data)
     {
         $v = Validator::make($data, $this->getRules(), self::validationMessages());
+        $v->sometimes('role', 'exists:roles,name', function ($input) {
+            return !!$input;
+        });
         // check for failure
         if (!$v->fails()) {
             return true;