[L6] Update even more areas of codebase using custom model validation logic

DaneEveritt · DaneEveritt · commit 0d6cf543147f · 2019-09-04T22:26:28.000-07:00
diff --git a/app/Http/Requests/Admin/Api/StoreApplicationApiKeyRequest.php b/app/Http/Requests/Admin/Api/StoreApplicationApiKeyRequest.php
@@ -15,7 +15,7 @@ class StoreApplicationApiKeyRequest extends AdminFormRequest
      */
     public function rules()
     {
-        $modelRules = ApiKey::getCreateRules();
+        $modelRules = ApiKey::getRules();
 
         return collect(AdminAcl::getResourceList())->mapWithKeys(function ($resource) use ($modelRules) {
             return [AdminAcl::COLUMN_IDENTIFIER . $resource => $modelRules['r_' . $resource]];
diff --git a/app/Http/Requests/Admin/DatabaseHostFormRequest.php b/app/Http/Requests/Admin/DatabaseHostFormRequest.php
@@ -12,10 +12,10 @@ class DatabaseHostFormRequest extends AdminFormRequest
     public function rules()
     {
         if ($this->method() !== 'POST') {
-            return DatabaseHost::getUpdateRulesForId($this->route()->parameter('host'));
+            return DatabaseHost::getRulesForUpdate($this->route()->parameter('host'));
         }
 
-        return DatabaseHost::getCreateRules();
+        return DatabaseHost::getRules();
     }
 
     /**
diff --git a/app/Http/Requests/Admin/LocationFormRequest.php b/app/Http/Requests/Admin/LocationFormRequest.php
@@ -21,9 +21,9 @@ class LocationFormRequest extends AdminFormRequest
     public function rules()
     {
         if ($this->method() === 'PATCH') {
-            return Location::getUpdateRulesForId($this->route()->parameter('location')->id);
+            return Location::getRulesForUpdate($this->route()->parameter('location')->id);
         }
 
-        return Location::getCreateRules();
+        return Location::getRules();
     }
 }
diff --git a/app/Http/Requests/Admin/Node/NodeFormRequest.php b/app/Http/Requests/Admin/Node/NodeFormRequest.php
@@ -20,10 +20,10 @@ class NodeFormRequest extends AdminFormRequest
     public function rules()
     {
         if ($this->method() === 'PATCH') {
-            return Node::getUpdateRulesForId($this->route()->parameter('node')->id);
+            return Node::getRulesForUpdate($this->route()->parameter('node'));
         }
 
-        return Node::getCreateRules();
+        return Node::getRules();
     }
 
     /**
diff --git a/app/Http/Requests/Admin/PackFormRequest.php b/app/Http/Requests/Admin/PackFormRequest.php
@@ -20,10 +20,10 @@ class PackFormRequest extends AdminFormRequest
     public function rules()
     {
         if ($this->method() === 'PATCH') {
-            return Pack::getUpdateRulesForId($this->route()->parameter('pack')->id);
+            return Pack::getRulesForUpdate($this->route()->parameter('pack')->id);
         }
 
-        return Pack::getCreateRules();
+        return Pack::getRules();
     }
 
     /**
diff --git a/app/Http/Requests/Admin/ServerFormRequest.php b/app/Http/Requests/Admin/ServerFormRequest.php
@@ -21,7 +21,7 @@ class ServerFormRequest extends AdminFormRequest
      */
     public function rules()
     {
-        $rules = Server::getCreateRules();
+        $rules = Server::getRules();
         $rules['description'][] = 'nullable';
 
         return $rules;
diff --git a/app/Http/Requests/Admin/UserFormRequest.php b/app/Http/Requests/Admin/UserFormRequest.php
@@ -12,9 +12,9 @@ class UserFormRequest extends AdminFormRequest
      */
     public function rules()
     {
-        $rules = collect(User::getCreateRules());
+        $rules = collect(User::getRules());
         if ($this->method() === 'PATCH') {
-            $rules = collect(User::getUpdateRulesForId($this->route()->parameter('user')->id))->merge([
+            $rules = collect(User::getRulesForUpdate($this->route()->parameter('user')))->merge([
                 'ignore_connection_error' => ['sometimes', 'nullable', 'boolean'],
             ]);
         }
diff --git a/app/Http/Requests/Api/Application/Locations/StoreLocationRequest.php b/app/Http/Requests/Api/Application/Locations/StoreLocationRequest.php
@@ -25,7 +25,7 @@ class StoreLocationRequest extends ApplicationApiRequest
      */
     public function rules(): array
     {
-        return collect(Location::getCreateRules())->only([
+        return collect(Location::getRules())->only([
             'long',
             'short',
         ])->toArray();
diff --git a/app/Http/Requests/Api/Application/Locations/UpdateLocationRequest.php b/app/Http/Requests/Api/Application/Locations/UpdateLocationRequest.php
@@ -27,7 +27,7 @@ public function rules(): array
     {
         $locationId = $this->route()->parameter('location')->id;
 
-        return collect(Location::getUpdateRulesForId($locationId))->only([
+        return collect(Location::getRulesForUpdate($locationId))->only([
             'short',
             'long',
         ])->toArray();
diff --git a/app/Http/Requests/Api/Application/Nodes/StoreNodeRequest.php b/app/Http/Requests/Api/Application/Nodes/StoreNodeRequest.php
@@ -26,7 +26,7 @@ class StoreNodeRequest extends ApplicationApiRequest
      */
     public function rules(array $rules = null): array
     {
-        return collect($rules ?? Node::getCreateRules())->only([
+        return collect($rules ?? Node::getRules())->only([
             'public',
             'name',
             'location_id',
diff --git a/app/Http/Requests/Api/Application/Nodes/UpdateNodeRequest.php b/app/Http/Requests/Api/Application/Nodes/UpdateNodeRequest.php
@@ -17,6 +17,6 @@ public function rules(array $rules = null): array
     {
         $nodeId = $this->getModel(Node::class)->id;
 
-        return parent::rules(Node::getUpdateRulesForId($nodeId));
+        return parent::rules(Node::getRulesForUpdate($nodeId));
     }
 }
diff --git a/app/Http/Requests/Api/Application/Servers/StoreServerRequest.php b/app/Http/Requests/Api/Application/Servers/StoreServerRequest.php
@@ -28,7 +28,7 @@ class StoreServerRequest extends ApplicationApiRequest
      */
     public function rules(): array
     {
-        $rules = Server::getCreateRules();
+        $rules = Server::getRules();
 
         return [
             'external_id' => $rules['external_id'],
diff --git a/app/Http/Requests/Api/Application/Servers/UpdateServerBuildConfigurationRequest.php b/app/Http/Requests/Api/Application/Servers/UpdateServerBuildConfigurationRequest.php
@@ -14,7 +14,7 @@ class UpdateServerBuildConfigurationRequest extends ServerWriteRequest
      */
     public function rules(): array
     {
-        $rules = Server::getUpdateRulesForId($this->getModel(Server::class)->id);
+        $rules = Server::getRulesForUpdate($this->getModel(Server::class));
 
         return [
             'allocation' => $rules['allocation_id'],
diff --git a/app/Http/Requests/Api/Application/Servers/UpdateServerDetailsRequest.php b/app/Http/Requests/Api/Application/Servers/UpdateServerDetailsRequest.php
@@ -13,7 +13,7 @@ class UpdateServerDetailsRequest extends ServerWriteRequest
      */
     public function rules(): array
     {
-        $rules = Server::getUpdateRulesForId($this->getModel(Server::class)->id);
+        $rules = Server::getRulesForUpdate($this->getModel(Server::class));
 
         return [
             'external_id' => $rules['external_id'],
diff --git a/app/Http/Requests/Api/Application/Servers/UpdateServerStartupRequest.php b/app/Http/Requests/Api/Application/Servers/UpdateServerStartupRequest.php
@@ -25,7 +25,7 @@ class UpdateServerStartupRequest extends ApplicationApiRequest
      */
     public function rules(): array
     {
-        $data = Server::getUpdateRulesForId($this->getModel(Server::class)->id);
+        $data = Server::getRulesForUpdate($this->getModel(Server::class));
 
         return [
             'startup' => $data['startup'],
diff --git a/app/Http/Requests/Api/Application/Users/StoreUserRequest.php b/app/Http/Requests/Api/Application/Users/StoreUserRequest.php
@@ -26,7 +26,7 @@ class StoreUserRequest extends ApplicationApiRequest
      */
     public function rules(array $rules = null): array
     {
-        $rules = $rules ?? User::getCreateRules();
+        $rules = $rules ?? User::getRules();
 
         $response = collect($rules)->only([
             'external_id',
diff --git a/app/Http/Requests/Api/Application/Users/UpdateUserRequest.php b/app/Http/Requests/Api/Application/Users/UpdateUserRequest.php
@@ -16,6 +16,6 @@ public function rules(array $rules = null): array
     {
         $userId = $this->getModel(User::class)->id;
 
-        return parent::rules(User::getUpdateRulesForId($userId));
+        return parent::rules(User::getRulesForUpdate($userId));
     }
 }
diff --git a/app/Http/Requests/Api/Client/Account/UpdateEmailRequest.php b/app/Http/Requests/Api/Client/Account/UpdateEmailRequest.php
@@ -32,7 +32,7 @@ public function authorize(): bool
      */
     public function rules(): array
     {
-        $rules = User::getUpdateRulesForId($this->user()->id);
+        $rules = User::getRulesForUpdate($this->user());
 
         return ['email' => $rules['email']];
     }
diff --git a/app/Http/Requests/Api/Client/Account/UpdatePasswordRequest.php b/app/Http/Requests/Api/Client/Account/UpdatePasswordRequest.php
@@ -32,7 +32,7 @@ public function authorize(): bool
      */
     public function rules(): array
     {
-        $rules = User::getUpdateRulesForId($this->user()->id);
+        $rules = User::getRulesForUpdate($this->user());
 
         return ['password' => array_merge($rules['password'], ['confirmed'])];
     }
diff --git a/app/Http/Requests/Base/AccountDataFormRequest.php b/app/Http/Requests/Base/AccountDataFormRequest.php
@@ -40,7 +40,7 @@ public function authorize()
      */
     public function rules()
     {
-        $modelRules = User::getUpdateRulesForId($this->user()->id);
+        $modelRules = User::getRulesForUpdate($this->user());
 
         switch ($this->input('do_action')) {
             case 'email':
diff --git a/app/Http/Requests/Server/Settings/ChangeServerNameRequest.php b/app/Http/Requests/Server/Settings/ChangeServerNameRequest.php
@@ -25,7 +25,7 @@ protected function permission(): string
     public function rules()
     {
         return [
-            'name' => Server::getCreateRules()['name'],
+            'name' => Server::getRules()['name'],
         ];
     }
 }
diff --git a/app/Models/User.php b/app/Models/User.php
@@ -144,8 +144,10 @@ class User extends Validable implements
      * Implement language verification by overriding Eloquence's gather
      * rules function.
      */
-    protected static function gatherRules()
+    public static function getRules()
     {
+        $rules = self::getRules();
+
         $rules['language'][] = new In(array_keys((new self)->getAvailableLanguages()));
         $rules['username'][] = new Username;
 
diff --git a/app/Models/Validable.php b/app/Models/Validable.php
@@ -79,14 +79,24 @@ public function getValidator()
     }
 
     /**
+     * Returns the rules associated with this model.
+     *
      * @return array
      */
     public static function getRules()
     {
-        return static::$validationRules;
+        $rules = static::$validationRules;
+        foreach ($rules as $key => &$rule) {
+            $rule = is_array($rule) ? $rule : explode('|', $rule);
+        }
+
+        return $rules;
     }
 
     /**
+     * Returns the rules associated with the model, specifically for updating the given model
+     * rather than just creating it.
+     *
      * @param \Illuminate\Database\Eloquent\Model|int|string $id
      * @param string                                         $primaryKey
      * @return array
@@ -98,17 +108,13 @@ public static function getRulesForUpdate($id, string $primaryKey = 'id')
         }
 
         $rules = static::getRules();
-        foreach ($rules as $key => &$rule) {
-            $rule = is_array($rule) ? $rule : explode('|', $rule);
-        }
-
         foreach ($rules as $key => &$data) {
             // For each rule in a given field, iterate over it and confirm if the rule
             // is one for a unique field. If that is the case, append the ID of the current
             // working model so we don't run into errors due to the way that field validation
             // works.
             foreach ($data as &$datum) {
-                if (! Str::startsWith($datum, 'unique')) {
+                if (! is_string($datum) || ! Str::startsWith($datum, 'unique')) {
                     continue;
                 }
 

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ class StoreApplicationApiKeyRequest extends AdminFormRequest`
`15`	`15`	`*/`
`16`	`16`	`public function rules()`
`17`	`17`	`{`
`18`		`- $modelRules = ApiKey::getCreateRules();`
	`18`	`+ $modelRules = ApiKey::getRules();`
`19`	`19`
`20`	`20`	`return collect(AdminAcl::getResourceList())->mapWithKeys(function ($resource) use ($modelRules) {`
`21`	`21`	`return [AdminAcl::COLUMN_IDENTIFIER . $resource => $modelRules['r_' . $resource]];`
Original file line number	Diff line number	Diff line change
`@@ -12,10 +12,10 @@ class DatabaseHostFormRequest extends AdminFormRequest`
`12`	`12`	`public function rules()`
`13`	`13`	`{`
`14`	`14`	`if ($this->method() !== 'POST') {`
`15`		`- return DatabaseHost::getUpdateRulesForId($this->route()->parameter('host'));`
	`15`	`+ return DatabaseHost::getRulesForUpdate($this->route()->parameter('host'));`
`16`	`16`	`}`
`17`	`17`
`18`		`- return DatabaseHost::getCreateRules();`
	`18`	`+ return DatabaseHost::getRules();`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,9 @@ class LocationFormRequest extends AdminFormRequest`
`21`	`21`	`public function rules()`
`22`	`22`	`{`
`23`	`23`	`if ($this->method() === 'PATCH') {`
`24`		`- return Location::getUpdateRulesForId($this->route()->parameter('location')->id);`
	`24`	`+ return Location::getRulesForUpdate($this->route()->parameter('location')->id);`
`25`	`25`	`}`
`26`	`26`
`27`		`- return Location::getCreateRules();`
	`27`	`+ return Location::getRules();`
`28`	`28`	`}`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,10 +20,10 @@ class NodeFormRequest extends AdminFormRequest`
`20`	`20`	`public function rules()`
`21`	`21`	`{`
`22`	`22`	`if ($this->method() === 'PATCH') {`
`23`		`- return Node::getUpdateRulesForId($this->route()->parameter('node')->id);`
	`23`	`+ return Node::getRulesForUpdate($this->route()->parameter('node'));`
`24`	`24`	`}`
`25`	`25`
`26`		`- return Node::getCreateRules();`
	`26`	`+ return Node::getRules();`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -20,10 +20,10 @@ class PackFormRequest extends AdminFormRequest`
`20`	`20`	`public function rules()`
`21`	`21`	`{`
`22`	`22`	`if ($this->method() === 'PATCH') {`
`23`		`- return Pack::getUpdateRulesForId($this->route()->parameter('pack')->id);`
	`23`	`+ return Pack::getRulesForUpdate($this->route()->parameter('pack')->id);`
`24`	`24`	`}`
`25`	`25`
`26`		`- return Pack::getCreateRules();`
	`26`	`+ return Pack::getRules();`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ class ServerFormRequest extends AdminFormRequest`
`21`	`21`	`*/`
`22`	`22`	`public function rules()`
`23`	`23`	`{`
`24`		`- $rules = Server::getCreateRules();`
	`24`	`+ $rules = Server::getRules();`
`25`	`25`	`$rules['description'][] = 'nullable';`
`26`	`26`
`27`	`27`	`return $rules;`
Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,9 @@ class UserFormRequest extends AdminFormRequest`
`12`	`12`	`*/`
`13`	`13`	`public function rules()`
`14`	`14`	`{`
`15`		`- $rules = collect(User::getCreateRules());`
	`15`	`+ $rules = collect(User::getRules());`
`16`	`16`	`if ($this->method() === 'PATCH') {`
`17`		`- $rules = collect(User::getUpdateRulesForId($this->route()->parameter('user')->id))->merge([`
	`17`	`+ $rules = collect(User::getRulesForUpdate($this->route()->parameter('user')))->merge([`
`18`	`18`	`'ignore_connection_error' => ['sometimes', 'nullable', 'boolean'],`
`19`	`19`	`]);`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ class StoreLocationRequest extends ApplicationApiRequest`
`25`	`25`	`*/`
`26`	`26`	`public function rules(): array`
`27`	`27`	`{`
`28`		`- return collect(Location::getCreateRules())->only([`
	`28`	`+ return collect(Location::getRules())->only([`
`29`	`29`	`'long',`
`30`	`30`	`'short',`
`31`	`31`	`])->toArray();`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public function rules(): array`
`27`	`27`	`{`
`28`	`28`	`$locationId = $this->route()->parameter('location')->id;`
`29`	`29`
`30`		`- return collect(Location::getUpdateRulesForId($locationId))->only([`
	`30`	`+ return collect(Location::getRulesForUpdate($locationId))->only([`
`31`	`31`	`'short',`
`32`	`32`	`'long',`
`33`	`33`	`])->toArray();`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ class StoreNodeRequest extends ApplicationApiRequest`
`26`	`26`	`*/`
`27`	`27`	`public function rules(array $rules = null): array`
`28`	`28`	`{`
`29`		`- return collect($rules ?? Node::getCreateRules())->only([`
	`29`	`+ return collect($rules ?? Node::getRules())->only([`
`30`	`30`	`'public',`
`31`	`31`	`'name',`
`32`	`32`	`'location_id',`