FGFS-4.1/phpvms
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add more API resources; user bid management and tests #35 #36

Browse Source
This commit is contained in:
Nabeel Shahzad
2017-12-12 16:58:27 -06:00
parent 5b25a464ba
commit 248a8d1488
27 changed files with 470 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

103
app/Models/User.php
View File

@@ -9,69 +9,41 @@ use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Contracts\Auth\CanResetPassword;
/**
* App\User
*
* @property integer
* $id
* @property string
* $name
* @property string
* $email
* @property string
* $password
* @property string
* $remember_token
* @property \Carbon\Carbon
* $created_at
* @property \Carbon\Carbon
* $updated_at
* @property-read \Illuminate\Notifications\DatabaseNotificationCollection|\Illuminate\Notifications\DatabaseNotification[]
* $notifications
* @property-read \Illuminate\Notifications\DatabaseNotificationCollection|\Illuminate\Notifications\DatabaseNotification[]
* $unreadNotifications
* @method static \Illuminate\Database\Query\Builder|\App\Models\User
* whereId($value)
* @method static \Illuminate\Database\Query\Builder|\App\Models\User
* whereName($value)
* @method static \Illuminate\Database\Query\Builder|\App\Models\User
* whereEmail($value)
* @method static \Illuminate\Database\Query\Builder|\App\Models\User
* wherePassword($value)
* @method static \Illuminate\Database\Query\Builder|\App\Models\User
* whereRememberToken($value)
* @method static \Illuminate\Database\Query\Builder|\App\Models\User
* whereCreatedAt($value)
* @method static \Illuminate\Database\Query\Builder|\App\Models\User
* whereUpdatedAt($value)
* @mixin \Eloquent
* @property integer $id
* @property string $name
* @property string $email
* @property string $password
* @property string $api_key
* @property string $flights
* @property string $flight_time
* @property string $remember_token
* @property \Carbon\Carbon $created_at
* @property \Carbon\Carbon $updated_at
* @mixin \Illuminate\Notifications\Notifiable
* @mixin \Zizaco\Entrust\Traits\EntrustUserTrait
*/
class User extends Authenticatable
{
use Notifiable;
use EntrustUserTrait;
//use SoftDeletes;
/**
* The attributes that are mass assignable.
*
* @var array
*/
protected $fillable
= [
'name',
'email',
'password',
'airline_id',
'home_airport_id',
'curr_airport_id',
'rank_id',
'timezone',
'active',
];
public $table = 'users';
protected $fillable = [
'name',
'email',
'password',
'airline_id',
'home_airport_id',
'curr_airport_id',
'rank_id',
'timezone',
'active',
];
/**
* The attributes that should be hidden for arrays.
*
* @var array
*/
protected $hidden = [
'password',
@@ -84,32 +56,13 @@ class User extends Authenticatable
'balance' => 'double',
];
/**
* Validation rules
*
* @var array
*/
public static $rules = [
];
/**
* Returns a 40 character API key that a user can use
* @return string
*/
public static function generateApiKey()
{
$key = sha1(time() . mt_rand());
return $key;
}
public function getPilotIdAttribute($value)
{
$length = setting('pilots.id_length');
return $this->airline->icao . str_pad($this->id, $length, '0', STR_PAD_LEFT);
}
public function gravatar()
public function getGravatarAttribute($value)
{
$size = 80;
$default = 'https://en.gravatar.com/userimage/12856995/7c7c1da6387853fea65ff74983055386.png';
@@ -136,7 +89,7 @@ class User extends Authenticatable
return $this->belongsTo('App\Models\Airport', 'curr_airport_id');
}
public function flights()
public function bids()
{
return $this->hasMany('App\Models\UserBid', 'user_id');
}