vikkio88 / dsManager-php

api/database/migrations/CreateTeamTable.php

Indentation +15 added lines, -15 removed lines

@@ -5,19 +5,19 @@
 

 class CreateTeamTable

 {

-    /**

-     * Run the migrations.

-     *

-     * @return void

-     */

-    public function run()

-    {

-        Capsule::schema()->dropIfExists('teams');

-        Capsule::schema()->create('teams', function (Blueprint $table) {

-            $table->increments('id');

-            $table->string('name');

-            $table->string('nationality',2);

-            $table->timestamps();

-        });

-    }

+	/**

+	 * Run the migrations.

+	 *

+	 * @return void

+	 */

+	public function run()

+	{

+		Capsule::schema()->dropIfExists('teams');

+		Capsule::schema()->create('teams', function (Blueprint $table) {

+			$table->increments('id');

+			$table->string('name');

+			$table->string('nationality',2);

+			$table->timestamps();

+		});

+	}

 }

api/database/migrations/CreateCoachesTable.php

Indentation +30 added lines, -30 removed lines

@@ -5,35 +5,35 @@
 

 class CreateCoachesTable

 {

-    /**

-     * Run the migrations.

-     *

-     * @return void

-     */

-    public function run()

-    {

-        Capsule::schema()->dropIfExists('coaches');

-        Capsule::schema()->create('coaches', function (Blueprint $table) {

-            $table->increments('id');

-            $table->string('name');

-            $table->string('surname');

-            $table->tinyInteger('age');

-            $table->string('nationality',2);

-            $table->float('skillAvg');

-            $table->float('wageReq');

-            $table->string('favouriteModule',10);

-            $table->integer('team_id')->nullable();

-            $table->timestamps();

-        });

-    }

+	/**

+	 * Run the migrations.

+	 *

+	 * @return void

+	 */

+	public function run()

+	{

+		Capsule::schema()->dropIfExists('coaches');

+		Capsule::schema()->create('coaches', function (Blueprint $table) {

+			$table->increments('id');

+			$table->string('name');

+			$table->string('surname');

+			$table->tinyInteger('age');

+			$table->string('nationality',2);

+			$table->float('skillAvg');

+			$table->float('wageReq');

+			$table->string('favouriteModule',10);

+			$table->integer('team_id')->nullable();

+			$table->timestamps();

+		});

+	}

 

-    /**

-     * Reverse the migrations.

-     *

-     * @return void

-     */

-    public function down()

-    {

-        Schema::drop('coaches');

-    }

+	/**

+	 * Reverse the migrations.

+	 *

+	 * @return void

+	 */

+	public function down()

+	{

+		Schema::drop('coaches');

+	}

 }

api/database/migrations/CreatePlayersTable.php

Indentation +22 added lines, -22 removed lines

@@ -5,26 +5,26 @@
 

 class CreatePlayersTable

 {

-    /**

-     * Run the migrations.

-     *

-     * @return void

-     */

-    public function run()

-    {

-        Capsule::schema()->dropIfExists('players');

-        Capsule::schema()->create('players', function (Blueprint $table) {

-            $table->increments('id');

-            $table->string('name');

-            $table->string('surname');

-            $table->tinyInteger('age');

-            $table->string('nationality',2);

-            $table->float('skillAvg');

-            $table->float('wageReq');

-            $table->float('val');

-            $table->string('role',2);

-            $table->integer('team_id')->nullable();

-            $table->timestamps();

-        });

-    }

+	/**

+	 * Run the migrations.

+	 *

+	 * @return void

+	 */

+	public function run()

+	{

+		Capsule::schema()->dropIfExists('players');

+		Capsule::schema()->create('players', function (Blueprint $table) {

+			$table->increments('id');

+			$table->string('name');

+			$table->string('surname');

+			$table->tinyInteger('age');

+			$table->string('nationality',2);

+			$table->float('skillAvg');

+			$table->float('wageReq');

+			$table->float('val');

+			$table->string('role',2);

+			$table->integer('team_id')->nullable();

+			$table->timestamps();

+		});

+	}

 }

api/config/config.php

Indentation +10 added lines, -10 removed lines

