From f69407e6e4e7eb9e198c4c2c61dcd000ee2dfce7 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sat, 6 Apr 2019 22:56:21 -0600 Subject: [PATCH] Update BaseApiController, remove caching --- app/Http/Controllers/Api/BaseApiController.php | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/app/Http/Controllers/Api/BaseApiController.php b/app/Http/Controllers/Api/BaseApiController.php index 3b4162423..8caef3868 100644 --- a/app/Http/Controllers/Api/BaseApiController.php +++ b/app/Http/Controllers/Api/BaseApiController.php @@ -56,17 +56,13 @@ class BaseApiController extends Controller public function notifications(Request $request) { $pid = Auth::user()->profile->id; - $page = $request->input('page') ?? 1; - $res = Cache::remember('profile:notifications:'.$pid.':page:'.$page, now()->addMinutes(5), function() use($pid) { - $timeago = Carbon::now()->subMonths(6); - $notifications = Notification::whereHas('actor') - ->whereProfileId($pid) - ->whereDate('created_at', '>', $timeago) - ->orderBy('created_at','desc') - ->paginate(10); - $resource = new Fractal\Resource\Collection($notifications, new NotificationTransformer()); - return $this->fractal->createData($resource)->toArray(); - }); + $timeago = Carbon::now()->subMonths(6); + $notifications = Notification::whereProfileId($pid) + ->whereDate('created_at', '>', $timeago) + ->orderBy('created_at','desc') + ->paginate(10); + $resource = new Fractal\Resource\Collection($notifications, new NotificationTransformer()); + $res = $this->fractal->createData($resource)->toArray(); return response()->json($res); }