Merge pull request #569 from Muhammad235/refactor/endpoint-for-produc…

…t-categories fix: refactor product categories endpoint
hngprojects · Aug 24, 2024 · 1f95017 · 1f95017
2 parents 682f395 + 8070e4e
commit 1f95017
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 36 deletions.
diff --git a/app/Console/Commands/StoreApiStatus.php b/app/Console/Commands/StoreApiStatus.php
@@ -63,7 +63,7 @@ public function handle()
                 $data = [
                     'api_group' => $item['name'],
                     'method' => $item['request']['method'],
-                    'status' => $status,
+                    'status' => $this->determineStatus($execution),
                     'response_time' => $response_time,
                     'last_checked' => $last_checked,
                     'details' => $this->getDetails($execution)
@@ -92,10 +92,24 @@ private function getDetails($execution)
 
         if ($response_code >= 500 || $response_code === null) {
             return 'API not responding (HTTP ' . ($response_code ?? 'Unknown') . ')';
-        } elseif ($response_time > 400) {
+        } elseif ($response_time > 600) {
             return 'High response time detected';
         } else {
             return 'All tests passed';
         }
     }
+
+    private function determineStatus($execution)
+    {
+        $responseCode = $execution['response']['code'] ?? null;
+        $responseTime = $execution['response']['responseTime'] ?? null;
+
+        if ($responseCode >= 500 || $responseCode === null) {
+            return 'Down';
+        } elseif ($responseTime > 600) {
+            return 'Degraded';
+        } else {
+            return 'Operational';
+        }
+    }
 }
diff --git a/app/Http/Controllers/Api/V1/CategoryController.php b/app/Http/Controllers/Api/V1/CategoryController.php
@@ -12,48 +12,19 @@ class CategoryController extends Controller
     public function index(Request $request)
     {
         try {
-            // Optional query parameters
-            $limit = $request->query('limit', 100);
-            $offset = $request->query('offset', 0);
-            $parent_id = $request->query('parent_id', null);
 
-            // Validate query parameters
-            $request->validate([
-                'limit' => 'integer|min:1',
-                'offset' => 'integer|min:0',
-                'parent_id' => 'integer|nullable',
-            ]);
-
-        $categories = Category::when($parent_id, function ($query) use ($parent_id) {
-            return $query->where('parent_id', $parent_id);
-        })
-        ->limit($limit)
-        ->offset($offset)
-        ->get(['id', 'name', 'description', 'slug', 'parent_id']);
-
-        \Log::info($categories);
+        $categories = Category::all();
 
         return response()->json([
             'status_code' => 200,
-            'categories' => $categories,
+            'message' => 'Categories returned successfully',
+            'data' => $categories,
         ]);
-    } catch (\Illuminate\Validation\ValidationException $e) {
-        return response()->json([
-            'status_code' => 400,
-            'error' => [
-                'code' => 'INVALID_QUERY_PARAMETER',
-                'message' => 'The provided query parameter is invalid.',
-                'details' => [
-                    'invalid_parameter' => $e->validator->errors()->keys()[0],
-                    'reason' => $e->validator->errors()->first(),
-                ],
-            ],
-        ], 400);
-    } catch (\Exception $e) {
+
+    }catch (\Exception $e) {
         return response()->json([
             'status_code' => 500,
             'error' => [
-                'code' => 'INTERNAL_SERVER_ERROR',
                 'message' => 'An unexpected error occurred while processing your request.',
                 'details' => [
                     'support_email' => '[email protected]',