@@ -4,9 +4,9 @@ 
 

 $dotenv = new Dotenv\Dotenv(__DIR__ . "/../");

 try {

-    $dotenv->load();

+	$dotenv->load();

 } catch (Exception $e) {

-    //yummy exception

+	//yummy exception

 }

 

 /**

@@ -14,14 +14,14 @@ 
  */

 $capsule = new Capsule;

 $capsule->addConnection(array(

-    'driver' => 'mysql',

-    'host' => 'localhost',

-    'database' => 'dsmanager',

-    'username' => getenv('USERNAME'),

-    'password' => getenv('PASSWORD'),

-    'charset' => 'utf8',

-    'collation' => 'utf8_general_ci',

-    'prefix' => ''

+	'driver' => 'mysql',

+	'host' => 'localhost',

+	'database' => 'dsmanager',

+	'username' => getenv('USERNAME'),

+	'password' => getenv('PASSWORD'),

+	'charset' => 'utf8',

+	'collation' => 'utf8_general_ci',

+	'prefix' => ''

 ));

 $capsule->setAsGlobal();

 $capsule->bootEloquent();

api/database/seeds/BMatchesSeeder.php

Indentation +16 added lines, -16 removed lines

@@ -3,20 +3,20 @@
 
 class BMatchesSeeder
 {
-    function run()
-    {
-        $teams = \App\Lib\DsManager\Models\Orm\Team::all()->toArray();
-        $halfTheTeams = count($teams) / 2;
-        $chunks = array_chunk($teams, $halfTheTeams);
-        $teamsSlice1 = $chunks[0];
-        $teamsSlice2 = $chunks[1];
-        for ($i = 0; $i < $halfTheTeams; $i++) {
-            \App\Lib\DsManager\Models\Orm\Match::create(
-                [
-                    'home_team_id' => $teamsSlice1[$i]['id'],
-                    'away_team_id' => $teamsSlice2[$i]['id']
-                ]
-            );
-        }
-    }
+	function run()
+	{
+		$teams = \App\Lib\DsManager\Models\Orm\Team::all()->toArray();
+		$halfTheTeams = count($teams) / 2;
+		$chunks = array_chunk($teams, $halfTheTeams);
+		$teamsSlice1 = $chunks[0];
+		$teamsSlice2 = $chunks[1];
+		for ($i = 0; $i < $halfTheTeams; $i++) {
+			\App\Lib\DsManager\Models\Orm\Match::create(
+				[
+					'home_team_id' => $teamsSlice1[$i]['id'],
+					'away_team_id' => $teamsSlice2[$i]['id']
+				]
+			);
+		}
+	}
 }
\ No newline at end of file

api/database/migrations/CreateMatchTable.php

Indentation +20 added lines, -20 removed lines

@@ -5,24 +5,24 @@
 
 class CreateMatchTable
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function run()
-    {
-        Capsule::schema()->dropIfExists('matches');
-        Capsule::schema()->create('matches', function (Blueprint $table) {
-            $table->increments('id');
-            $table->integer('home_team_id');
-            $table->integer('goal_home')->default(0);
-            $table->integer('away_team_id');
-            $table->integer('goal_away')->default(0);
-            $table->boolean('simulated')->default(false);
-            $table->text('info')->nullable();
-            $table->date('match_date')->default(\Carbon\Carbon::now());
-            $table->timestamps();
-        });
-    }
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function run()
+	{
+		Capsule::schema()->dropIfExists('matches');
+		Capsule::schema()->create('matches', function (Blueprint $table) {
+			$table->increments('id');
+			$table->integer('home_team_id');
+			$table->integer('goal_home')->default(0);
+			$table->integer('away_team_id');
+			$table->integer('goal_away')->default(0);
+			$table->boolean('simulated')->default(false);
+			$table->text('info')->nullable();
+			$table->date('match_date')->default(\Carbon\Carbon::now());
+			$table->timestamps();
+		});
+	}
 }

api/Lib/DsManager/Models/Match.php

Indentation +160 added lines, -160 removed lines

