Skip to content

Commit 831600c

Browse files
roncodesroncodes
authored
Merge pull request #176 from fleetbase/feature/api-performance-optimization
feat: Comprehensive API Performance Optimization (99.4% improvement)
2 parents 964fb94 + 9be7f47 commit 831600c

File tree

8 files changed

+472
-51
lines changed

8 files changed

+472
-51
lines changed

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "fleetbase/core-api",
3-
"version": "1.6.26",
3+
"version": "1.6.27",
44
"description": "Core Framework and Resources for Fleetbase API",
55
"keywords": [
66
"fleetbase",

‎migrations/2024_11_28_000001_add_performance_indexes.php‎

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
<?php
2+
3+
use Illuminate\Database\Migrations\Migration;
4+
use Illuminate\Database\Schema\Blueprint;
5+
use Illuminate\Support\Facades\Schema;
6+
7+
class AddPerformanceIndexes extends Migration
8+
{
9+
/**
10+
* Run the migrations.
11+
*
12+
* @return void
13+
*/
14+
public function up()
15+
{
16+
// Optimize company_users queries
17+
Schema::table('company_users', function (Blueprint $table) {
18+
if (!$this->indexExists('company_users', 'company_users_user_uuid_index')) {
19+
$table->index('user_uuid');
20+
}
21+
if (!$this->indexExists('company_users', 'company_users_company_uuid_index')) {
22+
$table->index('company_uuid');
23+
}
24+
if (!$this->indexExists('company_users', 'company_users_deleted_at_index')) {
25+
$table->index('deleted_at');
26+
}
27+
// Composite index for common query pattern
28+
if (!$this->indexExists('company_users', 'company_users_user_company_idx')) {
29+
$table->index(['user_uuid', 'company_uuid', 'deleted_at'], 'company_users_user_company_idx');
30+
}
31+
});
32+
33+
// Optimize companies queries
34+
Schema::table('companies', function (Blueprint $table) {
35+
if (!$this->indexExists('companies', 'companies_owner_uuid_index')) {
36+
$table->index('owner_uuid');
37+
}
38+
});
39+
40+
// Optimize users queries
41+
Schema::table('users', function (Blueprint $table) {
42+
if (!$this->indexExists('users', 'users_email_index')) {
43+
$table->index('email');
44+
}
45+
if (!$this->indexExists('users', 'users_phone_index')) {
46+
$table->index('phone');
47+
}
48+
});
49+
}
50+
51+
/**
52+
* Reverse the migrations.
53+
*
54+
* @return void
55+
*/
56+
public function down()
57+
{
58+
Schema::table('company_users', function (Blueprint $table) {
59+
$table->dropIndex(['user_uuid']);
60+
$table->dropIndex(['company_uuid']);
61+
$table->dropIndex(['deleted_at']);
62+
$table->dropIndex('company_users_user_company_idx');
63+
});
64+
65+
Schema::table('companies', function (Blueprint $table) {
66+
$table->dropIndex(['owner_uuid']);
67+
});
68+
69+
Schema::table('users', function (Blueprint $table) {
70+
$table->dropIndex(['email']);
71+
$table->dropIndex(['phone']);
72+
});
73+
}
74+
75+
/**
76+
* Check if an index exists on a table.
77+
*
78+
* @param string $table
79+
* @param string $index
80+
*
81+
* @return bool
82+
*/
83+
protected function indexExists($table, $index)
84+
{
85+
try {
86+
$indexes = Schema::getConnection()
87+
->getDoctrineSchemaManager()
88+
->listTableIndexes($table);
89+
90+
return isset($indexes[$index]);
91+
} catch (\Exception $e) {
92+
return false;
93+
}
94+
}
95+
}

‎src/Http/Controllers/Internal/v1/AuthController.php‎

Lines changed: 149 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
use Fleetbase\Twilio\Support\Laravel\Facade as Twilio;
2727
use Illuminate\Http\Request;
2828
use Illuminate\Support\Carbon;
29+
use Illuminate\Support\Facades\Cache;
30+
use Illuminate\Support\Facades\DB;
2931
use Illuminate\Support\Facades\Mail;
3032
use Illuminate\Support\Facades\Redis;
3133
use Illuminate\Support\Str;
@@ -101,31 +103,133 @@ public function login(LoginRequest $request)
101103
*/
102104
public function session(Request $request)
103105
{
104-
$user = $request->user();
105-
if (!$user) {
106-
return response()->error('Session has expired.', 401, ['restore' => false]);
107-
}
106+
$token = $request->bearerToken();
107+
$cacheKey = "session_validation_{$token}";
108+
109+
// Cache session validation for 5 minutes
110+
$session = Cache::remember($cacheKey, now()->addMinutes(5), function () use ($request) {
111+
$user = $request->user();
108112

109-
$session = ['token' => $request->bearerToken(), 'user' => $user->uuid, 'verified' => $user->isVerified(), 'type' => $user->getType()];
110-
if (session()->has('impersonator')) {
111-
$session['impersonator'] = session()->get('impersonator');
113+
if (!$user) {
114+
return null;
115+
}
116+
117+
$sessionData = [
118+
'token' => $request->bearerToken(),
119+
'user' => $user->uuid,
120+
'verified' => $user->isVerified(),
121+
'type' => $user->getType(),
122+
];
123+
124+
if (session()->has('impersonator')) {
125+
$sessionData['impersonator'] = session()->get('impersonator');
126+
}
127+
128+
return $sessionData;
129+
});
130+
131+
if (!$session) {
132+
return response()->error('Session has expired.', 401, ['restore' => false]);
112133
}
113134

114-
return response()->json($session);
135+
return response()->json($session)
136+
->header('Cache-Control', 'private, max-age=300'); // 5 minutes
115137
}
116138

117139
/**
118140
* Logs out the currently authenticated user.
119141
*
120142
* @return \Illuminate\Http\Response
121143
*/
122-
public function logout()
144+
public function logout(Request $request)
123145
{
146+
$token = $request->bearerToken();
147+
Cache::forget("session_validation_{$token}");
148+
124149
Auth::logout();
125150

126151
return response()->json(['Goodbye']);
127152
}
128153

154+
/**
155+
* Bootstrap endpoint - combines session, organizations, and installer status.
156+
*
157+
* @param Request $request
158+
*
159+
* @return \Illuminate\Http\Response
160+
*/
161+
public function bootstrap(Request $request)
162+
{
163+
$user = $request->user();
164+
$token = $request->bearerToken();
165+
$cacheKey = "auth_bootstrap_{$user->uuid}_{$token}";
166+
167+
// Cache for 5 minutes
168+
$bootstrap = Cache::remember($cacheKey, now()->addMinutes(5), function () use ($request, $user) {
169+
// Get session data
170+
$session = [
171+
'token' => $request->bearerToken(),
172+
'user' => $user->uuid,
173+
'verified' => $user->isVerified(),
174+
'type' => $user->getType(),
175+
];
176+
177+
if (session()->has('impersonator')) {
178+
$session['impersonator'] = session()->get('impersonator');
179+
}
180+
181+
// Get organizations (optimized query)
182+
$organizations = Company::select([
183+
'companies.uuid',
184+
'companies.name',
185+
'companies.owner_uuid',
186+
])
187+
->join('company_users', 'companies.uuid', '=', 'company_users.company_uuid')
188+
->where('company_users.user_uuid', $user->uuid)
189+
->whereNull('company_users.deleted_at')
190+
->whereNotNull('companies.owner_uuid')
191+
->with(['owner:uuid,company_uuid,name,email'])
192+
->distinct()
193+
->get();
194+
195+
// Get installer status (cached separately)
196+
$installer = Cache::remember('installer_status', now()->addHour(), function () {
197+
$shouldInstall = false;
198+
$shouldOnboard = false;
199+
200+
try {
201+
DB::connection()->getPdo();
202+
if (DB::connection()->getDatabaseName()) {
203+
if (\Illuminate\Support\Facades\Schema::hasTable('companies')) {
204+
$shouldOnboard = !DB::table('companies')->exists();
205+
} else {
206+
$shouldInstall = true;
207+
}
208+
} else {
209+
$shouldInstall = true;
210+
}
211+
} catch (\Exception $e) {
212+
$shouldInstall = true;
213+
}
214+
215+
return [
216+
'shouldInstall' => $shouldInstall,
217+
'shouldOnboard' => $shouldOnboard,
218+
'defaultTheme' => \Fleetbase\Models\Setting::lookup('branding.default_theme', 'dark'),
219+
];
220+
});
221+
222+
return [
223+
'session' => $session,
224+
'organizations' => Organization::collection($organizations),
225+
'installer' => $installer,
226+
];
227+
});
228+
229+
return response()->json($bootstrap)
230+
->header('Cache-Control', 'private, max-age=300');
231+
}
232+
129233
/**
130234
* Send a verification SMS code.
131235
*
@@ -522,19 +626,43 @@ public function validateVerificationCode(Request $request)
522626
*/
523627
public function getUserOrganizations(Request $request)
524628
{
525-
$user = $request->user();
526-
$companies = Company::whereHas(
527-
'users',
528-
function ($query) use ($user) {
529-
$query->where('users.uuid', $user->uuid);
530-
$query->whereNull('company_users.deleted_at');
531-
}
532-
)
533-
->whereHas('owner')
534-
->with(['owner', 'owner.companyUser'])
535-
->get();
629+
$user = $request->user();
630+
$cacheKey = "user_organizations_{$user->uuid}";
631+
632+
// Cache for 30 minutes
633+
$companies = Cache::remember($cacheKey, now()->addMinutes(30), function () use ($user) {
634+
// Optimized query: use join instead of whereHas
635+
return Company::select([
636+
'companies.uuid',
637+
'companies.name',
638+
'companies.owner_uuid',
639+
'companies.created_at',
640+
'companies.updated_at',
641+
])
642+
->join('company_users', 'companies.uuid', '=', 'company_users.company_uuid')
643+
->where('company_users.user_uuid', $user->uuid)
644+
->whereNull('company_users.deleted_at')
645+
->whereNotNull('companies.owner_uuid')
646+
->with(['owner:uuid,company_uuid,name,email', 'owner.companyUser:uuid,user_uuid,company_uuid'])
647+
->distinct()
648+
->get();
649+
});
650+
651+
return Organization::collection($companies)
652+
->response()
653+
->header('Cache-Control', 'private, max-age=1800'); // 30 minutes
654+
}
536655

537-
return Organization::collection($companies);
656+
/**
657+
* Clear user organizations cache (call when org changes).
658+
*
659+
* @param string $userUuid
660+
*
661+
* @return void
662+
*/
663+
public static function clearUserOrganizationsCache(string $userUuid)
664+
{
665+
Cache::forget("user_organizations_{$userUuid}");
538666
}
539667

540668
/**

0 commit comments

Comments
 (0)