vikkio88 /
dsManager-php
@@ -9,74 +9,74 @@ |
||
| 9 | 9 | class Match extends DsManagerOrm |
| 10 | 10 | { |
| 11 | 11 | |
| 12 | - /** |
|
| 13 | - * @var string |
|
| 14 | - */ |
|
| 15 | - protected $table = 'matches'; |
|
| 12 | + /** |
|
| 13 | + * @var string |
|
| 14 | + */ |
|
| 15 | + protected $table = 'matches'; |
|
| 16 | 16 | |
| 17 | - /** |
|
| 18 | - * @var array |
|
| 19 | - */ |
|
| 20 | - protected $fillable = [ |
|
| 21 | - 'home_team_id', |
|
| 22 | - 'away_team_id', |
|
| 23 | - 'league_round_id' |
|
| 24 | - ]; |
|
| 17 | + /** |
|
| 18 | + * @var array |
|
| 19 | + */ |
|
| 20 | + protected $fillable = [ |
|
| 21 | + 'home_team_id', |
|
| 22 | + 'away_team_id', |
|
| 23 | + 'league_round_id' |
|
| 24 | + ]; |
|
| 25 | 25 | |
| 26 | - /** |
|
| 27 | - * @var array |
|
| 28 | - */ |
|
| 29 | - protected $hidden = [ |
|
| 30 | - 'home_team_id', |
|
| 31 | - 'away_team_id', |
|
| 32 | - 'created_at', |
|
| 33 | - 'updated_at', |
|
| 34 | - 'winner_id', |
|
| 35 | - 'loser_id', |
|
| 36 | - 'is_draw', |
|
| 37 | - ]; |
|
| 26 | + /** |
|
| 27 | + * @var array |
|
| 28 | + */ |
|
| 29 | + protected $hidden = [ |
|
| 30 | + 'home_team_id', |
|
| 31 | + 'away_team_id', |
|
| 32 | + 'created_at', |
|
| 33 | + 'updated_at', |
|
| 34 | + 'winner_id', |
|
| 35 | + 'loser_id', |
|
| 36 | + 'is_draw', |
|
| 37 | + ]; |
|
| 38 | 38 | |
| 39 | - /** |
|
| 40 | - * @var array |
|
| 41 | - */ |
|
| 42 | - protected $casts = [ |
|
| 43 | - 'simulated' => 'boolean' |
|
| 44 | - ]; |
|
| 39 | + /** |
|
| 40 | + * @var array |
|
| 41 | + */ |
|
| 42 | + protected $casts = [ |
|
| 43 | + 'simulated' => 'boolean' |
|
| 44 | + ]; |
|
| 45 | 45 | |
| 46 | - /** |
|
| 47 | - * @return \Illuminate\Database\Eloquent\Relations\BelongsTo |
|
| 48 | - */ |
|
| 49 | - public function homeTeam() |
|
| 50 | - { |
|
| 51 | - return $this->belongsTo(Team::class, 'home_team_id'); |
|
| 52 | - } |
|
| 46 | + /** |
|
| 47 | + * @return \Illuminate\Database\Eloquent\Relations\BelongsTo |
|
| 48 | + */ |
|
| 49 | + public function homeTeam() |
|
| 50 | + { |
|
| 51 | + return $this->belongsTo(Team::class, 'home_team_id'); |
|
| 52 | + } |
|
| 53 | 53 | |
| 54 | - /** |
|
| 55 | - * @return \Illuminate\Database\Eloquent\Relations\BelongsTo |
|
| 56 | - */ |
|
| 57 | - public function awayTeam() |
|
| 58 | - { |
|
| 59 | - return $this->belongsTo(Team::class, 'away_team_id'); |
|
| 60 | - } |
|
| 54 | + /** |
|
| 55 | + * @return \Illuminate\Database\Eloquent\Relations\BelongsTo |
|
| 56 | + */ |
|
| 57 | + public function awayTeam() |
|
| 58 | + { |
|
| 59 | + return $this->belongsTo(Team::class, 'away_team_id'); |
|
| 60 | + } |
|
| 61 | 61 | |
| 62 | - public function scopeTeams($query) |
|
| 63 | - { |
|
| 64 | - return $query->with( |
|
| 65 | - 'homeTeam', |
|
| 66 | - 'awayTeam' |
|
| 67 | - ); |
|
| 68 | - } |
|
| 62 | + public function scopeTeams($query) |
|
| 63 | + { |
|
| 64 | + return $query->with( |
|
| 65 | + 'homeTeam', |
|
| 66 | + 'awayTeam' |
|
| 67 | + ); |
|
| 68 | + } |
|
| 69 | 69 | |
| 70 | - public function scopeComplete($query) |
|
| 71 | - { |
|
| 72 | - return $query->with( |
|
| 73 | - 'homeTeam', |
|
| 74 | - 'homeTeam.roster', |
|
| 75 | - 'homeTeam.coach', |
|
| 76 | - 'awayTeam', |
|
| 77 | - 'awayTeam.roster', |
|
| 78 | - 'awayTeam.coach' |
|
| 79 | - ); |
|
| 80 | - } |
|
| 70 | + public function scopeComplete($query) |
|
| 71 | + { |
|
| 72 | + return $query->with( |
|
| 73 | + 'homeTeam', |
|
| 74 | + 'homeTeam.roster', |
|
| 75 | + 'homeTeam.coach', |
|
| 76 | + 'awayTeam', |
|
| 77 | + 'awayTeam.roster', |
|
| 78 | + 'awayTeam.coach' |
|
| 79 | + ); |
|
| 80 | + } |
|
| 81 | 81 | |
| 82 | 82 | } |
| 83 | 83 | \ No newline at end of file |
@@ -8,114 +8,114 @@ |
||
| 8 | 8 | */ |
| 9 | 9 | class Team extends DsManagerOrm |
| 10 | 10 | {
|
| 11 | - /** |
|
| 12 | - * |
|
| 13 | - */ |
|
| 14 | - const PLAYED_LIMIT = 5; |
|
| 15 | - /** |
|
| 16 | - * |
|
| 17 | - */ |
|
| 18 | - const FUTURE_LIMIT = 3; |
|
| 19 | - /** |
|
| 20 | - * @var string |
|
| 21 | - */ |
|
| 22 | - protected $table = 'teams'; |
|
| 11 | + /** |
|
| 12 | + * |
|
| 13 | + */ |
|
| 14 | + const PLAYED_LIMIT = 5; |
|
| 15 | + /** |
|
| 16 | + * |
|
| 17 | + */ |
|
| 18 | + const FUTURE_LIMIT = 3; |
|
| 19 | + /** |
|
| 20 | + * @var string |
|
| 21 | + */ |
|
| 22 | + protected $table = 'teams'; |
|
| 23 | 23 | |
| 24 | - /** |
|
| 25 | - * @var array |
|
| 26 | - */ |
|
| 27 | - protected $fillable = [ |
|
| 28 | - 'name', |
|
| 29 | - 'nationality' |
|
| 30 | - ]; |
|
| 24 | + /** |
|
| 25 | + * @var array |
|
| 26 | + */ |
|
| 27 | + protected $fillable = [ |
|
| 28 | + 'name', |
|
| 29 | + 'nationality' |
|
| 30 | + ]; |
|
| 31 | 31 | |
| 32 | - /** |
|
| 33 | - * @return \Illuminate\Database\Eloquent\Relations\HasMany |
|
| 34 | - */ |
|
| 35 | - public function roster() |
|
| 36 | - {
|
|
| 37 | - return $this->hasMany(Player::class); |
|
| 38 | - } |
|
| 32 | + /** |
|
| 33 | + * @return \Illuminate\Database\Eloquent\Relations\HasMany |
|
| 34 | + */ |
|
| 35 | + public function roster() |
|
| 36 | + {
|
|
| 37 | + return $this->hasMany(Player::class); |
|
| 38 | + } |
|
| 39 | 39 | |
| 40 | - /** |
|
| 41 | - * @return \Illuminate\Database\Eloquent\Relations\HasMany |
|
| 42 | - */ |
|
| 43 | - public function coach() |
|
| 44 | - {
|
|
| 45 | - return $this->hasOne(Coach::class); |
|
| 46 | - } |
|
| 40 | + /** |
|
| 41 | + * @return \Illuminate\Database\Eloquent\Relations\HasMany |
|
| 42 | + */ |
|
| 43 | + public function coach() |
|
| 44 | + {
|
|
| 45 | + return $this->hasOne(Coach::class); |
|
| 46 | + } |
|
| 47 | 47 | |
| 48 | - /** |
|
| 49 | - * @return mixed |
|
| 50 | - */ |
|
| 51 | - public function playedMatchesHome() |
|
| 52 | - {
|
|
| 53 | - return $this->hasMany( |
|
| 54 | - MatchResult::class, |
|
| 55 | - 'home_team_id' |
|
| 56 | - )->where('simulated', true)
|
|
| 57 | - ->orderBy('updated_at', 'DESC')
|
|
| 58 | - ->limit(self::PLAYED_LIMIT); |
|
| 59 | - } |
|
| 48 | + /** |
|
| 49 | + * @return mixed |
|
| 50 | + */ |
|
| 51 | + public function playedMatchesHome() |
|
| 52 | + {
|
|
| 53 | + return $this->hasMany( |
|
| 54 | + MatchResult::class, |
|
| 55 | + 'home_team_id' |
|
| 56 | + )->where('simulated', true)
|
|
| 57 | + ->orderBy('updated_at', 'DESC')
|
|
| 58 | + ->limit(self::PLAYED_LIMIT); |
|
| 59 | + } |
|
| 60 | 60 | |
| 61 | - /** |
|
| 62 | - * @return mixed |
|
| 63 | - */ |
|
| 64 | - public function futureMatchesHome() |
|
| 65 | - {
|
|
| 66 | - return $this->hasMany( |
|
| 67 | - MatchResult::class, |
|
| 68 | - 'home_team_id' |
|
| 69 | - )->where('simulated', false)
|
|
| 70 | - ->orderBy('updated_at', 'DESC')
|
|
| 71 | - ->limit(self::FUTURE_LIMIT); |
|
| 72 | - } |
|
| 61 | + /** |
|
| 62 | + * @return mixed |
|
| 63 | + */ |
|
| 64 | + public function futureMatchesHome() |
|
| 65 | + {
|
|
| 66 | + return $this->hasMany( |
|
| 67 | + MatchResult::class, |
|
| 68 | + 'home_team_id' |
|
| 69 | + )->where('simulated', false)
|
|
| 70 | + ->orderBy('updated_at', 'DESC')
|
|
| 71 | + ->limit(self::FUTURE_LIMIT); |
|
| 72 | + } |
|
| 73 | 73 | |
| 74 | - /** |
|
| 75 | - * @return mixed |
|
| 76 | - */ |
|
| 77 | - public function playedMatchesAway() |
|
| 78 | - {
|
|
| 79 | - return $this->hasMany( |
|
| 80 | - MatchResult::class, |
|
| 81 | - 'away_team_id' |
|
| 82 | - )->where('simulated', true)
|
|
| 83 | - ->orderBy('updated_at', 'DESC')
|
|
| 84 | - ->limit(self::PLAYED_LIMIT); |
|
| 85 | - } |
|
| 74 | + /** |
|
| 75 | + * @return mixed |
|
| 76 | + */ |
|
| 77 | + public function playedMatchesAway() |
|
| 78 | + {
|
|
| 79 | + return $this->hasMany( |
|
| 80 | + MatchResult::class, |
|
| 81 | + 'away_team_id' |
|
| 82 | + )->where('simulated', true)
|
|
| 83 | + ->orderBy('updated_at', 'DESC')
|
|
| 84 | + ->limit(self::PLAYED_LIMIT); |
|
| 85 | + } |
|
| 86 | 86 | |
| 87 | - /** |
|
| 88 | - * @return mixed |
|
| 89 | - */ |
|
| 90 | - public function futureMatchesAway() |
|
| 91 | - {
|
|
| 92 | - return $this->hasMany( |
|
| 93 | - MatchResult::class, |
|
| 94 | - 'away_team_id' |
|
| 95 | - )->where('simulated', false)
|
|
| 96 | - ->orderBy('updated_at', 'DESC')
|
|
| 97 | - ->limit(self::FUTURE_LIMIT); |
|
| 98 | - } |
|
| 87 | + /** |
|
| 88 | + * @return mixed |
|
| 89 | + */ |
|
| 90 | + public function futureMatchesAway() |
|
| 91 | + {
|
|
| 92 | + return $this->hasMany( |
|
| 93 | + MatchResult::class, |
|
| 94 | + 'away_team_id' |
|
| 95 | + )->where('simulated', false)
|
|
| 96 | + ->orderBy('updated_at', 'DESC')
|
|
| 97 | + ->limit(self::FUTURE_LIMIT); |
|
| 98 | + } |
|
| 99 | 99 | |
| 100 | 100 | |
| 101 | - /** |
|
| 102 | - * @param $query |
|
| 103 | - * @return mixed |
|
| 104 | - */ |
|
| 105 | - public function scopeComplete($query) |
|
| 106 | - {
|
|
| 107 | - return $query->with( |
|
| 108 | - 'roster', |
|
| 109 | - 'coach', |
|
| 110 | - 'playedMatchesHome', |
|
| 111 | - 'playedMatchesHome.awayTeam', |
|
| 112 | - 'futureMatchesHome', |
|
| 113 | - 'futureMatchesHome.awayTeam', |
|
| 114 | - 'playedMatchesAway', |
|
| 115 | - 'playedMatchesAway.homeTeam', |
|
| 116 | - 'futureMatchesAway', |
|
| 117 | - 'futureMatchesAway.homeTeam' |
|
| 118 | - ); |
|
| 119 | - } |
|
| 101 | + /** |
|
| 102 | + * @param $query |
|
| 103 | + * @return mixed |
|
| 104 | + */ |
|
| 105 | + public function scopeComplete($query) |
|
| 106 | + {
|
|
| 107 | + return $query->with( |
|
| 108 | + 'roster', |
|
| 109 | + 'coach', |
|
| 110 | + 'playedMatchesHome', |
|
| 111 | + 'playedMatchesHome.awayTeam', |
|
| 112 | + 'futureMatchesHome', |
|
| 113 | + 'futureMatchesHome.awayTeam', |
|
| 114 | + 'playedMatchesAway', |
|
| 115 | + 'playedMatchesAway.homeTeam', |
|
| 116 | + 'futureMatchesAway', |
|
| 117 | + 'futureMatchesAway.homeTeam' |
|
| 118 | + ); |
|
| 119 | + } |
|
| 120 | 120 | |
| 121 | 121 | } |
| 122 | 122 | \ No newline at end of file |
@@ -9,52 +9,52 @@ |
||
| 9 | 9 | class MatchPlayer extends DsManagerOrm |
| 10 | 10 | { |
| 11 | 11 | |
| 12 | - /** |
|
| 13 | - * @var string |
|
| 14 | - */ |
|
| 15 | - protected $table = 'match_players'; |
|
| 16 | - |
|
| 17 | - /** |
|
| 18 | - * @var array |
|
| 19 | - */ |
|
| 20 | - protected $fillable = [ |
|
| 21 | - 'match_id', |
|
| 22 | - 'team_id', |
|
| 23 | - 'player_id', |
|
| 24 | - 'goals', |
|
| 25 | - 'vote' |
|
| 26 | - ]; |
|
| 27 | - |
|
| 28 | - protected $casts = [ |
|
| 29 | - 'vote' => 'integer', |
|
| 30 | - 'goals' => 'integer' |
|
| 31 | - ]; |
|
| 32 | - |
|
| 33 | - /** |
|
| 34 | - * @return \Illuminate\Database\Eloquent\Relations\BelongsTo |
|
| 35 | - */ |
|
| 36 | - public function player() |
|
| 37 | - { |
|
| 38 | - return $this->belongsTo(Player::class, 'player_id'); |
|
| 39 | - } |
|
| 40 | - |
|
| 41 | - /** |
|
| 42 | - * @return \Illuminate\Database\Eloquent\Relations\BelongsTo |
|
| 43 | - */ |
|
| 44 | - public function team() |
|
| 45 | - { |
|
| 46 | - return $this->belongsTo(Team::class, 'team_id'); |
|
| 47 | - } |
|
| 48 | - |
|
| 49 | - /** |
|
| 50 | - * @param $query |
|
| 51 | - * @return mixed |
|
| 52 | - */ |
|
| 53 | - public function scopeComplete($query){ |
|
| 54 | - return $query->with( |
|
| 55 | - 'team', |
|
| 56 | - 'player' |
|
| 57 | - ); |
|
| 58 | - } |
|
| 12 | + /** |
|
| 13 | + * @var string |
|
| 14 | + */ |
|
| 15 | + protected $table = 'match_players'; |
|
| 16 | + |
|
| 17 | + /** |
|
| 18 | + * @var array |
|
| 19 | + */ |
|
| 20 | + protected $fillable = [ |
|
| 21 | + 'match_id', |
|
| 22 | + 'team_id', |
|
| 23 | + 'player_id', |
|
| 24 | + 'goals', |
|
| 25 | + 'vote' |
|
| 26 | + ]; |
|
| 27 | + |
|
| 28 | + protected $casts = [ |
|
| 29 | + 'vote' => 'integer', |
|
| 30 | + 'goals' => 'integer' |
|
| 31 | + ]; |
|
| 32 | + |
|
| 33 | + /** |
|
| 34 | + * @return \Illuminate\Database\Eloquent\Relations\BelongsTo |
|
| 35 | + */ |
|
| 36 | + public function player() |
|
| 37 | + { |
|
| 38 | + return $this->belongsTo(Player::class, 'player_id'); |
|
| 39 | + } |
|
| 40 | + |
|
| 41 | + /** |
|
| 42 | + * @return \Illuminate\Database\Eloquent\Relations\BelongsTo |
|
| 43 | + */ |
|
| 44 | + public function team() |
|
| 45 | + { |
|
| 46 | + return $this->belongsTo(Team::class, 'team_id'); |
|
| 47 | + } |
|
| 48 | + |
|
| 49 | + /** |
|
| 50 | + * @param $query |
|
| 51 | + * @return mixed |
|
| 52 | + */ |
|
| 53 | + public function scopeComplete($query){ |
|
| 54 | + return $query->with( |
|
| 55 | + 'team', |
|
| 56 | + 'player' |
|
| 57 | + ); |
|
| 58 | + } |
|
| 59 | 59 | |
| 60 | 60 | } |
| 61 | 61 | \ No newline at end of file |
@@ -10,139 +10,139 @@ |
||
| 10 | 10 | */ |
| 11 | 11 | class MatchResult extends Match |
| 12 | 12 | { |
| 13 | - /** |
|
| 14 | - * @var array |
|
| 15 | - */ |
|
| 16 | - protected $fillable = [ |
|
| 17 | - 'goal_home', |
|
| 18 | - 'goal_away', |
|
| 19 | - 'simulated', |
|
| 20 | - 'winner_id', |
|
| 21 | - 'loser_id', |
|
| 22 | - 'is_draw' |
|
| 23 | - ]; |
|
| 13 | + /** |
|
| 14 | + * @var array |
|
| 15 | + */ |
|
| 16 | + protected $fillable = [ |
|
| 17 | + 'goal_home', |
|
| 18 | + 'goal_away', |
|
| 19 | + 'simulated', |
|
| 20 | + 'winner_id', |
|
| 21 | + 'loser_id', |
|
| 22 | + 'is_draw' |
|
| 23 | + ]; |
|
| 24 | 24 | |
| 25 | - protected $hidden = [ |
|
| 26 | - 'home_team_id', |
|
| 27 | - 'away_team_id', |
|
| 28 | - 'winner_id', |
|
| 29 | - 'loser_id', |
|
| 30 | - 'is_draw', |
|
| 31 | - 'created_at', |
|
| 32 | - 'updated_at' |
|
| 33 | - ]; |
|
| 25 | + protected $hidden = [ |
|
| 26 | + 'home_team_id', |
|
| 27 | + 'away_team_id', |
|
| 28 | + 'winner_id', |
|
| 29 | + 'loser_id', |
|
| 30 | + 'is_draw', |
|
| 31 | + 'created_at', |
|
| 32 | + 'updated_at' |
|
| 33 | + ]; |
|
| 34 | 34 | |
| 35 | - /** |
|
| 36 | - * @var array |
|
| 37 | - */ |
|
| 38 | - protected $casts = [ |
|
| 39 | - 'simulated' => 'boolean' |
|
| 40 | - ]; |
|
| 35 | + /** |
|
| 36 | + * @var array |
|
| 37 | + */ |
|
| 38 | + protected $casts = [ |
|
| 39 | + 'simulated' => 'boolean' |
|
| 40 | + ]; |
|
| 41 | 41 | |
| 42 | - public static function resolveAttributes(array $attributes, $matchId) |
|
| 43 | - { |
|
| 44 | - self::generateAppearances( |
|
| 45 | - [ |
|
| 46 | - $attributes['home_team_id'], |
|
| 47 | - $attributes['away_team_id'] |
|
| 48 | - ], |
|
| 49 | - $matchId |
|
| 50 | - ); |
|
| 51 | - $attributes = self::setResult($attributes); |
|
| 52 | - if (array_key_exists('info', $attributes)) { |
|
| 53 | - if (array_key_exists('scorers', $attributes['info'])) { |
|
| 54 | - foreach ($attributes['info']['scorers']['home'] as $scorerHome) { |
|
| 55 | - self::addScorer($matchId, $attributes['home_team_id'], $scorerHome->id); |
|
| 56 | - } |
|
| 57 | - foreach ($attributes['info']['scorers']['away'] as $scorerAway) { |
|
| 58 | - self::addScorer($matchId, $attributes['away_team_id'], $scorerAway->id); |
|
| 59 | - } |
|
| 60 | - unset($attributes['info']['scorers']); |
|
| 61 | - } |
|
| 62 | - } |
|
| 63 | - unset($attributes['info']); |
|
| 64 | - return $attributes; |
|
| 65 | - } |
|
| 42 | + public static function resolveAttributes(array $attributes, $matchId) |
|
| 43 | + { |
|
| 44 | + self::generateAppearances( |
|
| 45 | + [ |
|
| 46 | + $attributes['home_team_id'], |
|
| 47 | + $attributes['away_team_id'] |
|
| 48 | + ], |
|
| 49 | + $matchId |
|
| 50 | + ); |
|
| 51 | + $attributes = self::setResult($attributes); |
|
| 52 | + if (array_key_exists('info', $attributes)) { |
|
| 53 | + if (array_key_exists('scorers', $attributes['info'])) { |
|
| 54 | + foreach ($attributes['info']['scorers']['home'] as $scorerHome) { |
|
| 55 | + self::addScorer($matchId, $attributes['home_team_id'], $scorerHome->id); |
|
| 56 | + } |
|
| 57 | + foreach ($attributes['info']['scorers']['away'] as $scorerAway) { |
|
| 58 | + self::addScorer($matchId, $attributes['away_team_id'], $scorerAway->id); |
|
| 59 | + } |
|
| 60 | + unset($attributes['info']['scorers']); |
|
| 61 | + } |
|
| 62 | + } |
|
| 63 | + unset($attributes['info']); |
|
| 64 | + return $attributes; |
|
| 65 | + } |
|
| 66 | 66 | |
| 67 | - private static function addScorer($matchId, $teamId, $playerId) |
|
| 68 | - { |
|
| 69 | - $scorer = MatchPlayer::where( |
|
| 70 | - [ |
|
| 71 | - 'match_id' => $matchId, |
|
| 72 | - 'team_id' => $teamId, |
|
| 73 | - 'player_id' => $playerId |
|
| 74 | - ] |
|
| 75 | - )->first(); |
|
| 76 | - if (!empty($scorer)) { |
|
| 77 | - $scorer->goals = $scorer->goals + 1; |
|
| 78 | - $scorer->vote = $scorer->vote <= 9 ? $scorer->vote + rand(0, 1) : $scorer->vote; |
|
| 79 | - $scorer->save(); |
|
| 80 | - } else { |
|
| 81 | - MatchPlayer::create( |
|
| 82 | - [ |
|
| 83 | - 'match_id' => $matchId, |
|
| 84 | - 'team_id' => $teamId, |
|
| 85 | - 'player_id' => $playerId, |
|
| 86 | - 'goals' => 1 |
|
| 87 | - ] |
|
| 88 | - ); |
|
| 89 | - } |
|
| 90 | - } |
|
| 67 | + private static function addScorer($matchId, $teamId, $playerId) |
|
| 68 | + { |
|
| 69 | + $scorer = MatchPlayer::where( |
|
| 70 | + [ |
|
| 71 | + 'match_id' => $matchId, |
|
| 72 | + 'team_id' => $teamId, |
|
| 73 | + 'player_id' => $playerId |
|
| 74 | + ] |
|
| 75 | + )->first(); |
|
| 76 | + if (!empty($scorer)) { |
|
| 77 | + $scorer->goals = $scorer->goals + 1; |
|
| 78 | + $scorer->vote = $scorer->vote <= 9 ? $scorer->vote + rand(0, 1) : $scorer->vote; |
|
| 79 | + $scorer->save(); |
|
| 80 | + } else { |
|
| 81 | + MatchPlayer::create( |
|
| 82 | + [ |
|
| 83 | + 'match_id' => $matchId, |
|
| 84 | + 'team_id' => $teamId, |
|
| 85 | + 'player_id' => $playerId, |
|
| 86 | + 'goals' => 1 |
|
| 87 | + ] |
|
| 88 | + ); |
|
| 89 | + } |
|
| 90 | + } |
|
| 91 | 91 | |
| 92 | - private static function generateAppearances( |
|
| 93 | - $teamIds, |
|
| 94 | - $matchId |
|
| 95 | - ) |
|
| 96 | - { |
|
| 97 | - foreach ($teamIds as $id) { |
|
| 98 | - $players = Player::where('team_id', $id)->get()->random(11); |
|
| 99 | - foreach ($players as $player) { |
|
| 100 | - MatchPlayer::create( |
|
| 101 | - [ |
|
| 102 | - 'match_id' => $matchId, |
|
| 103 | - 'team_id' => $id, |
|
| 104 | - 'player_id' => $player->id, |
|
| 105 | - 'vote' => Randomizer::voteFromSkill($player->skillAvg) |
|
| 106 | - ] |
|
| 107 | - ); |
|
| 108 | - } |
|
| 109 | - } |
|
| 110 | - } |
|
| 92 | + private static function generateAppearances( |
|
| 93 | + $teamIds, |
|
| 94 | + $matchId |
|
| 95 | + ) |
|
| 96 | + { |
|
| 97 | + foreach ($teamIds as $id) { |
|
| 98 | + $players = Player::where('team_id', $id)->get()->random(11); |
|
| 99 | + foreach ($players as $player) { |
|
| 100 | + MatchPlayer::create( |
|
| 101 | + [ |
|
| 102 | + 'match_id' => $matchId, |
|
| 103 | + 'team_id' => $id, |
|
| 104 | + 'player_id' => $player->id, |
|
| 105 | + 'vote' => Randomizer::voteFromSkill($player->skillAvg) |
|
| 106 | + ] |
|
| 107 | + ); |
|
| 108 | + } |
|
| 109 | + } |
|
| 110 | + } |
|
| 111 | 111 | |
| 112 | - private static function setResult($attributes) |
|
| 113 | - { |
|
| 114 | - $toExtract = [ |
|
| 115 | - 'winner_id' => 'winner_id', |
|
| 116 | - 'loser_id' => 'loser_id', |
|
| 117 | - 'is_draw' => 'is_draw' |
|
| 118 | - ]; |
|
| 119 | - if (array_key_exists('info', $attributes)) { |
|
| 120 | - foreach ($toExtract as $key => $attr) { |
|
| 121 | - $attributes[$attr] = $attributes['info'][$key]; |
|
| 122 | - unset($attributes['info'][$key]); |
|
| 123 | - } |
|
| 124 | - } |
|
| 125 | - return $attributes; |
|
| 126 | - } |
|
| 112 | + private static function setResult($attributes) |
|
| 113 | + { |
|
| 114 | + $toExtract = [ |
|
| 115 | + 'winner_id' => 'winner_id', |
|
| 116 | + 'loser_id' => 'loser_id', |
|
| 117 | + 'is_draw' => 'is_draw' |
|
| 118 | + ]; |
|
| 119 | + if (array_key_exists('info', $attributes)) { |
|
| 120 | + foreach ($toExtract as $key => $attr) { |
|
| 121 | + $attributes[$attr] = $attributes['info'][$key]; |
|
| 122 | + unset($attributes['info'][$key]); |
|
| 123 | + } |
|
| 124 | + } |
|
| 125 | + return $attributes; |
|
| 126 | + } |
|
| 127 | 127 | |
| 128 | - public function scorers() |
|
| 129 | - { |
|
| 130 | - return $this->belongsToMany( |
|
| 131 | - Player::class, |
|
| 132 | - 'match_players', |
|
| 133 | - 'match_id' |
|
| 134 | - )->withPivot( |
|
| 135 | - 'team_id', |
|
| 136 | - 'goals' |
|
| 137 | - )->where( |
|
| 138 | - 'goals', '>', 0 |
|
| 139 | - ); |
|
| 140 | - } |
|
| 128 | + public function scorers() |
|
| 129 | + { |
|
| 130 | + return $this->belongsToMany( |
|
| 131 | + Player::class, |
|
| 132 | + 'match_players', |
|
| 133 | + 'match_id' |
|
| 134 | + )->withPivot( |
|
| 135 | + 'team_id', |
|
| 136 | + 'goals' |
|
| 137 | + )->where( |
|
| 138 | + 'goals', '>', 0 |
|
| 139 | + ); |
|
| 140 | + } |
|
| 141 | 141 | |
| 142 | - public function scopeComplete($query) |
|
| 143 | - { |
|
| 144 | - return parent::scopeComplete($query)->with('scorers'); |
|
| 145 | - } |
|
| 142 | + public function scopeComplete($query) |
|
| 143 | + { |
|
| 144 | + return parent::scopeComplete($query)->with('scorers'); |
|
| 145 | + } |
|
| 146 | 146 | |
| 147 | 147 | |
| 148 | 148 | } |
| 149 | 149 | \ No newline at end of file |
@@ -5,27 +5,27 @@ |
||
| 5 | 5 | |
| 6 | 6 | class CreateMatchTable |
| 7 | 7 | { |
| 8 | - /** |
|
| 9 | - * Run the migrations. |
|
| 10 | - * |
|
| 11 | - * @return void |
|
| 12 | - */ |
|
| 13 | - public function run() |
|
| 14 | - { |
|
| 15 | - Capsule::schema()->dropIfExists('matches'); |
|
| 16 | - Capsule::schema()->create('matches', function (Blueprint $table) { |
|
| 17 | - $table->increments('id'); |
|
| 18 | - $table->integer('league_round_id')->nullable(); |
|
| 19 | - $table->integer('home_team_id'); |
|
| 20 | - $table->integer('goal_home')->default(0); |
|
| 21 | - $table->integer('away_team_id'); |
|
| 22 | - $table->integer('goal_away')->default(0); |
|
| 23 | - $table->boolean('is_draw')->default(false); |
|
| 24 | - $table->integer('winner_id')->default(null); |
|
| 25 | - $table->integer('loser_id')->default(null); |
|
| 26 | - $table->boolean('simulated')->default(false); |
|
| 27 | - $table->date('match_date')->default(\Carbon\Carbon::now()); |
|
| 28 | - $table->timestamps(); |
|
| 29 | - }); |
|
| 30 | - } |
|
| 8 | + /** |
|
| 9 | + * Run the migrations. |
|
| 10 | + * |
|
| 11 | + * @return void |
|
| 12 | + */ |
|
| 13 | + public function run() |
|
| 14 | + { |
|
| 15 | + Capsule::schema()->dropIfExists('matches'); |
|
| 16 | + Capsule::schema()->create('matches', function (Blueprint $table) { |
|
| 17 | + $table->increments('id'); |
|
| 18 | + $table->integer('league_round_id')->nullable(); |
|
| 19 | + $table->integer('home_team_id'); |
|
| 20 | + $table->integer('goal_home')->default(0); |
|
| 21 | + $table->integer('away_team_id'); |
|
| 22 | + $table->integer('goal_away')->default(0); |
|
| 23 | + $table->boolean('is_draw')->default(false); |
|
| 24 | + $table->integer('winner_id')->default(null); |
|
| 25 | + $table->integer('loser_id')->default(null); |
|
| 26 | + $table->boolean('simulated')->default(false); |
|
| 27 | + $table->date('match_date')->default(\Carbon\Carbon::now()); |
|
| 28 | + $table->timestamps(); |
|
| 29 | + }); |
|
| 30 | + } |
|
| 31 | 31 | } |
