correct PR #4 edit cache logic

pashaapsky · Nov 6, 2020 · 84ed030 · 84ed030
1 parent 9129fdc
commit 84ed030
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/app/Http/Controllers/AdministrationController.php b/app/Http/Controllers/AdministrationController.php
@@ -19,15 +19,15 @@ public function index() {
     }
 
     public function posts() {
-        $posts = Cache::tags('posts')->remember('posts', 3600, function () {
+        $posts = Cache::tags(['posts', 'tags', 'statistics'])->remember('posts', 3600, function () {
             return Post::with(['tags', 'comments'])->latest()->get();
         });
 
         return view('/admin.posts', compact('posts'));
     }
 
     public function news() {
-        $news = Cache::tags('news')->remember('news', 3600, function () {
+        $news = Cache::tags(['news', 'tags', 'statistics'])->remember('news', 3600, function () {
             return News::with(['tags', 'comments'])->latest()->get();
         });
 

diff --git a/app/Http/Controllers/NewsController.php b/app/Http/Controllers/NewsController.php
@@ -27,7 +27,7 @@ public function validateRequest($request, $new)
 
     public function index()
     {
-        $news = Cache::tags(['news'])->remember('news', 3600, function () {
+        $news = Cache::tags(['news', 'tags', 'statistics'])->remember('news', 3600, function () {
            return News::with(['tags', 'comments'])->latest()->get();
         });
 
@@ -60,6 +60,10 @@ public function store(Request $request)
 
     public function show(News $new)
     {
+        $new = Cache::tags(['news', 'tags', 'statistics'])->remember('new|' . $new->id, 3600, function () use ($new) {
+            return $new;
+        });
+
         return view('news.show', compact('new'));
     }
 

diff --git a/app/Http/Controllers/PostsController.php b/app/Http/Controllers/PostsController.php
@@ -31,7 +31,7 @@ public function validateRequest($request, $post)
 
     public function index()
     {
-        $posts = Cache::tags(['posts', 'user_posts'])->remember('user_posts|' . auth()->id(), 3600, function () {
+        $posts = Cache::tags(['posts', 'tags', 'statistics', 'user_posts'])->remember('user_posts|' . auth()->id(), 3600, function () {
            return auth()->user()->posts()->with(['tags', 'comments'])->latest()->get();
         });
 
@@ -74,6 +74,10 @@ public function show(Post $post)
     {
         $this->authorize('view', $post);
 
+        $post = Cache::tags(['posts', 'tags', 'statistics'])->remember('post|' . $post->id, 3600, function () use ($post) {
+           return $post;
+        });
+
         return view('/posts.show', compact('post'));
     }
 

diff --git a/routes/web.php b/routes/web.php
@@ -7,11 +7,11 @@
 use Illuminate\Support\Facades\Route;
 
 Route::get('/', function () {
-    $posts = Cache::tags(['posts', 'latest_publish_posts'])->remember('latest_publish_posts', 3600, function () {
+    $posts = Cache::tags(['posts', 'tags', 'statistics', 'latest_publish_posts'])->remember('latest_publish_posts', 3600, function () {
         return Post::with('tags')->where('published', 1)->latest()->take(4)->get();
     });
 
-    $news = Cache::tags(['news', 'latest_news'])->remember('latest_news', 3600, function () {
+    $news = Cache::tags(['news', 'tags', 'statistics', 'latest_news'])->remember('latest_news', 3600, function () {
         return News::with('tags')->latest()->take(3)->get();
     });