StarMC/Astral-nook
StarMC/Astral-nook
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Dane Everitt 2019-09-04 22:26:28 -07:00
parent c586157dc4
commit 0d6cf54314
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
23 changed files with 41 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Requests/Api/Application/Locations/StoreLocationRequest.php
View file

@ -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();

2
app/Http/Requests/Api/Application/Locations/UpdateLocationRequest.php
View file

@ -27,7 +27,7 @@ class UpdateLocationRequest extends StoreLocationRequest
{
$locationId = $this->route()->parameter('location')->id;
return collect(Location::getUpdateRulesForId($locationId))->only([
return collect(Location::getRulesForUpdate($locationId))->only([
'short',
'long',
])->toArray();

2
app/Http/Requests/Api/Application/Nodes/StoreNodeRequest.php
View file

@ -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',

2
app/Http/Requests/Api/Application/Nodes/UpdateNodeRequest.php
View file

@ -17,6 +17,6 @@ class UpdateNodeRequest extends StoreNodeRequest
{
$nodeId = $this->getModel(Node::class)->id;
return parent::rules(Node::getUpdateRulesForId($nodeId));
return parent::rules(Node::getRulesForUpdate($nodeId));
}
}

2
app/Http/Requests/Api/Application/Servers/StoreServerRequest.php
View file

@ -28,7 +28,7 @@ class StoreServerRequest extends ApplicationApiRequest
*/
public function rules(): array
{
$rules = Server::getCreateRules();
$rules = Server::getRules();
return [
'external_id' => $rules['external_id'],

2
app/Http/Requests/Api/Application/Servers/UpdateServerBuildConfigurationRequest.php
View file

@ -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'],

2
app/Http/Requests/Api/Application/Servers/UpdateServerDetailsRequest.php
View file

@ -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'],

2
app/Http/Requests/Api/Application/Servers/UpdateServerStartupRequest.php
View file

@ -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'],

2
app/Http/Requests/Api/Application/Users/StoreUserRequest.php
View file

@ -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',

2
app/Http/Requests/Api/Application/Users/UpdateUserRequest.php
View file

@ -16,6 +16,6 @@ class UpdateUserRequest extends StoreUserRequest
{
$userId = $this->getModel(User::class)->id;
return parent::rules(User::getUpdateRulesForId($userId));
return parent::rules(User::getRulesForUpdate($userId));
}
}