Refactor GoogleDriveQuota usage in ServerResource to simplify quota retrieval

Author: laravelwebdev

app/Helpers/GoogleDriveQuota.php

@@ -12,39 +12,34 @@ public static function getQuota(): array
         $clientSecret = config('app.google.client_secret');
         $refreshToken = config('app.google.refresh_token');
 
-        // Step 1: Refresh token -> Access token
+        $used = 0;
+        $total = 0;
+
         $response = Http::asForm()->post('https://oauth2.googleapis.com/token', [
             'client_id' => $clientId,
             'client_secret' => $clientSecret,
             'refresh_token' => $refreshToken,
             'grant_type' => 'refresh_token',
         ]);
 
-        if ($response->failed()) {
-            return [
-                'used_gb' => null,
-                'total_gb' => null,
-                'error' => $response->json(),
-            ];
-        }
-
-        $accessToken = $response->json()['access_token'];
+        if ($response->ok()) {
+            $accessToken = $response->json()['access_token'] ?? null;
+            if ($accessToken) {
+                $about = Http::withToken($accessToken)
+                    ->get('https://www.googleapis.com/drive/v3/about?fields=storageQuota')
+                    ->json();
 
-        // Step 2: Get storage info
-        $about = Http::withToken($accessToken)
-            ->get('https://www.googleapis.com/drive/v3/about?fields=storageQuota')
-            ->json();
+                $limit = $about['storageQuota']['limit'] ?? 0;
+                $usage = $about['storageQuota']['usage'] ?? 0;
 
-        $limit = $about['storageQuota']['limit'] ?? 0;
-        $usage = $about['storageQuota']['usage'] ?? 0;
-
-        // Convert bytes to GB
-        $limitGb = $limit ? round($limit / (1024 ** 3), 2) : 0;
-        $usageGb = $usage ? round($usage / (1024 ** 3), 2) : 0;
+                $total = $limit ? round($limit / (1024 ** 3), 2) : 0;
+                $used = $usage ? round($usage / (1024 ** 3), 2) : 0;
+            }
+        }
 
         return [
-            'used' => $usageGb,
-            'total' => $limitGb,
+            'used' => $used,
+            'total' => $total,
         ];
     }
 }

app/Nova/Metrics/ServerResource.php

@@ -45,8 +45,8 @@ public function calculate(NovaRequest $request): PartitionResult
             // Get used storage from backup info
             $quota = GoogleDriveQuota::getQuota();
 
-            $value = isset($quota['used']) ? $quota['used'] : 0;   // dalam GB
-            $total = isset($quota['total']) ? $quota['total'] : 0; // dalam GB
+            $value = $quota['used'];   // dalam GB
+            $total = $quota['total'];  // dalam GB
         } else {
             $command = $this->type === 'inode'
             ? ['du', '--inodes', '-s']