Merge pull request #557 from Muhammad235/feat/user-notification

refactor: user notification endpoint

Author: Dev-Tonia

app/Console/Commands/StoreApiStatus.php

@@ -5,6 +5,7 @@
 use DateTime;
 use DateTimeZone;
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Http;
 
 class StoreApiStatus extends Command
 {
@@ -29,7 +30,7 @@ public function handle()
     {
 
         // Get test result from json file
-        $data = file_get_contents(base_path('../result.json'));
+        $data = file_get_contents(base_path('result.json'));
 
         $data = json_decode($data, true);
 
@@ -58,19 +59,29 @@ public function handle()
                 $date = new DateTime("now", new DateTimeZone('Africa/Lagos'));
                 $last_checked = $date->format('Y-m-d h:i A');
 
-                // Update the api status record
-                \App\Models\ApiStatus::updateOrCreate(['api_group' => $item['name']], [
+
+                $data = [
                     'api_group' => $item['name'],
                     'method' => $item['request']['method'],
                     'status' => $status,
                     'response_time' => $response_time,
                     'last_checked' => $last_checked,
-                    'details' => $this->getDetails($execution),
-                ]);
+                    'details' => $this->getDetails($execution)
+                ];
+
+                $url = "https://staging.api-php.boilerplate.hng.tech/api/v1/api-status";
+
+                $response = Http::post($url, $data);
+
+                if ($response->failed()) {
+
+                    return $this->info('Failed to send API status data: '. $response->body());
+                }
+
             }
         }
 
-        $this->info('Api status stored successfully');
+        $this->info('API status data stored successfully: ' . $response->body());
     }
 
 

app/Http/Controllers/Api/V1/ApiStatusCheckerController.php

@@ -2,8 +2,12 @@
 
 namespace App\Http\Controllers\Api\V1;
 
+use DateTime;
+use DateTimeZone;
 use App\Models\ApiStatus;
+use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
+use App\Http\Requests\StoreApiStatusDataRequest;
 
 
 class ApiStatusCheckerController extends Controller
@@ -20,4 +24,37 @@ public function index()
         ]);
     }
 
+    public function store(StoreApiStatusDataRequest $request)
+    {
+
+        $request->validated();
+
+        try {
+            $date = new DateTime("now", new DateTimeZone('Africa/Lagos'));
+            $last_checked = $date->format('Y-m-d h:i A');
+
+            // Update the api status record
+            ApiStatus::updateOrCreate(['api_group' => $request->api_group], [
+                'api_group' => $request->api_group,
+                'method' => $request->method,
+                'status' => $request->status,
+                'response_time' => $request->response_time,
+                'last_checked' => $request->last_checked ?? $last_checked,
+                'details' => $request->details,
+            ]);
+
+            return response()->json([
+                'status_code' => 200,
+                'message' => "Data stored successfully"
+            ], 200);
+
+        } catch (\Exception $e) {
+            return response()->json([
+                'status_code' => 200,
+                'message' => "Server error" . $e->getMessage()
+            ], 500);
+        }
+
+    }
+
 }

app/Http/Controllers/UserNotificationController.php

@@ -59,7 +59,6 @@ public function create(CreateNotificationRequest $request)
 
         // Return 201
         return response()->json([
-            'status' => 'success',
             'message' => 'Notification created successfully',
             'status_code' => 201,
             'data' => [
@@ -115,18 +114,19 @@ public function getByUser(Request $request)
             $isRead = $notification->pivot->status === 'read';
             return [
                 'id' => $notification->id,
-                'message' => $notification->message,
+                'user_id' => auth()->id(),
                 'is_read' => $isRead,
+                'message' => $notification->message,
                 'created_at' => $notification->created_at,
+                'updated_at' => $notification->updated_at,
             ];
         });
 
         //
         $status = $isRead === 'false' ? 'Unread ' : '';
 
         return response()->json([
-            'status' => 'success',
-            'message' => "{$status}Notifications retrieved successfully",
+            'message' => "{$status}Notification retrieved successfully",
             'status_code' => Response::HTTP_OK,
             'data' => [
                 'total_notification_count' => $totalNotificationsCount,

app/Http/Requests/StoreApiStatusDataRequest.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class StoreApiStatusDataRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     */
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
+     */
+    public function rules(): array
+    {
+        return [
+            'api_group' => ['nullable', 'string'],
+            'method' => ['nullable', 'string'],
+            'status' => ['nullable', 'string'],
+            'response_time' => ['nullable'],
+            'last_checked' => ['nullable'],
+            'details' => ['nullable', 'string'],
+        ];
+    }
+}

routes/api.php

@@ -74,6 +74,7 @@
     });
 
     Route::get('/api-status', [ApiStatusCheckerController::class, 'index']);
+    Route::post('/api-status', [ApiStatusCheckerController::class, 'store']);
 
     Route::post('/auth/register', [AuthController::class, 'store']);
     Route::post('/auth/login', [LoginController::class, 'login']);