@@ -11,164 +11,164 @@
  */

 class Match extends DsManagerModel

 {

-    /**

-     * @var Team

-     */

-    private $homeTeam;

-    /**

-     * @var Team

-     */

-    private $awayTeam;

-

-    /**

-     * Match constructor.

-     * @param Team $home

-     * @param Team $away

-     */

-    public function __construct(Team $home, Team $away)

-    {

-        $this->homeTeam = $home;

-        $this->awayTeam = $away;

-    }

-

-    /**

-     * @return MatchResult

-     */

-    public function simulate()

-    {

-        $homePoints = $this->homeTeam->getAvgSkill();

-        $awayPoints = $this->awayTeam->getAvgSkill();

-

-        $homePoints += $this->malusModule(

-            $this->homeTeam->coach->favouriteModule,

-            $this->homeTeam->playersPerRoleArray()

-        );

-        $awayPoints += $this->malusModule(

-            $this->awayTeam->coach->favouriteModule,

-            $this->awayTeam->playersPerRoleArray()

-        );

-

-        $goalHome = 0;

-        $goalAway = 0;

-

-        if (Randomizer::boolOnPercentage(80)) {

-            if (($homePoints - $awayPoints) < 0) {

-                $goalAway = ($awayPoints - $homePoints) % 6;

-                $goalHome += $this->chance();

-                $goalAway += $this->chance();

-                $goalHome += $this->bonusHome();

-            } else {

-                $goalHome = ($homePoints - $awayPoints) % 6;

-                $goalAway += $this->chance();

-                $goalHome += $this->bonusHome();

-            }

-        } else {

-            $goalHome += $this->chance();

-            $goalAway += $this->chance();

-            $goalHome += $this->bonusHome();

-        }

-        $goalHome += $this->bonusAge($this->homeTeam);

-        $goalAway += $this->bonusAge($this->awayTeam);

-

-        //Bonus on Good GoalKeeper

-        $goalies = $this->homeTeam->getBestPlayerForRole("GK");

-        $goalAway -= $this->bonusGoalKeeper($goalies);

-        $goalies = $this->awayTeam->getBestPlayerForRole("GK");

-        $goalHome -= $this->bonusGoalKeeper($goalies);

-        //

-        $homeModule = new Module($this->homeTeam->coach->favouriteModule);

-        $awayModule = new Module($this->awayTeam->coach->favouriteModule);

-        if ($homeModule->isOffensive()) {

-            $goalHome += Randomizer::boolOnPercentage(50) ? rand(1, 2) : 0;

-            $goalAway += Randomizer::boolOnPercentage(20) ? 1 : 0;

-        }

-        if ($awayModule->isOffensive()) {

-            $goalAway += Randomizer::boolOnPercentage(50) ? rand(1, 2) : 0;

-            $goalHome += Randomizer::boolOnPercentage(20) ? 1 : 0;

-        }

-        if ($awayModule->isDefensive()) {

-            $goalHome -= Randomizer::boolOnPercentage(50) ? 1 : 0;

-        }

-        if ($homeModule->isDefensive()) {

-            $goalAway -= Randomizer::boolOnPercentage(50) ? 1 : 0;

-        }

-        $goalHome = $goalHome < 0 ? 0 : $goalHome;

-        $goalAway = $goalAway < 0 ? 0 : $goalAway;

-        return new MatchResult($goalHome, $goalAway, $this->homeTeam, $this->awayTeam);

-    }

-

-    /**

-     * @param Team $team

-     * @return int

-     */

-    private function bonusAge(Team $team)

-    {

-        if ($team->getAvgAge() > 29 || $team->getAvgAge() < 24) {

-            return $this->chance();

-        }

-        return 0;

-    }

-

-    /**

-     * @param $goalkeeper

-     * @return int

-     */

-    private function bonusGoalKeeper($goalkeeper)

-    {

-        $skillGoalkeeper = empty($goalkeeper) ? 1 : $goalkeeper->skillAvg;

-        return (Randomizer::boolOnPercentage($skillGoalkeeper) ? 1 : 0);

-    }

-

-    /**

-     * @return int

-     */

-    private function chance()

-    {

-        return rand(0, 3);

-    }

-

-    /**

-     * @return int

-     */

-    private function bonusHome()

-    {

-        return Randomizer::boolOnPercentage(66) ? 1 : 0;

-    }

-

-    /**

-     * @param $moduleString

-     * @param $playersRoleArray

-     * @return int

-     */

-    private function malusModule($moduleString, $playersRoleArray)

-    {

-        $module = new Module($moduleString);

-        if ($module->isApplicableToArray($playersRoleArray)) {

-            return rand(1, 10);

-        } else {

-            return (-1) * rand(1, 10);

-        }

-    }

-

-    /**

-     * @param array $ormMatchArray

-     * @return Match

-     */

-    public static function fromArray($ormMatchArray = [])

-    {

-        $homeTeam = Team::fromArray($ormMatchArray['home_team']);

-        $awayTeam = Team::fromArray($ormMatchArray['away_team']);

-        return new Match($homeTeam, $awayTeam);

-    }

-

-    /**

-     * @return mixed

-     */

-    function toArray()

-    {

-        $result = [];

-        $result['home_team_id'] = $this->homeTeam->id;

-        $result['away_team_id'] = $this->awayTeam->id;

-        return $result;

-    }

+	/**

+	 * @var Team

+	 */

+	private $homeTeam;

+	/**

+	 * @var Team

+	 */

+	private $awayTeam;

+

+	/**

+	 * Match constructor.

+	 * @param Team $home

+	 * @param Team $away

+	 */

+	public function __construct(Team $home, Team $away)

+	{

+		$this->homeTeam = $home;

+		$this->awayTeam = $away;

+	}

+

+	/**

+	 * @return MatchResult

+	 */

+	public function simulate()

+	{

+		$homePoints = $this->homeTeam->getAvgSkill();

+		$awayPoints = $this->awayTeam->getAvgSkill();

+

+		$homePoints += $this->malusModule(

+			$this->homeTeam->coach->favouriteModule,

+			$this->homeTeam->playersPerRoleArray()

+		);

+		$awayPoints += $this->malusModule(

+			$this->awayTeam->coach->favouriteModule,

+			$this->awayTeam->playersPerRoleArray()

+		);

+

+		$goalHome = 0;

+		$goalAway = 0;

+

+		if (Randomizer::boolOnPercentage(80)) {

+			if (($homePoints - $awayPoints) < 0) {

+				$goalAway = ($awayPoints - $homePoints) % 6;

+				$goalHome += $this->chance();

+				$goalAway += $this->chance();

+				$goalHome += $this->bonusHome();

+			} else {

+				$goalHome = ($homePoints - $awayPoints) % 6;

+				$goalAway += $this->chance();

+				$goalHome += $this->bonusHome();

+			}

+		} else {

+			$goalHome += $this->chance();

+			$goalAway += $this->chance();

+			$goalHome += $this->bonusHome();

+		}

+		$goalHome += $this->bonusAge($this->homeTeam);

+		$goalAway += $this->bonusAge($this->awayTeam);

+

+		//Bonus on Good GoalKeeper

+		$goalies = $this->homeTeam->getBestPlayerForRole("GK");

+		$goalAway -= $this->bonusGoalKeeper($goalies);

+		$goalies = $this->awayTeam->getBestPlayerForRole("GK");

+		$goalHome -= $this->bonusGoalKeeper($goalies);

+		//

+		$homeModule = new Module($this->homeTeam->coach->favouriteModule);

+		$awayModule = new Module($this->awayTeam->coach->favouriteModule);

+		if ($homeModule->isOffensive()) {

+			$goalHome += Randomizer::boolOnPercentage(50) ? rand(1, 2) : 0;

+			$goalAway += Randomizer::boolOnPercentage(20) ? 1 : 0;

+		}

+		if ($awayModule->isOffensive()) {

+			$goalAway += Randomizer::boolOnPercentage(50) ? rand(1, 2) : 0;

+			$goalHome += Randomizer::boolOnPercentage(20) ? 1 : 0;

+		}

+		if ($awayModule->isDefensive()) {

+			$goalHome -= Randomizer::boolOnPercentage(50) ? 1 : 0;

+		}

+		if ($homeModule->isDefensive()) {

+			$goalAway -= Randomizer::boolOnPercentage(50) ? 1 : 0;

+		}

+		$goalHome = $goalHome < 0 ? 0 : $goalHome;

+		$goalAway = $goalAway < 0 ? 0 : $goalAway;

+		return new MatchResult($goalHome, $goalAway, $this->homeTeam, $this->awayTeam);

+	}

+

+	/**

+	 * @param Team $team

+	 * @return int

+	 */

+	private function bonusAge(Team $team)

+	{

+		if ($team->getAvgAge() > 29 || $team->getAvgAge() < 24) {

+			return $this->chance();

+		}

+		return 0;

+	}

+

+	/**

+	 * @param $goalkeeper

+	 * @return int

+	 */

+	private function bonusGoalKeeper($goalkeeper)

+	{

+		$skillGoalkeeper = empty($goalkeeper) ? 1 : $goalkeeper->skillAvg;

+		return (Randomizer::boolOnPercentage($skillGoalkeeper) ? 1 : 0);

+	}

+

+	/**

+	 * @return int

+	 */

+	private function chance()

+	{

+		return rand(0, 3);

+	}

+

+	/**

+	 * @return int

+	 */

+	private function bonusHome()

+	{

+		return Randomizer::boolOnPercentage(66) ? 1 : 0;

+	}

+

+	/**

+	 * @param $moduleString

+	 * @param $playersRoleArray

+	 * @return int

+	 */

+	private function malusModule($moduleString, $playersRoleArray)

+	{

+		$module = new Module($moduleString);

+		if ($module->isApplicableToArray($playersRoleArray)) {

+			return rand(1, 10);

+		} else {

+			return (-1) * rand(1, 10);

+		}

+	}

+

+	/**

+	 * @param array $ormMatchArray

+	 * @return Match

+	 */

+	public static function fromArray($ormMatchArray = [])

+	{

+		$homeTeam = Team::fromArray($ormMatchArray['home_team']);

+		$awayTeam = Team::fromArray($ormMatchArray['away_team']);

+		return new Match($homeTeam, $awayTeam);

+	}

+

+	/**

+	 * @return mixed

+	 */

+	function toArray()

+	{

+		$result = [];

+		$result['home_team_id'] = $this->homeTeam->id;

+		$result['away_team_id'] = $this->awayTeam->id;

+		return $result;

+	}

 }
