Update BaseApiController

app/Http/Controllers/Api/BaseApiController.php

@@ -49,26 +49,18 @@ class BaseApiController extends Controller
     {
         abort_if(!$request->user(), 403);
         $pid = $request->user()->profile_id;
-        $pg = $request->input('pg');
+        $this->validate($request, [
-        if($pg == true) {
+            'page' => 'nullable|integer|min:1|max:10',
-            $timeago = Carbon::now()->subMonths(6);
+            'limit' => 'nullable|integer|min:1|max:40'
-            $notifications = Notification::whereProfileId($pid)
+        ]);
-                ->whereDate('created_at', '>', $timeago)
+        $limit = $request->input('limit') ?? 10;
-                ->latest()
+        $timeago = Carbon::now()->subMonths(6);
-                ->simplePaginate(10);
+        $notifications = Notification::whereProfileId($pid)
-            $resource = new Fractal\Resource\Collection($notifications, new NotificationTransformer());
+            ->whereDate('created_at', '>', $timeago)
-            $res = $this->fractal->createData($resource)->toArray();
+            ->latest()
-        } else {
+            ->simplePaginate($limit);
-            $this->validate($request, [
+        $resource = new Fractal\Resource\Collection($notifications, new NotificationTransformer());
-                'page' => 'nullable|integer|min:1|max:10',
+        $res = $this->fractal->createData($resource)->toArray();
-                'limit' => 'nullable|integer|min:1|max:40'
-            ]);
-            $limit = $request->input('limit') ?? 10;
-            $page = $request->input('page') ?? 1;
-            $end = (int) $page * $limit;
-            $start = (int) $end - $limit;
-            $res = NotificationService::get($pid, $start, $end);
-        }
 
         return response()->json($res);
     }