correct PR part2 - edit cache logic

Author: pashaapsky

app/Comment.php

@@ -2,14 +2,17 @@
 
 namespace App;
 
+use App\Traits\CacheModelActions;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 class Comment extends Model
 {
  use HasFactory;
+ use CacheModelActions;
 
  protected $table = 'comments';
+ public static $cacheTags = ['comments', 'news', 'posts'];
 
  protected $guarded = [''];
 

app/Http/Controllers/AdministrationController.php

@@ -27,7 +27,7 @@ public function posts() {
  }
 
  public function news() {
- $news = Cache::tags('news')->remember('news', 3600, function () {
+ $news = Cache::tags(['news', 'index_news'])->remember('news', 3600, function () {
  return News::with(['tags', 'comments'])->latest()->get();
  });
 

app/Http/Controllers/NewsController.php

@@ -27,10 +27,9 @@ public function validateRequest($request, $new)
 
  public function index()
  {
- $news = Cache::tags('news')->remember('news', 3600, function () {
+ $news = Cache::tags(['news', 'index_news'])->remember('news', 3600, function () {
  return News::with(['tags', 'comments'])->latest()->get();
  });
-// $news = News::with(['tags', 'comments'])->latest()->get();
 
  return view('news.index', compact('news'));
  }

app/Http/Controllers/PostsController.php

@@ -31,7 +31,7 @@ public function validateRequest($request, $post)
 
  public function index()
  {
- $posts = Cache::tags('posts')->remember('user_posts|' . auth()->id(), 3600, function () {
+ $posts = Cache::tags(['posts', 'user_posts'])->remember('user_posts|' . auth()->id(), 3600, function () {
  return auth()->user()->posts()->with(['tags', 'comments'])->latest()->get();
  });
 

app/Http/Controllers/StaticPagesController.php

@@ -23,7 +23,7 @@ public function aboutIndex() {
  }
 
  public function statisticsIndex() {
- $statistics = Cache::tags('statistics_data')->remember('statistics_data', 3600, function () {
+ $statistics = Cache::tags(['news', 'posts', 'tags_cloud', 'statistics', 'statistics_data'])->remember('statistics_data', 3600, function () {
  //Общее количество статей
  $postsCount = $this->statisticService->getPostsCount();
 

app/Http/Controllers/TagsController.php

@@ -4,13 +4,20 @@
 
 use App\Tag;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Cache;
 
 class TagsController extends Controller
 {
  public function index(Tag $tag)
  {
- $posts = $tag->posts()->with('tags')->get();
- $news = $tag->news()->with('tags')->get();
+ $posts = Cache::tags(['posts', 'posts_by_tag'])->remember('posts_by_tag', 3600, function () use ($tag) {
+ return $tag->posts()->with('tags')->get();
+ });
+
+ $news = Cache::tags(['news', 'news_by_tag'])->remember('news_by_tag', 3600, function () use ($tag) {
+ return $tag->news()->with('tags')->get();
+ });
+
  return view('layouts.tags.index', compact('posts', 'news'));
  }
 }

app/News.php

@@ -12,7 +12,7 @@ class News extends Model
  use CacheModelActions;
 
  protected $guarded = [];
- public static $cacheTags = ['news', 'latest_news', 'statistics_data', 'tags_cloud'];
+ public static $cacheTags = ['news'];
 
  public function tags()
  {

app/Post.php

@@ -16,7 +16,7 @@ class Post extends Model
  protected $table = 'posts';
  protected $guarded = [];
 
- public static $cacheTags = ['posts', 'latest_published_posts', 'tags_cloud', 'statistics_data'];
+ public static $cacheTags = ['posts'];
 
  protected $dispatchesEvents = [
  'created' => PostCreated::class,

app/Providers/AppServiceProvider.php

@@ -22,7 +22,7 @@ class AppServiceProvider extends ServiceProvider
  public function register()
  {
  view()->composer('layouts.aside-tags', function ($view) {
- $tags = Cache::tags('tags_cloud')->remember('tags_cloud', 3600, function () {
+ $tags = Cache::tags(['posts', 'news', 'tags_cloud'])->remember('tags_cloud', 3600, function () {
  return Tag::whereHas('posts')->orWhereHas('news')->get();
  });
 

app/Tag.php

@@ -2,14 +2,17 @@
 
 namespace App;
 
+use App\Traits\CacheModelActions;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 class Tag extends Model
 {
  use HasFactory;
+ use CacheModelActions;
 
  protected $table = 'tags';
+ public static $cacheTags = ['posts', 'news', 'tags_cloud'];
 
  protected $guarded = [];