remove unique on update #214

This commit is contained in:
Nabeel Shahzad
2018-03-21 12:35:06 -05:00
parent dad44db0bc
commit 95a7365fee
6 changed files with 29 additions and 23 deletions

View File

@@ -5,18 +5,29 @@ namespace App\Http\Requests;
use App\Models\Airport; use App\Models\Airport;
use Illuminate\Foundation\Http\FormRequest; use Illuminate\Foundation\Http\FormRequest;
/**
* Class CreateAirportRequest
* @package App\Http\Requests
*/
class CreateAirportRequest extends FormRequest class CreateAirportRequest extends FormRequest
{ {
public function authorize() /**
* Determine if the user is authorized to make this request.
* @return bool
*/
public function authorize(): bool
{ {
return true; return true;
} }
public function rules() /**
* Get the validation rules that apply to the request.
* @return array
*/
public function rules(): array
{ {
$rules = Airport::$rules; $rules = Airport::$rules;
$rules['icao'] .= '|unique:airports'; $rules['icao'] .= '|unique:airports';
return $rules; return $rules;
} }
} }

View File

@@ -9,21 +9,21 @@ class CreateFareRequest extends FormRequest
{ {
/** /**
* Determine if the user is authorized to make this request. * Determine if the user is authorized to make this request.
*
* @return bool * @return bool
*/ */
public function authorize() public function authorize(): bool
{ {
return true; return true;
} }
/** /**
* Get the validation rules that apply to the request. * Get the validation rules that apply to the request.
*
* @return array * @return array
*/ */
public function rules() public function rules(): array
{ {
return Fare::$rules; $rules = Fare::$rules;
$rules['code'] .= '|unique:fares';
return $rules;
} }
} }

View File

@@ -9,21 +9,21 @@ class CreateSubfleetRequest extends FormRequest
{ {
/** /**
* Determine if the user is authorized to make this request. * Determine if the user is authorized to make this request.
*
* @return bool * @return bool
*/ */
public function authorize() public function authorize(): bool
{ {
return true; return true;
} }
/** /**
* Get the validation rules that apply to the request. * Get the validation rules that apply to the request.
*
* @return array * @return array
*/ */
public function rules() public function rules(): array
{ {
return Subfleet::$rules; $rules = Subfleet::$rules;
$rules['type'] .= '|unique:subfleets';
return $rules;
} }
} }

View File

@@ -9,24 +9,21 @@ class CreateUserRequest extends FormRequest
{ {
/** /**
* Determine if the user is authorized to make this request. * Determine if the user is authorized to make this request.
*
* @return bool * @return bool
*/ */
public function authorize() public function authorize(): bool
{ {
return true; return true;
} }
/** /**
* Get the validation rules that apply to the request. * Get the validation rules that apply to the request.
*
* @return array * @return array
*/ */
public function rules() public function rules(): array
{ {
$rules = User::$rules; $rules = User::$rules;
$rules['email'] .= '|unique:users,email'; $rules['email'] .= '|unique:users,email';
return $rules; return $rules;
} }
} }

View File

@@ -33,7 +33,7 @@ class Fare extends Model
]; ];
public static $rules = [ public static $rules = [
'code' => 'required|unique:fares', 'code' => 'required',
'name' => 'required', 'name' => 'required',
]; ];

View File

@@ -40,7 +40,7 @@ class Subfleet extends Model
]; ];
public static $rules = [ public static $rules = [
'type' => 'required|unique:subfleets', 'type' => 'required',
'name' => 'required', 'name' => 'required',
'ground_handling_multiplier' => 'nullable|numeric', 'ground_handling_multiplier' => 'nullable|numeric',
]; ];
@@ -50,9 +50,7 @@ class Subfleet extends Model
*/ */
public function setTypeAttribute($type) public function setTypeAttribute($type)
{ {
$type = str_replace(' ', '-', $type); $type = str_replace([' ', ','], array('-', ''), $type);
$type = str_replace(',', '', $type);
$this->attributes['type'] = $type; $this->attributes['type'] = $type;
} }