From e0eda0af793d2b59310fa6743a64e91780f8b7da Mon Sep 17 00:00:00 2001 From: Julian Ramirez <90717365+rcomunica@users.noreply.github.com> Date: Wed, 27 Nov 2024 22:24:15 -0500 Subject: [PATCH 01/24] Create Stats.php --- app/Http/Resources/Stats.php | 43 ++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 app/Http/Resources/Stats.php diff --git a/app/Http/Resources/Stats.php b/app/Http/Resources/Stats.php new file mode 100644 index 000000000..3ea1cb2d2 --- /dev/null +++ b/app/Http/Resources/Stats.php @@ -0,0 +1,43 @@ +selectRaw('avg(landing_rate) as uresult') + ->where('user_id', $this->id) + ->where('source', PirepSource::ACARS)->where('landing_rate', '<',0) + ->where('state', PirepState::ACCEPTED) + ->value('uresult'); + + $avgFuel = DB::table('pireps') + ->selectRaw('avg(fuel_used) as uresult') + ->where('user_id', $this->id) + ->where('state', PirepState::ACCEPTED) + ->value('uresult'); + + $avgScore = DB::table('pireps') + ->selectRaw('avg(score) as uresult') + ->where('user_id', $this->id) + ->where('state', PirepState::ACCEPTED) + ->value('uresult'); + + return [ + 'balance' => $this->balance ?? 0, + 'avgScore' => number_format($avgScore) ?? 0, + 'avgLanding' => number_format($avgLanding) ?? 0, + 'avgFuel' => number_format($avgFuel / 2.20462262185) . ' kg' ?? '', + ]; + } +} From 62b454affa0d1e154b78c38d7a86f1c15c1ea8ea Mon Sep 17 00:00:00 2001 From: Julian Ramirez <90717365+rcomunica@users.noreply.github.com> Date: Wed, 27 Nov 2024 22:24:31 -0500 Subject: [PATCH 02/24] Update User.php --- app/Http/Resources/User.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/Http/Resources/User.php b/app/Http/Resources/User.php index 954f510a3..2120b59d4 100644 --- a/app/Http/Resources/User.php +++ b/app/Http/Resources/User.php @@ -2,6 +2,7 @@ namespace App\Http\Resources; +use Illuminate\Support\Facades\Auth; use App\Contracts\Resource; /** @@ -31,8 +32,10 @@ public function toArray($request) 'total_time' => $this->flight_time, 'timezone' => $this->timezone, 'state' => $this->state, + ]; + $res['stats'] = new Stats(Auth::user()); $res['airline'] = Airline::make($this->whenLoaded('airline')); $res['bids'] = UserBid::collection($this->whenLoaded('bids')); $res['rank'] = Rank::make($this->whenLoaded('rank')); From 3f3c0592572c5d2a1fa94928c9fa2b0947608792 Mon Sep 17 00:00:00 2001 From: Julian Ramirez <90717365+rcomunica@users.noreply.github.com> Date: Wed, 27 Nov 2024 23:34:54 -0500 Subject: [PATCH 03/24] Update Stats.php --- app/Http/Resources/Stats.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/app/Http/Resources/Stats.php b/app/Http/Resources/Stats.php index 3ea1cb2d2..df292a0a5 100644 --- a/app/Http/Resources/Stats.php +++ b/app/Http/Resources/Stats.php @@ -17,24 +17,24 @@ public function toArray($request) $avgLanding = DB::table('pireps') ->selectRaw('avg(landing_rate) as uresult') ->where('user_id', $this->id) - ->where('source', PirepSource::ACARS)->where('landing_rate', '<',0) + ->where('source', PirepSource::ACARS)->where('landing_rate', '<', 0) ->where('state', PirepState::ACCEPTED) ->value('uresult'); $avgFuel = DB::table('pireps') - ->selectRaw('avg(fuel_used) as uresult') - ->where('user_id', $this->id) - ->where('state', PirepState::ACCEPTED) - ->value('uresult'); + ->selectRaw('avg(fuel_used) as uresult') + ->where('user_id', $this->id) + ->where('state', PirepState::ACCEPTED) + ->value('uresult'); $avgScore = DB::table('pireps') - ->selectRaw('avg(score) as uresult') - ->where('user_id', $this->id) - ->where('state', PirepState::ACCEPTED) - ->value('uresult'); + ->selectRaw('avg(score) as uresult') + ->where('user_id', $this->id) + ->where('state', PirepState::ACCEPTED) + ->value('uresult'); return [ - 'balance' => $this->balance ?? 0, + 'balance' => $this->journal->balance->money->getValue() ?? 0, 'avgScore' => number_format($avgScore) ?? 0, 'avgLanding' => number_format($avgLanding) ?? 0, 'avgFuel' => number_format($avgFuel / 2.20462262185) . ' kg' ?? '', From e430c1b4f2c1ed0d2c635e557d9fa020ee71b31b Mon Sep 17 00:00:00 2001 From: Julian Ramirez <90717365+rcomunica@users.noreply.github.com> Date: Wed, 27 Nov 2024 23:59:21 -0500 Subject: [PATCH 04/24] Update Stats.php --- app/Http/Resources/Stats.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Resources/Stats.php b/app/Http/Resources/Stats.php index df292a0a5..f04b8d769 100644 --- a/app/Http/Resources/Stats.php +++ b/app/Http/Resources/Stats.php @@ -2,10 +2,10 @@ namespace App\Http\Resources; -use Illuminate\Support\Facades\DB; use App\Contracts\Resource; use App\Models\Enums\PirepSource; use App\Models\Enums\PirepState; +use Illuminate\Support\Facades\DB; /** * @mixin \App\Models\Stats From bcd84e94905a0e166a5136387fdf18f45b194466 Mon Sep 17 00:00:00 2001 From: Julian Ramirez <90717365+rcomunica@users.noreply.github.com> Date: Wed, 27 Nov 2024 23:59:35 -0500 Subject: [PATCH 05/24] Update User.php --- app/Http/Resources/User.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Resources/User.php b/app/Http/Resources/User.php index 2120b59d4..9ab394517 100644 --- a/app/Http/Resources/User.php +++ b/app/Http/Resources/User.php @@ -2,8 +2,8 @@ namespace App\Http\Resources; -use Illuminate\Support\Facades\Auth; use App\Contracts\Resource; +use Illuminate\Support\Facades\Auth; /** * @mixin \App\Models\User From b586caa7aca8511c35643eaf95110111803b6c46 Mon Sep 17 00:00:00 2001 From: Julian Ramirez <90717365+rcomunica@users.noreply.github.com> Date: Thu, 28 Nov 2024 00:03:19 -0500 Subject: [PATCH 06/24] Update Stats.php --- app/Http/Resources/Stats.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Http/Resources/Stats.php b/app/Http/Resources/Stats.php index f04b8d769..7a68d1d00 100644 --- a/app/Http/Resources/Stats.php +++ b/app/Http/Resources/Stats.php @@ -34,10 +34,10 @@ public function toArray($request) ->value('uresult'); return [ - 'balance' => $this->journal->balance->money->getValue() ?? 0, - 'avgScore' => number_format($avgScore) ?? 0, - 'avgLanding' => number_format($avgLanding) ?? 0, - 'avgFuel' => number_format($avgFuel / 2.20462262185) . ' kg' ?? '', + 'balance' => $this->journal->balance->money->getValue() ?? 0, + 'avgScore' => number_format($avgScore) ?? 0, + 'avgLanding' => number_format($avgLanding) ?? 0, + 'avgFuel' => number_format($avgFuel / 2.20462262185) . ' kg' ?? '', ]; } } From 47047da745606a589db43a1ac5242816895e3b49 Mon Sep 17 00:00:00 2001 From: Julian Ramirez <90717365+rcomunica@users.noreply.github.com> Date: Thu, 28 Nov 2024 00:05:28 -0500 Subject: [PATCH 07/24] Update Stats.php --- app/Http/Resources/Stats.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Resources/Stats.php b/app/Http/Resources/Stats.php index 7a68d1d00..8f73e5c8c 100644 --- a/app/Http/Resources/Stats.php +++ b/app/Http/Resources/Stats.php @@ -37,7 +37,7 @@ public function toArray($request) 'balance' => $this->journal->balance->money->getValue() ?? 0, 'avgScore' => number_format($avgScore) ?? 0, 'avgLanding' => number_format($avgLanding) ?? 0, - 'avgFuel' => number_format($avgFuel / 2.20462262185) . ' kg' ?? '', + 'avgFuel' => number_format($avgFuel / 2.20462262185). ' kg' ?? '', ]; } } From da0720fbe0c9d089064b7d06df3acdd08d2397a4 Mon Sep 17 00:00:00 2001 From: Julian Ramirez <90717365+rcomunica@users.noreply.github.com> Date: Thu, 28 Nov 2024 00:06:05 -0500 Subject: [PATCH 08/24] Update Stats.php --- app/Http/Resources/Stats.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Resources/Stats.php b/app/Http/Resources/Stats.php index 8f73e5c8c..4caa9081f 100644 --- a/app/Http/Resources/Stats.php +++ b/app/Http/Resources/Stats.php @@ -37,7 +37,7 @@ public function toArray($request) 'balance' => $this->journal->balance->money->getValue() ?? 0, 'avgScore' => number_format($avgScore) ?? 0, 'avgLanding' => number_format($avgLanding) ?? 0, - 'avgFuel' => number_format($avgFuel / 2.20462262185). ' kg' ?? '', + 'avgFuel' => number_format($avgFuel / 2.20462262185).' kg' ?? '', ]; } } From 662470051fcbf476b7e634388cba4ca979ba7871 Mon Sep 17 00:00:00 2001 From: Julian Ramirez <90717365+rcomunica@users.noreply.github.com> Date: Sun, 1 Dec 2024 01:01:47 -0500 Subject: [PATCH 09/24] Update Stats.php --- app/Http/Resources/Stats.php | 33 +++++++-------------------------- 1 file changed, 7 insertions(+), 26 deletions(-) diff --git a/app/Http/Resources/Stats.php b/app/Http/Resources/Stats.php index 4caa9081f..aa991508e 100644 --- a/app/Http/Resources/Stats.php +++ b/app/Http/Resources/Stats.php @@ -3,9 +3,6 @@ namespace App\Http\Resources; use App\Contracts\Resource; -use App\Models\Enums\PirepSource; -use App\Models\Enums\PirepState; -use Illuminate\Support\Facades\DB; /** * @mixin \App\Models\Stats @@ -14,30 +11,14 @@ class Stats extends Resource { public function toArray($request) { - $avgLanding = DB::table('pireps') - ->selectRaw('avg(landing_rate) as uresult') - ->where('user_id', $this->id) - ->where('source', PirepSource::ACARS)->where('landing_rate', '<', 0) - ->where('state', PirepState::ACCEPTED) - ->value('uresult'); - - $avgFuel = DB::table('pireps') - ->selectRaw('avg(fuel_used) as uresult') - ->where('user_id', $this->id) - ->where('state', PirepState::ACCEPTED) - ->value('uresult'); - - $avgScore = DB::table('pireps') - ->selectRaw('avg(score) as uresult') - ->where('user_id', $this->id) - ->where('state', PirepState::ACCEPTED) - ->value('uresult'); - return [ - 'balance' => $this->journal->balance->money->getValue() ?? 0, - 'avgScore' => number_format($avgScore) ?? 0, - 'avgLanding' => number_format($avgLanding) ?? 0, - 'avgFuel' => number_format($avgFuel / 2.20462262185).' kg' ?? '', + 'flights' => $this->flights, + 'total_time' => $this->flight_time, + 'average_time' => $this->average_flight_time, + 'average_score' => number_format($this->average_score), + 'balance' => $this->balance, + 'average_fuel' => number_format($this->average_fuel_used / 2.20462262185) . " Kg", + 'average_landing' => number_format($this->average_landing_rate), ]; } } From 79dfe587dbb44fe47c2abe9101396d808996945e Mon Sep 17 00:00:00 2001 From: Julian Ramirez <90717365+rcomunica@users.noreply.github.com> Date: Sun, 1 Dec 2024 01:01:57 -0500 Subject: [PATCH 10/24] Update User.php --- app/Http/Resources/User.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/Http/Resources/User.php b/app/Http/Resources/User.php index 9ab394517..dac07b4fe 100644 --- a/app/Http/Resources/User.php +++ b/app/Http/Resources/User.php @@ -35,7 +35,6 @@ public function toArray($request) ]; - $res['stats'] = new Stats(Auth::user()); $res['airline'] = Airline::make($this->whenLoaded('airline')); $res['bids'] = UserBid::collection($this->whenLoaded('bids')); $res['rank'] = Rank::make($this->whenLoaded('rank')); From 877fe53a867cbc9e311e945b96dcbb2d4411ef8c Mon Sep 17 00:00:00 2001 From: Julian Ramirez <90717365+rcomunica@users.noreply.github.com> Date: Sun, 1 Dec 2024 01:02:22 -0500 Subject: [PATCH 11/24] Create StatsController.php --- app/Http/Resources/StatsController.php | 38 ++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 app/Http/Resources/StatsController.php diff --git a/app/Http/Resources/StatsController.php b/app/Http/Resources/StatsController.php new file mode 100644 index 000000000..7ecf29f59 --- /dev/null +++ b/app/Http/Resources/StatsController.php @@ -0,0 +1,38 @@ +id; + $where['state'] = PirepState::ACCEPTED; + $avgStats = ["flight_time", "landing_rate", "fuel_used", "score"]; + $response = []; + + + $response['flights'] = DB::table($table)->selectRaw('count(id) as count')->where($where)->value('count'); + $response["flight_time"] = DB::table($table)->selectRaw('sum(flight_time) as count')->where($where)->value('count'); + + foreach ($avgStats as $static) { + $response['average_' . $static] = DB::table($table)->selectRaw('avg(' . $static . ') as static') + ->where($where) + ->value('static'); + } + + $response['balance'] = Auth::user()->journal->balance->getValue() ?? 0; + return new Stats((object) $response); + } +} From fa7aa6956ca7ad9c81d5fea49577eb684160b863 Mon Sep 17 00:00:00 2001 From: Julian Ramirez <90717365+rcomunica@users.noreply.github.com> Date: Sun, 1 Dec 2024 01:05:55 -0500 Subject: [PATCH 12/24] Update Stats.php --- app/Http/Resources/Stats.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Resources/Stats.php b/app/Http/Resources/Stats.php index aa991508e..c1e592f59 100644 --- a/app/Http/Resources/Stats.php +++ b/app/Http/Resources/Stats.php @@ -17,7 +17,7 @@ public function toArray($request) 'average_time' => $this->average_flight_time, 'average_score' => number_format($this->average_score), 'balance' => $this->balance, - 'average_fuel' => number_format($this->average_fuel_used / 2.20462262185) . " Kg", + 'average_fuel' => number_format($this->average_fuel_used / 2.20462262185)." Kg", 'average_landing' => number_format($this->average_landing_rate), ]; } From de45a73ac61aa3ab6ef469d10964a3a3a25cf88e Mon Sep 17 00:00:00 2001 From: Julian Ramirez <90717365+rcomunica@users.noreply.github.com> Date: Sun, 1 Dec 2024 01:06:59 -0500 Subject: [PATCH 13/24] Update StatsController.php --- app/Http/Resources/StatsController.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/app/Http/Resources/StatsController.php b/app/Http/Resources/StatsController.php index 7ecf29f59..76326c38f 100644 --- a/app/Http/Resources/StatsController.php +++ b/app/Http/Resources/StatsController.php @@ -2,12 +2,13 @@ namespace App\Http\Controllers\Api; -use Illuminate\Support\Facades\DB; + use App\Contracts\Controller; use App\Http\Resources\Stats; +use App\Models\Enums\PirepState; use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; -use App\Models\Enums\PirepState; +use Illuminate\Support\Facades\DB; class StatsController extends Controller { @@ -19,15 +20,15 @@ public function index(Request $request) $where = []; $where['user_id'] = Auth::user()->id; $where['state'] = PirepState::ACCEPTED; - $avgStats = ["flight_time", "landing_rate", "fuel_used", "score"]; + $avgStats = ['flight_time', 'landing_rate', 'fuel_used', 'score']; $response = []; $response['flights'] = DB::table($table)->selectRaw('count(id) as count')->where($where)->value('count'); - $response["flight_time"] = DB::table($table)->selectRaw('sum(flight_time) as count')->where($where)->value('count'); + $response['flight_time'] = DB::table($table)->selectRaw('sum(flight_time) as count')->where($where)->value('count'); foreach ($avgStats as $static) { - $response['average_' . $static] = DB::table($table)->selectRaw('avg(' . $static . ') as static') + $response['average_'.$static] = DB::table($table)->selectRaw('avg('.$static.') as static') ->where($where) ->value('static'); } From a898903b8cedec1c89d615ce92ac5ceb8dbbd619 Mon Sep 17 00:00:00 2001 From: Julian Ramirez <90717365+rcomunica@users.noreply.github.com> Date: Sun, 1 Dec 2024 01:07:11 -0500 Subject: [PATCH 14/24] Update User.php --- app/Http/Resources/User.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/Http/Resources/User.php b/app/Http/Resources/User.php index dac07b4fe..c17e560c8 100644 --- a/app/Http/Resources/User.php +++ b/app/Http/Resources/User.php @@ -3,7 +3,6 @@ namespace App\Http\Resources; use App\Contracts\Resource; -use Illuminate\Support\Facades\Auth; /** * @mixin \App\Models\User From 1c236887714401874c9ba7a1ef0a208b4f2a237e Mon Sep 17 00:00:00 2001 From: Julian Ramirez <90717365+rcomunica@users.noreply.github.com> Date: Sun, 1 Dec 2024 01:08:02 -0500 Subject: [PATCH 15/24] Update StatsController.php --- app/Http/Resources/StatsController.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/Http/Resources/StatsController.php b/app/Http/Resources/StatsController.php index 76326c38f..32074f378 100644 --- a/app/Http/Resources/StatsController.php +++ b/app/Http/Resources/StatsController.php @@ -2,7 +2,6 @@ namespace App\Http\Controllers\Api; - use App\Contracts\Controller; use App\Http\Resources\Stats; use App\Models\Enums\PirepState; @@ -12,8 +11,6 @@ class StatsController extends Controller { - - public function index(Request $request) { $table = 'pireps'; @@ -23,7 +20,6 @@ public function index(Request $request) $avgStats = ['flight_time', 'landing_rate', 'fuel_used', 'score']; $response = []; - $response['flights'] = DB::table($table)->selectRaw('count(id) as count')->where($where)->value('count'); $response['flight_time'] = DB::table($table)->selectRaw('sum(flight_time) as count')->where($where)->value('count'); From 5c2573843cd1549bb13a8ffc1f5789f23facd108 Mon Sep 17 00:00:00 2001 From: Julian Ramirez <90717365+rcomunica@users.noreply.github.com> Date: Sun, 1 Dec 2024 01:08:17 -0500 Subject: [PATCH 16/24] Update Stats.php --- app/Http/Resources/Stats.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Resources/Stats.php b/app/Http/Resources/Stats.php index c1e592f59..4671f821b 100644 --- a/app/Http/Resources/Stats.php +++ b/app/Http/Resources/Stats.php @@ -17,7 +17,7 @@ public function toArray($request) 'average_time' => $this->average_flight_time, 'average_score' => number_format($this->average_score), 'balance' => $this->balance, - 'average_fuel' => number_format($this->average_fuel_used / 2.20462262185)." Kg", + 'average_fuel' => number_format($this->average_fuel_used / 2.20462262185).' Kg', 'average_landing' => number_format($this->average_landing_rate), ]; } From fe6e89cffc42986a552f102e349eda0181bdf5ce Mon Sep 17 00:00:00 2001 From: Julian Ramirez <90717365+rcomunica@users.noreply.github.com> Date: Sun, 1 Dec 2024 17:28:22 -0500 Subject: [PATCH 17/24] Create StatsController.php --- app/Http/Controllers/Api/StatsController.php | 33 ++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 app/Http/Controllers/Api/StatsController.php diff --git a/app/Http/Controllers/Api/StatsController.php b/app/Http/Controllers/Api/StatsController.php new file mode 100644 index 000000000..4d2b308c1 --- /dev/null +++ b/app/Http/Controllers/Api/StatsController.php @@ -0,0 +1,33 @@ +count(); + $response['flight_time'] = Pirep::where($where)->count(); + + foreach ($avgStats as $static) { + $response['average_' . $static] = Pirep::where($where)->avg($static); + } + + $response['balance'] = Auth::user()->journal->balance->getValue() ?? 0; + return new Stats((object) $response); + } +} From 399c69c40a8cd112d1b6c00cc4f67c5d8666b112 Mon Sep 17 00:00:00 2001 From: Julian Ramirez <90717365+rcomunica@users.noreply.github.com> Date: Sun, 1 Dec 2024 17:29:01 -0500 Subject: [PATCH 18/24] Delete app/Http/Resources/StatsController.php --- app/Http/Resources/StatsController.php | 35 -------------------------- 1 file changed, 35 deletions(-) delete mode 100644 app/Http/Resources/StatsController.php diff --git a/app/Http/Resources/StatsController.php b/app/Http/Resources/StatsController.php deleted file mode 100644 index 32074f378..000000000 --- a/app/Http/Resources/StatsController.php +++ /dev/null @@ -1,35 +0,0 @@ -id; - $where['state'] = PirepState::ACCEPTED; - $avgStats = ['flight_time', 'landing_rate', 'fuel_used', 'score']; - $response = []; - - $response['flights'] = DB::table($table)->selectRaw('count(id) as count')->where($where)->value('count'); - $response['flight_time'] = DB::table($table)->selectRaw('sum(flight_time) as count')->where($where)->value('count'); - - foreach ($avgStats as $static) { - $response['average_'.$static] = DB::table($table)->selectRaw('avg('.$static.') as static') - ->where($where) - ->value('static'); - } - - $response['balance'] = Auth::user()->journal->balance->getValue() ?? 0; - return new Stats((object) $response); - } -} From 8bff08f689934dfc7e4d2f554069ec44abd65574 Mon Sep 17 00:00:00 2001 From: Julian Ramirez <90717365+rcomunica@users.noreply.github.com> Date: Sun, 1 Dec 2024 17:30:02 -0500 Subject: [PATCH 19/24] Update RouteServiceProvider.php --- app/Providers/RouteServiceProvider.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index fe214cc6f..f82c3c1d8 100755 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -192,7 +192,7 @@ private function mapWebRoutes() private function mapAdminRoutes() { Route::group([ - 'namespace' => $this->namespace.'\\Admin', + 'namespace' => $this->namespace . '\\Admin', 'prefix' => 'admin', 'as' => 'admin.', 'middleware' => ['web', 'auth', 'ability:admin,admin-access', EnableActivityLogging::class], @@ -573,7 +573,7 @@ private function mapApiRoutes() { Route::group([ 'middleware' => ['api'], - 'namespace' => $this->namespace.'\\Api', + 'namespace' => $this->namespace . '\\Api', 'prefix' => 'api', 'as' => 'api.', ], function () { @@ -660,6 +660,7 @@ private function mapApiRoutes() // This is the info of the user whose token is in use Route::get('user', 'UserController@index'); + Route::get('user/stats', 'StatsController@index'); Route::get('user/fleet', 'UserController@fleet'); Route::get('user/pireps', 'UserController@pireps'); From cea6ee07e8a248040d11fd65eeeffb6e203eb47e Mon Sep 17 00:00:00 2001 From: Julian Ramirez <90717365+rcomunica@users.noreply.github.com> Date: Sun, 1 Dec 2024 17:32:54 -0500 Subject: [PATCH 20/24] FIX CI From 0b49bfd0617abf10ea75da356193556aca8f9409 Mon Sep 17 00:00:00 2001 From: Julian Ramirez <90717365+rcomunica@users.noreply.github.com> Date: Sun, 1 Dec 2024 17:33:35 -0500 Subject: [PATCH 21/24] Update User.php --- app/Http/Resources/User.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/Http/Resources/User.php b/app/Http/Resources/User.php index c17e560c8..954f510a3 100644 --- a/app/Http/Resources/User.php +++ b/app/Http/Resources/User.php @@ -31,7 +31,6 @@ public function toArray($request) 'total_time' => $this->flight_time, 'timezone' => $this->timezone, 'state' => $this->state, - ]; $res['airline'] = Airline::make($this->whenLoaded('airline')); From a4fe7523c4a3fda224bfa50ed0ffb46d6adb32a8 Mon Sep 17 00:00:00 2001 From: Julian Ramirez <90717365+rcomunica@users.noreply.github.com> Date: Sun, 1 Dec 2024 17:39:56 -0500 Subject: [PATCH 22/24] FIX CI 1/2 --- app/Http/Controllers/Api/StatsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Api/StatsController.php b/app/Http/Controllers/Api/StatsController.php index 4d2b308c1..4c2eb4271 100644 --- a/app/Http/Controllers/Api/StatsController.php +++ b/app/Http/Controllers/Api/StatsController.php @@ -24,7 +24,7 @@ public function index(Request $request) $response['flight_time'] = Pirep::where($where)->count(); foreach ($avgStats as $static) { - $response['average_' . $static] = Pirep::where($where)->avg($static); + $response['average_'.$static] = Pirep::where($where)->avg($static); } $response['balance'] = Auth::user()->journal->balance->getValue() ?? 0; From 6a8caa9ee4b4b3b0ddf8a8c25088d2623d4307d6 Mon Sep 17 00:00:00 2001 From: Julian Ramirez <90717365+rcomunica@users.noreply.github.com> Date: Sun, 1 Dec 2024 17:41:03 -0500 Subject: [PATCH 23/24] FIX CI 2/2 --- app/Providers/RouteServiceProvider.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index f82c3c1d8..3a79d73aa 100755 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -192,7 +192,7 @@ private function mapWebRoutes() private function mapAdminRoutes() { Route::group([ - 'namespace' => $this->namespace . '\\Admin', + 'namespace' => $this->namespace.'\\Admin', 'prefix' => 'admin', 'as' => 'admin.', 'middleware' => ['web', 'auth', 'ability:admin,admin-access', EnableActivityLogging::class], @@ -573,7 +573,7 @@ private function mapApiRoutes() { Route::group([ 'middleware' => ['api'], - 'namespace' => $this->namespace . '\\Api', + 'namespace' => $this->namespace.'\\Api', 'prefix' => 'api', 'as' => 'api.', ], function () { From dc0f8e80343ab4f700fefd83ebf2018cd9a5df2c Mon Sep 17 00:00:00 2001 From: Julian Ramirez <90717365+rcomunica@users.noreply.github.com> Date: Sun, 1 Dec 2024 17:43:30 -0500 Subject: [PATCH 24/24] Update StatsController.php --- app/Http/Controllers/Api/StatsController.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/Http/Controllers/Api/StatsController.php b/app/Http/Controllers/Api/StatsController.php index 4c2eb4271..db14d0466 100644 --- a/app/Http/Controllers/Api/StatsController.php +++ b/app/Http/Controllers/Api/StatsController.php @@ -19,7 +19,6 @@ public function index(Request $request) $avgStats = ['flight_time', 'landing_rate', 'fuel_used', 'score']; $response = []; - $response['flights'] = Pirep::where($where)->count(); $response['flight_time'] = Pirep::where($where)->count();