Merge remote-tracking branch 'origin/feature/atricle_tags' into featu…

…re/atricle_tags
spira · Aug 21, 2015 · 623cf4e · 623cf4e
2 parents eaf1c93 + 760c0cc
commit 623cf4e
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 45 deletions.
diff --git a/api/app/Http/Controllers/ChildEntityController.php b/api/app/Http/Controllers/ChildEntityController.php
@@ -130,7 +130,7 @@ public function putOne(Request $request, $id, $childId)
         $this->checkEntityIdMatchesRoute($request, $childId, $this->getChildModel());
         $childModel = $this->findOrNewChildEntity($childId, $parent);
 
-        $this->validateRequest($request->all(), $this->addIdOverrideValidationRule($this->getValidationRules(), $childId));
+        $this->validateRequest($request->all(), $this->getValidationRules());
 
         $childModel->fill($request->all());
         $this->getRelation($parent)->save($childModel);
@@ -181,8 +181,7 @@ public function patchOne(Request $request, $id, $childId)
         $this->checkEntityIdMatchesRoute($request, $childId, $this->getChildModel(), false);
         $childModel = $this->findOrFailChildEntity($childId, $parent);
 
-        $validationRules = $this->addIdOverrideValidationRule($this->getValidationRules(), $childId);
-        $this->validateRequest($request->all(), $validationRules, true);
+        $this->validateRequest($request->all(), $this->getValidationRules(), true);
 
         $childModel->fill($request->all());
         $this->getRelation($parent)->save($childModel);
@@ -372,21 +371,4 @@ protected function getValidationRules()
     {
         return $this->getChildModel()->getValidationRules();
     }
-
-    /**
-     * @param $validationRules
-     * @param $id
-     * @return mixed
-     */
-    protected function addIdOverrideValidationRule($validationRules, $id)
-    {
-        $rule = 'equals:'.$id;
-        $keyName = $this->getChildModel()->getKeyName();
-        if (isset($validationRules[$keyName])) {
-            $rule='|'.$rule;
-        }
-
-        $validationRules[$keyName].= $rule;
-        return $validationRules;
-    }
 }
diff --git a/api/app/Http/Controllers/EntityController.php b/api/app/Http/Controllers/EntityController.php
@@ -113,8 +113,7 @@ public function putOne(Request $request, $id)
 
         $model = $this->findOrNewEntity($id);
 
-        $validationRules = $this->addIdOverrideValidationRule($this->getValidationRules(), $id);
-        $this->validateRequest($request->all(), $validationRules);
+        $this->validateRequest($request->all(), $this->getValidationRules());
 
         $model->fill($request->all())
             ->save();
@@ -161,8 +160,7 @@ public function patchOne(Request $request, $id)
 
         $model = $this->findOrFailEntity($id);
 
-        $validationRules = $this->addIdOverrideValidationRule($this->getValidationRules(), $id);
-        $this->validateRequest($request->all(), $validationRules, true);
+        $this->validateRequest($request->all(), $this->getValidationRules(), true);
 
         $model->fill($request->all());
         $model->save();
@@ -316,21 +314,4 @@ protected function getValidationRules()
     {
         return $this->getModel()->getValidationRules();
     }
-
-    /**
-     * @param $validationRules
-     * @param $id
-     * @return mixed
-     */
-    protected function addIdOverrideValidationRule($validationRules, $id)
-    {
-        $rule = 'equals:'.$id;
-        $keyName = $this->getModel()->getKeyName();
-        if (isset($validationRules[$keyName])) {
-            $rule='|'.$rule;
-        }
-
-        $validationRules[$keyName].= $rule;
-        return $validationRules;
-    }
 }
diff --git a/api/app/Http/Controllers/UserController.php b/api/app/Http/Controllers/UserController.php
@@ -158,8 +158,8 @@ public function patchOne(Request $request, $id)
                 $model->email = $email;
             }
         }
-        $validationRules = $this->addIdOverrideValidationRule($this->getValidationRules(), $id);
-        $this->validateRequest($request->except('email'), $validationRules, true);
+        $this->checkEntityIdMatchesRoute($request, $id, $this->getModel(), false);
+        $this->validateRequest($request->except('email'), $this->getValidationRules(), true);
         $model->fill($request->except('email'));
         $model->save();
 

diff --git a/api/resources/lang/en/validation.php b/api/resources/lang/en/validation.php
@@ -75,7 +75,6 @@
     "timezone"             => "The :attribute must be a valid zone.",
     'uuid'                 => "The :attribute must be an UUID string.",
     'float'                => "The :attribute must be a float.",
-    'equals'               => "The :attribute can not be changed.",
     'not_found'            => "The selected :attribute is invalid.",
     'country'              => 'The :attribute must be a valid country code.',
     'alpha_dash_space'     => 'The :attribute may only contain letters, numbers, dashes and spaces.',

diff --git a/api/tests/integration/UserTest.php b/api/tests/integration/UserTest.php
@@ -381,7 +381,7 @@ public function testPatchOneBySelfUserUUID()
             'HTTP_AUTHORIZATION' => 'Bearer '.$token
         ]);
 
-        $this->assertResponseStatus(422);
+        $this->assertResponseStatus(400);
     }
 
     public function testDeleteOneByAdminUser()