@@ -6,9 +6,9 @@ |
||
6 | 6 | |
7 | 7 | abstract class DsManagerOrm extends Eloquent{ |
8 | 8 | |
9 | - protected $hidden = [ |
|
10 | - 'created_at', |
|
11 | - 'updated_at' |
|
12 | - ]; |
|
9 | + protected $hidden = [ |
|
10 | + 'created_at', |
|
11 | + 'updated_at' |
|
12 | + ]; |
|
13 | 13 | |
14 | 14 | } |
15 | 15 | \ No newline at end of file |
@@ -4,7 +4,7 @@ |
||
4 | 4 | use Illuminate\Database\Eloquent\Model as Eloquent; |
5 | 5 | |
6 | 6 | |
7 | -abstract class DsManagerOrm extends Eloquent{ |
|
7 | +abstract class DsManagerOrm extends Eloquent { |
|
8 | 8 | |
9 | 9 | protected $hidden = [ |
10 | 10 | 'created_at', |
@@ -35,7 +35,9 @@ discard block |
||
35 | 35 | if ($this->wageReq == null) { |
36 | 36 | $wage = $this->wageOnSkill(); |
37 | 37 | $wage += $this->spareChange(); |
38 | - if ($wage < 0) $wage = $wage * (-1); |
|
38 | + if ($wage < 0) { |
|
39 | + $wage = $wage * (-1); |
|
40 | + } |
|
39 | 41 | $this->wageReq = round($wage, 2); |
40 | 42 | } |
41 | 43 | return $this->wageReq; |
@@ -46,13 +48,27 @@ discard block |
||
46 | 48 | */ |
47 | 49 | private function wageOnSkill() |
48 | 50 | { |
49 | - if ($this->skillAvg > 98) return 5.0; |
|
50 | - if ($this->skillAvg > 90) return 3.5; |
|
51 | - if ($this->skillAvg > 80) return 2.0; |
|
52 | - if ($this->skillAvg > 76) return 1.5; |
|
53 | - if ($this->skillAvg > 70) return 1.0; |
|
54 | - if ($this->skillAvg > 60) return .76; |
|
55 | - if ($this->skillAvg > 50) return .20; |
|
51 | + if ($this->skillAvg > 98) { |
|
52 | + return 5.0; |
|
53 | + } |
|
54 | + if ($this->skillAvg > 90) { |
|
55 | + return 3.5; |
|
56 | + } |
|
57 | + if ($this->skillAvg > 80) { |
|
58 | + return 2.0; |
|
59 | + } |
|
60 | + if ($this->skillAvg > 76) { |
|
61 | + return 1.5; |
|
62 | + } |
|
63 | + if ($this->skillAvg > 70) { |
|
64 | + return 1.0; |
|
65 | + } |
|
66 | + if ($this->skillAvg > 60) { |
|
67 | + return .76; |
|
68 | + } |
|
69 | + if ($this->skillAvg > 50) { |
|
70 | + return .20; |
|
71 | + } |
|
56 | 72 | return 0.5; |
57 | 73 | |
58 | 74 | } |
@@ -12,15 +12,15 @@ |
||
12 | 12 | */ |
13 | 13 | abstract class DsManagerModel implements ActiveModel |
14 | 14 | { |
15 | - /** |
|
16 | - * @var |
|
17 | - */ |
|
18 | - public $id; |
|
15 | + /** |
|
16 | + * @var |
|
17 | + */ |
|
18 | + public $id; |
|
19 | 19 | |
20 | - /** |
|
21 | - * @return mixed |
|
22 | - */ |
|
23 | - abstract function toArray(); |
|
20 | + /** |
|
21 | + * @return mixed |
|
22 | + */ |
|
23 | + abstract function toArray(); |
|
24 | 24 | /** |
25 | 25 | * @param array $array |
26 | 26 | * @return mixed |
@@ -25,7 +25,7 @@ |
||
25 | 25 | * @param array $array |
26 | 26 | * @return mixed |
27 | 27 | */ |
28 | - public static function fromArray($array =[]) |
|
28 | + public static function fromArray($array = []) |
|
29 | 29 | { |
30 | 30 | $class = get_called_class(); |
31 | 31 | $class = new $class(); |
@@ -63,7 +63,7 @@ |
||
63 | 63 | */ |
64 | 64 | function __toString() |
65 | 65 | { |
66 | - return "" . $this->moduleCode; |
|
66 | + return "".$this->moduleCode; |
|
67 | 67 | } |
68 | 68 | |
69 | 69 |
@@ -31,7 +31,9 @@ discard block |
||
31 | 31 | { |
32 | 32 | $this->moduleCode = $module; |
33 | 33 | $this->configuration = Config::get("modules.modules", "api/")[$module]; |
34 | - if ($this->configuration == null) throw new \InvalidArgumentException("Not a valid Module supplied"); |
|
34 | + if ($this->configuration == null) { |
|
35 | + throw new \InvalidArgumentException("Not a valid Module supplied"); |
|
36 | + } |
|
35 | 37 | } |
36 | 38 | |
37 | 39 | /** |
@@ -98,8 +100,9 @@ discard block |
||
98 | 100 | $roles = \App\Lib\Helpers\Config::get('modules.roles', "api/"); |
99 | 101 | $rolesKeys = array_keys($roles); |
100 | 102 | foreach ($this->configuration["roles"] as $index => $playNum) { |
101 | - if ($playNum != 0 || $complete) |
|
102 | - $rolesNeeded[$rolesKeys[$index]] = $playNum; |
|
103 | + if ($playNum != 0 || $complete) { |
|
104 | + $rolesNeeded[$rolesKeys[$index]] = $playNum; |
|
105 | + } |
|
103 | 106 | } |
104 | 107 | |
105 | 108 | return $rolesNeeded; |
@@ -9,44 +9,44 @@ |
||
9 | 9 | */ |
10 | 10 | class Responder |
11 | 11 | { |
12 | - /** |
|
13 | - * @param $content |
|
14 | - * @param $response |
|
15 | - * @param array $headers |
|
16 | - * @return mixed |
|
17 | - */ |
|
18 | - public static function getJsonResponse($content, $response, $headers = []) |
|
19 | - { |
|
20 | - $headers['Content-Type'] = 'application/json'; |
|
21 | - return self::getResponse($headers, $content, $response); |
|
22 | - } |
|
12 | + /** |
|
13 | + * @param $content |
|
14 | + * @param $response |
|
15 | + * @param array $headers |
|
16 | + * @return mixed |
|
17 | + */ |
|
18 | + public static function getJsonResponse($content, $response, $headers = []) |
|
19 | + { |
|
20 | + $headers['Content-Type'] = 'application/json'; |
|
21 | + return self::getResponse($headers, $content, $response); |
|
22 | + } |
|
23 | 23 | |
24 | - /** |
|
25 | - * @param array $headers |
|
26 | - * @param $content |
|
27 | - * @param $response |
|
28 | - * @return mixed |
|
29 | - */ |
|
30 | - public static function getResponse($headers = [], $content, $response) |
|
31 | - { |
|
32 | - $body = $response->getBody(); |
|
33 | - $body->write($content); |
|
34 | - $i = 0; |
|
35 | - foreach ($headers as $header => $value) { |
|
36 | - if ($i === 0) { |
|
37 | - $response = $response->withHeader( |
|
38 | - $header, |
|
39 | - $value |
|
40 | - ); |
|
41 | - } else { |
|
42 | - $response = $response->withAddedHeader( |
|
43 | - $header, |
|
44 | - $value |
|
45 | - ); |
|
46 | - } |
|
47 | - $i++; |
|
48 | - } |
|
49 | - return $response->withBody($body); |
|
50 | - } |
|
24 | + /** |
|
25 | + * @param array $headers |
|
26 | + * @param $content |
|
27 | + * @param $response |
|
28 | + * @return mixed |
|
29 | + */ |
|
30 | + public static function getResponse($headers = [], $content, $response) |
|
31 | + { |
|
32 | + $body = $response->getBody(); |
|
33 | + $body->write($content); |
|
34 | + $i = 0; |
|
35 | + foreach ($headers as $header => $value) { |
|
36 | + if ($i === 0) { |
|
37 | + $response = $response->withHeader( |
|
38 | + $header, |
|
39 | + $value |
|
40 | + ); |
|
41 | + } else { |
|
42 | + $response = $response->withAddedHeader( |
|
43 | + $header, |
|
44 | + $value |
|
45 | + ); |
|
46 | + } |
|
47 | + $i++; |
|
48 | + } |
|
49 | + return $response->withBody($body); |
|
50 | + } |
|
51 | 51 | |
52 | 52 | } |
53 | 53 | \ No newline at end of file |
@@ -17,7 +17,7 @@ discard block |
||
17 | 17 | $c = new \Slim\Container($configuration); |
18 | 18 | $api = new \Slim\App($c); |
19 | 19 | |
20 | -$api->get('/ping', function ($request, $response, $args) { |
|
20 | +$api->get('/ping', function($request, $response, $args) { |
|
21 | 21 | $jsonResp = json_encode( |
22 | 22 | [ |
23 | 23 | "status" => "service up", |
@@ -28,34 +28,34 @@ discard block |
||
28 | 28 | return \App\Lib\Helpers\Responder::getJsonResponse($jsonResp, $response); |
29 | 29 | }); |
30 | 30 | |
31 | -$api->get('/players', function ($request, $response, $args) { |
|
31 | +$api->get('/players', function($request, $response, $args) { |
|
32 | 32 | $json = json_encode(Player::all()); |
33 | 33 | return \App\Lib\Helpers\Responder::getJsonResponse($json, $response); |
34 | 34 | }); |
35 | 35 | |
36 | 36 | |
37 | -$api->get('/players/{id}', function ($request, $response, $args) { |
|
37 | +$api->get('/players/{id}', function($request, $response, $args) { |
|
38 | 38 | return \App\Lib\Helpers\Responder::getJsonResponse( |
39 | 39 | Player::findOrFail($args['id']), |
40 | 40 | $response |
41 | 41 | ); |
42 | 42 | }); |
43 | 43 | |
44 | -$api->get('/coaches', function ($request, $response, $args) { |
|
44 | +$api->get('/coaches', function($request, $response, $args) { |
|
45 | 45 | return \App\Lib\Helpers\Responder::getJsonResponse( |
46 | 46 | Coach::all(), |
47 | 47 | $response |
48 | 48 | ); |
49 | 49 | }); |
50 | 50 | |
51 | -$api->get('/teams', function ($request, $response, $args) { |
|
51 | +$api->get('/teams', function($request, $response, $args) { |
|
52 | 52 | return \App\Lib\Helpers\Responder::getJsonResponse( |
53 | 53 | Team::all(), |
54 | 54 | $response |
55 | 55 | ); |
56 | 56 | }); |
57 | 57 | |
58 | -$api->get('/teams/{id}', function ($request, $response, $args) { |
|
58 | +$api->get('/teams/{id}', function($request, $response, $args) { |
|
59 | 59 | return \App\Lib\Helpers\Responder::getJsonResponse( |
60 | 60 | Team::with( |
61 | 61 | 'roster', |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | ); |
70 | 70 | }); |
71 | 71 | |
72 | -$api->get('/teams/{id}/players', function ($request, $response, $args) { |
|
72 | +$api->get('/teams/{id}/players', function($request, $response, $args) { |
|
73 | 73 | return \App\Lib\Helpers\Responder::getJsonResponse( |
74 | 74 | Team::with( |
75 | 75 | 'roster' |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | ); |
83 | 83 | }); |
84 | 84 | |
85 | -$api->get('/teams/{id}/players/{playerId}', function ($request, $response, $args) { |
|
85 | +$api->get('/teams/{id}/players/{playerId}', function($request, $response, $args) { |
|
86 | 86 | return \App\Lib\Helpers\Responder::getJsonResponse( |
87 | 87 | Player::where( |
88 | 88 | [ |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | ); |
95 | 95 | }); |
96 | 96 | |
97 | -$api->get('/teams/{id}/coach', function ($request, $response, $args) { |
|
97 | +$api->get('/teams/{id}/coach', function($request, $response, $args) { |
|
98 | 98 | return \App\Lib\Helpers\Responder::getJsonResponse( |
99 | 99 | Team::with( |
100 | 100 | 'coach' |
@@ -10,101 +10,101 @@ |
||
10 | 10 | use \App\Lib\DsManager\Models\Orm\Coach; |
11 | 11 | |
12 | 12 | $configuration = [ |
13 | - 'settings' => [ |
|
14 | - 'displayErrorDetails' => true, |
|
15 | - ], |
|
13 | + 'settings' => [ |
|
14 | + 'displayErrorDetails' => true, |
|
15 | + ], |
|
16 | 16 | ]; |
17 | 17 | $c = new \Slim\Container($configuration); |
18 | 18 | $api = new \Slim\App($c); |
19 | 19 | |
20 | 20 | $api->get('/ping', function ($request, $response, $args) { |
21 | - $jsonResp = json_encode( |
|
22 | - [ |
|
23 | - "status" => "service up", |
|
24 | - "message" => "in a bottle", |
|
25 | - "config" => \App\Lib\Helpers\Config::get("config1.stuff") |
|
26 | - ] |
|
27 | - ); |
|
28 | - return Responder::getJsonResponse($jsonResp, $response); |
|
21 | + $jsonResp = json_encode( |
|
22 | + [ |
|
23 | + "status" => "service up", |
|
24 | + "message" => "in a bottle", |
|
25 | + "config" => \App\Lib\Helpers\Config::get("config1.stuff") |
|
26 | + ] |
|
27 | + ); |
|
28 | + return Responder::getJsonResponse($jsonResp, $response); |
|
29 | 29 | }); |
30 | 30 | |
31 | 31 | $api->get('/players', function ($request, $response, $args) { |
32 | - $json = json_encode(Player::all()); |
|
33 | - return Responder::getJsonResponse($json, $response); |
|
32 | + $json = json_encode(Player::all()); |
|
33 | + return Responder::getJsonResponse($json, $response); |
|
34 | 34 | }); |
35 | 35 | |
36 | 36 | |
37 | 37 | $api->get('/players/{id}', function ($request, $response, $args) { |
38 | - return Responder::getJsonResponse( |
|
39 | - Player::findOrFail($args['id']), |
|
40 | - $response |
|
41 | - ); |
|
38 | + return Responder::getJsonResponse( |
|
39 | + Player::findOrFail($args['id']), |
|
40 | + $response |
|
41 | + ); |
|
42 | 42 | }); |
43 | 43 | |
44 | 44 | $api->get('/coaches', function ($request, $response, $args) { |
45 | - return Responder::getJsonResponse( |
|
46 | - Coach::all(), |
|
47 | - $response |
|
48 | - ); |
|
45 | + return Responder::getJsonResponse( |
|
46 | + Coach::all(), |
|
47 | + $response |
|
48 | + ); |
|
49 | 49 | }); |
50 | 50 | |
51 | 51 | $api->get('/teams', function ($request, $response, $args) { |
52 | - return Responder::getJsonResponse( |
|
53 | - Team::all(), |
|
54 | - $response |
|
55 | - ); |
|
52 | + return Responder::getJsonResponse( |
|
53 | + Team::all(), |
|
54 | + $response |
|
55 | + ); |
|
56 | 56 | }); |
57 | 57 | |
58 | 58 | $api->get('/teams/{id}', function ($request, $response, $args) { |
59 | - return Responder::getJsonResponse( |
|
60 | - Team::with( |
|
61 | - 'roster', |
|
62 | - 'coach' |
|
63 | - )->where( |
|
64 | - [ |
|
65 | - 'id' => $args['id'] |
|
66 | - ] |
|
67 | - )->get(), |
|
68 | - $response |
|
69 | - ); |
|
59 | + return Responder::getJsonResponse( |
|
60 | + Team::with( |
|
61 | + 'roster', |
|
62 | + 'coach' |
|
63 | + )->where( |
|
64 | + [ |
|
65 | + 'id' => $args['id'] |
|
66 | + ] |
|
67 | + )->get(), |
|
68 | + $response |
|
69 | + ); |
|
70 | 70 | }); |
71 | 71 | |
72 | 72 | $api->get('/teams/{id}/players', function ($request, $response, $args) { |
73 | - return Responder::getJsonResponse( |
|
74 | - Team::with( |
|
75 | - 'roster' |
|
76 | - )->where( |
|
77 | - [ |
|
78 | - 'id' => $args['id'] |
|
79 | - ] |
|
80 | - )->get(), |
|
81 | - $response |
|
82 | - ); |
|
73 | + return Responder::getJsonResponse( |
|
74 | + Team::with( |
|
75 | + 'roster' |
|
76 | + )->where( |
|
77 | + [ |
|
78 | + 'id' => $args['id'] |
|
79 | + ] |
|
80 | + )->get(), |
|
81 | + $response |
|
82 | + ); |
|
83 | 83 | }); |
84 | 84 | |
85 | 85 | $api->get('/teams/{id}/players/{playerId}', function ($request, $response, $args) { |
86 | - return Responder::getJsonResponse( |
|
87 | - Player::where( |
|
88 | - [ |
|
89 | - 'id' => $args['playerId'], |
|
90 | - 'team_id' => $args['id'] |
|
91 | - ] |
|
92 | - )->get(), |
|
93 | - $response |
|
94 | - ); |
|
86 | + return Responder::getJsonResponse( |
|
87 | + Player::where( |
|
88 | + [ |
|
89 | + 'id' => $args['playerId'], |
|
90 | + 'team_id' => $args['id'] |
|
91 | + ] |
|
92 | + )->get(), |
|
93 | + $response |
|
94 | + ); |
|
95 | 95 | }); |
96 | 96 | |
97 | 97 | $api->get('/teams/{id}/coach', function ($request, $response, $args) { |
98 | - return Responder::getJsonResponse( |
|
99 | - Team::with( |
|
100 | - 'coach' |
|
101 | - )->where( |
|
102 | - [ |
|
103 | - 'id' => $args['id'] |
|
104 | - ] |
|
105 | - )->get(), |
|
106 | - $response |
|
107 | - ); |
|
98 | + return Responder::getJsonResponse( |
|
99 | + Team::with( |
|
100 | + 'coach' |
|
101 | + )->where( |
|
102 | + [ |
|
103 | + 'id' => $args['id'] |
|
104 | + ] |
|
105 | + )->get(), |
|
106 | + $response |
|
107 | + ); |
|
108 | 108 | }); |
109 | 109 | |
110 | 110 | $api->run(); |
111 | 111 | \ No newline at end of file |
@@ -8,70 +8,70 @@ |
||
8 | 8 | { |
9 | 9 | |
10 | 10 | |
11 | - /** |
|
12 | - * @group OrmModels |
|
13 | - * @group PlayerOrm |
|
14 | - */ |
|
15 | - public function testPlayerOrmGetSet() |
|
16 | - { |
|
17 | - $rndFiller = new \App\Lib\DsManager\Helpers\RandomFiller(); |
|
18 | - $playerM = $rndFiller->getPlayer(); |
|
19 | - $arrayPl = $playerM->toArray(); |
|
20 | - $playerO = \App\Lib\DsManager\Models\Orm\Player::create($arrayPl); |
|
21 | - $this->assertNotEmpty($playerO); |
|
11 | + /** |
|
12 | + * @group OrmModels |
|
13 | + * @group PlayerOrm |
|
14 | + */ |
|
15 | + public function testPlayerOrmGetSet() |
|
16 | + { |
|
17 | + $rndFiller = new \App\Lib\DsManager\Helpers\RandomFiller(); |
|
18 | + $playerM = $rndFiller->getPlayer(); |
|
19 | + $arrayPl = $playerM->toArray(); |
|
20 | + $playerO = \App\Lib\DsManager\Models\Orm\Player::create($arrayPl); |
|
21 | + $this->assertNotEmpty($playerO); |
|
22 | 22 | |
23 | - $newPlayer = \App\Lib\DsManager\Models\Player::fromArray($playerO->toArray()); |
|
24 | - $this->assertNotEmpty($newPlayer); |
|
25 | - } |
|
23 | + $newPlayer = \App\Lib\DsManager\Models\Player::fromArray($playerO->toArray()); |
|
24 | + $this->assertNotEmpty($newPlayer); |
|
25 | + } |
|
26 | 26 | |
27 | - /** |
|
28 | - * @group OrmModels |
|
29 | - * @group CoachOrm |
|
30 | - */ |
|
31 | - public function testCoachOrmGetSet() |
|
32 | - { |
|
33 | - $rndFiller = new \App\Lib\DsManager\Helpers\RandomFiller(); |
|
34 | - $coach = $rndFiller->getCoach(); |
|
35 | - $arrayPl = $coach->toArray(); |
|
36 | - $coachO = \App\Lib\DsManager\Models\Orm\Coach::create($arrayPl); |
|
37 | - $this->assertNotEmpty($coachO); |
|
27 | + /** |
|
28 | + * @group OrmModels |
|
29 | + * @group CoachOrm |
|
30 | + */ |
|
31 | + public function testCoachOrmGetSet() |
|
32 | + { |
|
33 | + $rndFiller = new \App\Lib\DsManager\Helpers\RandomFiller(); |
|
34 | + $coach = $rndFiller->getCoach(); |
|
35 | + $arrayPl = $coach->toArray(); |
|
36 | + $coachO = \App\Lib\DsManager\Models\Orm\Coach::create($arrayPl); |
|
37 | + $this->assertNotEmpty($coachO); |
|
38 | 38 | |
39 | - $newCoach = \App\Lib\DsManager\Models\Coach::fromArray($coachO->toArray()); |
|
40 | - $this->assertNotEmpty($newCoach); |
|
41 | - } |
|
39 | + $newCoach = \App\Lib\DsManager\Models\Coach::fromArray($coachO->toArray()); |
|
40 | + $this->assertNotEmpty($newCoach); |
|
41 | + } |
|
42 | 42 | |
43 | - /** |
|
44 | - * @group OrmModels |
|
45 | - * @group TeamOrm |
|
46 | - */ |
|
47 | - public function testTeamOrm() |
|
48 | - { |
|
49 | - $rndFiller = new \App\Lib\DsManager\Helpers\RandomFiller(); |
|
50 | - $team = $rndFiller->getTeam($rndFiller->getLocale()); |
|
51 | - $teamArray = $team->toArray(); |
|
52 | - $this->assertNotEmpty($team); |
|
53 | - $teamO = \App\Lib\DsManager\Models\Orm\Team::create($teamArray); |
|
54 | - $this->assertNotEmpty($teamArray); |
|
55 | - $this->assertNotEmpty($teamArray['roster']); |
|
56 | - foreach ($teamArray['roster'] as $player) { |
|
57 | - $player['team_id'] = $teamO->id; |
|
58 | - $playerO = \App\Lib\DsManager\Models\Orm\Player::create($player); |
|
59 | - $this->assertNotEmpty($playerO); |
|
60 | - } |
|
61 | - $teamArray['coach']['team_id'] = $teamO->id; |
|
62 | - $coachO = \App\Lib\DsManager\Models\Orm\Coach::create($teamArray['coach']); |
|
63 | - $this->assertNotEmpty($coachO); |
|
43 | + /** |
|
44 | + * @group OrmModels |
|
45 | + * @group TeamOrm |
|
46 | + */ |
|
47 | + public function testTeamOrm() |
|
48 | + { |
|
49 | + $rndFiller = new \App\Lib\DsManager\Helpers\RandomFiller(); |
|
50 | + $team = $rndFiller->getTeam($rndFiller->getLocale()); |
|
51 | + $teamArray = $team->toArray(); |
|
52 | + $this->assertNotEmpty($team); |
|
53 | + $teamO = \App\Lib\DsManager\Models\Orm\Team::create($teamArray); |
|
54 | + $this->assertNotEmpty($teamArray); |
|
55 | + $this->assertNotEmpty($teamArray['roster']); |
|
56 | + foreach ($teamArray['roster'] as $player) { |
|
57 | + $player['team_id'] = $teamO->id; |
|
58 | + $playerO = \App\Lib\DsManager\Models\Orm\Player::create($player); |
|
59 | + $this->assertNotEmpty($playerO); |
|
60 | + } |
|
61 | + $teamArray['coach']['team_id'] = $teamO->id; |
|
62 | + $coachO = \App\Lib\DsManager\Models\Orm\Coach::create($teamArray['coach']); |
|
63 | + $this->assertNotEmpty($coachO); |
|
64 | 64 | |
65 | - $this->assertNotEmpty( |
|
66 | - \App\Lib\DsManager\Models\Orm\Team::with( |
|
67 | - 'roster' |
|
68 | - )->with( |
|
69 | - 'coach' |
|
70 | - )->where( |
|
71 | - [ |
|
72 | - 'id' => $teamO->id |
|
73 | - ] |
|
74 | - )->get()->toArray() |
|
75 | - ); |
|
76 | - } |
|
65 | + $this->assertNotEmpty( |
|
66 | + \App\Lib\DsManager\Models\Orm\Team::with( |
|
67 | + 'roster' |
|
68 | + )->with( |
|
69 | + 'coach' |
|
70 | + )->where( |
|
71 | + [ |
|
72 | + 'id' => $teamO->id |
|
73 | + ] |
|
74 | + )->get()->toArray() |
|
75 | + ); |
|
76 | + } |
|
77 | 77 | } |
@@ -8,76 +8,76 @@ |
||
8 | 8 | { |
9 | 9 | |
10 | 10 | |
11 | - /** |
|
12 | - * @group Modules |
|
13 | - * @group config |
|
14 | - */ |
|
15 | - public function testAllTheModulesGot11Players() |
|
16 | - { |
|
17 | - $modules = \App\Lib\Helpers\Config::get('modules.modules'); |
|
18 | - $this->assertNotEmpty($modules); |
|
19 | - foreach ($modules as $key => $module) { |
|
20 | - $this->assertNotEmpty($module["roles"]); |
|
21 | - $count = 0; |
|
22 | - foreach ($module["roles"] as $roleNum) { |
|
23 | - $count += $roleNum; |
|
24 | - } |
|
25 | - $this->assertTrue(11 === $count, "Not correct Players for $key"); |
|
26 | - } |
|
27 | - } |
|
11 | + /** |
|
12 | + * @group Modules |
|
13 | + * @group config |
|
14 | + */ |
|
15 | + public function testAllTheModulesGot11Players() |
|
16 | + { |
|
17 | + $modules = \App\Lib\Helpers\Config::get('modules.modules'); |
|
18 | + $this->assertNotEmpty($modules); |
|
19 | + foreach ($modules as $key => $module) { |
|
20 | + $this->assertNotEmpty($module["roles"]); |
|
21 | + $count = 0; |
|
22 | + foreach ($module["roles"] as $roleNum) { |
|
23 | + $count += $roleNum; |
|
24 | + } |
|
25 | + $this->assertTrue(11 === $count, "Not correct Players for $key"); |
|
26 | + } |
|
27 | + } |
|
28 | 28 | |
29 | - /** |
|
30 | - * @group Roles |
|
31 | - * @group config |
|
32 | - */ |
|
33 | - public function testCorrectDisplayModuleDescriptionRole() |
|
34 | - { |
|
35 | - $modules = \App\Lib\Helpers\Config::get('modules.modules'); |
|
36 | - $this->assertNotEmpty($modules); |
|
37 | - $roles = \App\Lib\Helpers\Config::get('modules.roles'); |
|
38 | - $rolesKeys = array_keys($roles); |
|
29 | + /** |
|
30 | + * @group Roles |
|
31 | + * @group config |
|
32 | + */ |
|
33 | + public function testCorrectDisplayModuleDescriptionRole() |
|
34 | + { |
|
35 | + $modules = \App\Lib\Helpers\Config::get('modules.modules'); |
|
36 | + $this->assertNotEmpty($modules); |
|
37 | + $roles = \App\Lib\Helpers\Config::get('modules.roles'); |
|
38 | + $rolesKeys = array_keys($roles); |
|
39 | 39 | |
40 | - foreach ($modules as $key => $module) { |
|
41 | - $this->assertNotEmpty($module["roles"]); |
|
42 | - foreach ($module["roles"] as $index => $playNum) { |
|
43 | - if ($playNum != 0) { |
|
44 | - $this->assertGreaterThan(0, $playNum); |
|
45 | - $this->assertNotNull($roles[$rolesKeys[$index]]["description"]); |
|
46 | - } |
|
47 | - } |
|
48 | - } |
|
49 | - } |
|
40 | + foreach ($modules as $key => $module) { |
|
41 | + $this->assertNotEmpty($module["roles"]); |
|
42 | + foreach ($module["roles"] as $index => $playNum) { |
|
43 | + if ($playNum != 0) { |
|
44 | + $this->assertGreaterThan(0, $playNum); |
|
45 | + $this->assertNotNull($roles[$rolesKeys[$index]]["description"]); |
|
46 | + } |
|
47 | + } |
|
48 | + } |
|
49 | + } |
|
50 | 50 | |
51 | - /** |
|
52 | - * @group rand |
|
53 | - * |
|
54 | - */ |
|
55 | - public function testRandomizer() |
|
56 | - { |
|
57 | - $yes = 0; |
|
58 | - $no = 0; |
|
59 | - for ($i = 1; $i <= 100; $i++) { |
|
60 | - if (\App\Lib\DsManager\Helpers\Randomizer::boolOnPercentage(20)) { |
|
61 | - $yes++; |
|
62 | - } else { |
|
63 | - $no++; |
|
64 | - } |
|
65 | - } |
|
66 | - $this->assertNotEmpty($yes); |
|
67 | - $this->assertNotEmpty($no); |
|
68 | - $this->assertGreaterThan($yes, $no); |
|
69 | - } |
|
51 | + /** |
|
52 | + * @group rand |
|
53 | + * |
|
54 | + */ |
|
55 | + public function testRandomizer() |
|
56 | + { |
|
57 | + $yes = 0; |
|
58 | + $no = 0; |
|
59 | + for ($i = 1; $i <= 100; $i++) { |
|
60 | + if (\App\Lib\DsManager\Helpers\Randomizer::boolOnPercentage(20)) { |
|
61 | + $yes++; |
|
62 | + } else { |
|
63 | + $no++; |
|
64 | + } |
|
65 | + } |
|
66 | + $this->assertNotEmpty($yes); |
|
67 | + $this->assertNotEmpty($no); |
|
68 | + $this->assertGreaterThan($yes, $no); |
|
69 | + } |
|
70 | 70 | |
71 | - /** |
|
72 | - * @group randFiller |
|
73 | - * |
|
74 | - */ |
|
75 | - public function testRandomFiller() |
|
76 | - { |
|
77 | - $rndF = new \App\Lib\DsManager\Helpers\RandomFiller(); |
|
78 | - for ($i = 1; $i <= 10; $i++) { |
|
79 | - $this->assertNotEmpty($rndF->getLocale()); |
|
80 | - } |
|
81 | - } |
|
71 | + /** |
|
72 | + * @group randFiller |
|
73 | + * |
|
74 | + */ |
|
75 | + public function testRandomFiller() |
|
76 | + { |
|
77 | + $rndF = new \App\Lib\DsManager\Helpers\RandomFiller(); |
|
78 | + for ($i = 1; $i <= 10; $i++) { |
|
79 | + $this->assertNotEmpty($rndF->getLocale()); |
|
80 | + } |
|
81 | + } |
|
82 | 82 | |
83 | 83 | } |
@@ -3,20 +3,20 @@ |
||
3 | 3 | |
4 | 4 | class ATeamsSeeder |
5 | 5 | { |
6 | - function run() |
|
7 | - { |
|
8 | - $teamNumber = 10; |
|
9 | - $rndFiller = new \App\Lib\DsManager\Helpers\RandomFiller(); |
|
10 | - for ($i = 1; $i <= $teamNumber; $i++) { |
|
11 | - $team = $rndFiller->getTeam($rndFiller->getLocale()); |
|
12 | - $teamArray = $team->toArray(); |
|
13 | - $teamO = \App\Lib\DsManager\Models\Orm\Team::create($teamArray); |
|
14 | - foreach ($teamArray['roster'] as $player) { |
|
15 | - $player['team_id'] = $teamO->id; |
|
16 | - \App\Lib\DsManager\Models\Orm\Player::create($player); |
|
17 | - } |
|
18 | - $teamArray['coach']['team_id'] = $teamO->id; |
|
19 | - \App\Lib\DsManager\Models\Orm\Coach::create($teamArray['coach']); |
|
20 | - } |
|
21 | - } |
|
6 | + function run() |
|
7 | + { |
|
8 | + $teamNumber = 10; |
|
9 | + $rndFiller = new \App\Lib\DsManager\Helpers\RandomFiller(); |
|
10 | + for ($i = 1; $i <= $teamNumber; $i++) { |
|
11 | + $team = $rndFiller->getTeam($rndFiller->getLocale()); |
|
12 | + $teamArray = $team->toArray(); |
|
13 | + $teamO = \App\Lib\DsManager\Models\Orm\Team::create($teamArray); |
|
14 | + foreach ($teamArray['roster'] as $player) { |
|
15 | + $player['team_id'] = $teamO->id; |
|
16 | + \App\Lib\DsManager\Models\Orm\Player::create($player); |
|
17 | + } |
|
18 | + $teamArray['coach']['team_id'] = $teamO->id; |
|
19 | + \App\Lib\DsManager\Models\Orm\Coach::create($teamArray['coach']); |
|
20 | + } |
|
21 | + } |
|
22 | 22 | } |
23 | 23 | \ No newline at end of file |