\ No newline at end of file

api/Lib/DsManager/Models/Orm/Match.php

Indentation +51 added lines, -51 removed lines

@@ -9,62 +9,62 @@
 class Match extends DsManagerOrm
 {
 
-    /**
-     * @var string
-     */
-    protected $table = 'matches';
+	/**
+	 * @var string
+	 */
+	protected $table = 'matches';
 
-    /**
-     * @var array
-     */
-    protected $fillable = [
-        'home_team_id',
-        'away_team_id'
-    ];
+	/**
+	 * @var array
+	 */
+	protected $fillable = [
+		'home_team_id',
+		'away_team_id'
+	];
 
-    /**
-     * @var array
-     */
-    protected $hidden = [
-        'home_team_id',
-        'away_team_id',
-        'created_at',
-        'updated_at',
-        'info'
-    ];
+	/**
+	 * @var array
+	 */
+	protected $hidden = [
+		'home_team_id',
+		'away_team_id',
+		'created_at',
+		'updated_at',
+		'info'
+	];
 
-    /**
-     * @var array
-     */
-    protected $casts = [
-        'simulated' => 'boolean'
-    ];
+	/**
+	 * @var array
+	 */
+	protected $casts = [
+		'simulated' => 'boolean'
+	];
 
-    /**
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
-    public function homeTeam()
-    {
-        return $this->belongsTo(Team::class, 'home_team_id');
-    }
+	/**
+	 * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+	 */
+	public function homeTeam()
+	{
+		return $this->belongsTo(Team::class, 'home_team_id');
+	}
 
-    /**
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
-    public function awayTeam()
-    {
-        return $this->belongsTo(Team::class, 'away_team_id');
-    }
+	/**
+	 * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+	 */
+	public function awayTeam()
+	{
+		return $this->belongsTo(Team::class, 'away_team_id');
+	}
 
-    public function scopeComplete($query){
-        return $query->with(
-            'homeTeam',
-            'homeTeam.roster',
-            'homeTeam.coach',
-            'awayTeam',
-            'awayTeam.roster',
-            'awayTeam.coach'
-        );
-    }
+	public function scopeComplete($query){
+		return $query->with(
+			'homeTeam',
+			'homeTeam.roster',
+			'homeTeam.coach',
+			'awayTeam',
+			'awayTeam.roster',
+			'awayTeam.coach'
+		);
+	}
 
 }
\ No newline at end of file

api/config/generic.php

Indentation +4 added lines, -4 removed lines

@@ -74,10 +74,10 @@
 		'ro_MD',
 		'tr_TR'
 	],
-    'rosters' => [
-        'min' => 11,
-        'max'  => 18
-    ],
+	'rosters' => [
+		'min' => 11,
+		'max'  => 18
+	],
 ];