#115 Добавить отложенные публикации (#262)

* Добавлено поле publish_at

* Добавлен global scope PublishedScope для Post

* Добавлен тест для PublishedScope

* Замена использования created_at на publish_at для Post сущностей

* Добавлена проверка $post->publish_at?->isFuture() перед отправкой нотификации

Author: m0nclous

app/Models/Post.php

@@ -7,6 +7,8 @@
 use App\Models\Concerns\Taggable;
 use App\Models\Enums\PostTypeEnum;
 use App\Models\Enums\StatusEnum;
+use App\Models\Scopes\PublishedScope;
+use Illuminate\Database\Eloquent\Attributes\ScopedBy;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
@@ -28,6 +30,7 @@
  *  inherit. The 'type' attribute is used to distinguish between different
  *  post types in the single 'posts' table.
  */
+#[ScopedBy([PublishedScope::class])]
 class Post extends Model
 {
     use AsSource, Chartable, Filterable, HasAuthor, HasFactory, Likeable, LogsActivityFillable, Searchable, Taggable;
@@ -42,17 +45,19 @@ class Post extends Model
         'user_id',
         'type',
         'status',
+        'publish_at',
     ];
 
     /**
      * @var array
      */
     protected $casts = [
-        'title'   => 'string',
-        'content' => 'string',
-        'slug'    => 'string',
-        'type'    => PostTypeEnum::class,
-        'status'  => StatusEnum::class,
+        'title'       => 'string',
+        'content'     => 'string',
+        'slug'        => 'string',
+        'type'        => PostTypeEnum::class,
+        'status'      => StatusEnum::class,
+        'publish_at'  => 'datetime',
     ];
 
     protected $attributes = [
@@ -71,6 +76,7 @@ class Post extends Model
         'title',
         'created_at',
         'updated_at',
+        'publish_at',
     ];
 
     public static function boot()
@@ -94,6 +100,11 @@ public static function boot()
                     return;
                 }
 
+                // Не отправляем нотификацию, если публикация запланирована в будущее
+                if ($post->publish_at?->isFuture()) {
+                    return;
+                }
+
                 TelegramMessage::create()
                     ->to(config('services.telegram-bot-api.channel_id'))
                     ->escapedLine($post->title)

app/Models/Scopes/PublishedScope.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Models\Scopes;
+
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Scope;
+
+class PublishedScope implements Scope
+{
+    public function apply(Builder $builder, Model $model): void
+    {
+        $builder->where('publish_at', '<=', now());
+    }
+}

database/migrations/2025_03_03_153716_add_publish_at_to_posts_table.php

@@ -0,0 +1,41 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        if (Schema::hasColumn('posts', 'publish_at')) {
+            return;
+        }
+
+        Schema::table('posts', function (Blueprint $table) {
+            $table->timestamp('publish_at')->nullable()->useCurrent();
+        });
+
+        // Проставляем publish_at текущим значением created_at
+        // Это нужно для согласованности данных в колонках
+        DB::statement('UPDATE posts SET publish_at = created_at');
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        if (! Schema::hasColumn('posts', 'publish_at')) {
+            return;
+        }
+
+        Schema::table('posts', function (Blueprint $table) {
+            $table->dropColumn('publish_at');
+        });
+    }
+};

resources/views/pages/feed.blade.php

@@ -8,15 +8,15 @@
         <link><![CDATA[{{ config('app.url') }}]]></link>
         <description><![CDATA[{{ config('site.description') }}]]></description>
         <language>{{ config('app.locale') }}</language>
-        <pubDate>{{ $posts->first()?->created_at->toRssString() }}</pubDate>
+        <pubDate>{{ $posts->first()?->publish_at->toRssString() }}</pubDate>
 
         @foreach($posts as $post)
             <item>
                 <title><![CDATA[{{ $post->title }}]]></title>
                 <link>{{ route('post.show', $post) }}</link>
                 {{-- <description><![CDATA[{!! $post->title !!}]]></description> --}}
                 <guid isPermaLink="false">{{ $post->id }}</guid>
-                <pubDate>{{ $post->created_at->toRssString() }}</pubDate>
+                <pubDate>{{ $post->publish_at->toRssString() }}</pubDate>
                 <enclosure url="{{ route('cover', ['text' => $post->title]) }}" length="0" type="image/jpg" />
             </item>
         @endforeach

resources/views/post/list.blade.php

@@ -89,9 +89,9 @@ class="position-absolute start-0 end-0 top-0 bottom-0 z-2"></a>
 
             <time
                 data-controller="tooltip"
-                title="Опубликовано {{ $post->created_at->format('d.m.Y H:i') }}"
+                title="Опубликовано {{ $post->publish_at->format('d.m.Y H:i') }}"
                 class="text-body-secondary ms-auto user-select-none small"
-                datetime="{{ $post->created_at->toISOString() }}">{{ $post->created_at->diffForHumans() }}</time>
+                datetime="{{ $post->publish_at->toISOString() }}">{{ $post->publish_at->diffForHumans() }}</time>
         </div>
     </div>
 @empty

resources/views/post/show.blade.php

@@ -87,10 +87,10 @@ class="position-absolute top-0 end-0 m-4 btn btn-link link-secondary text-decora
 
                         <time
                             data-controller="tooltip"
-                            title="Опубликовано {{ $post->created_at->format('d.m.Y H:i') }}"
+                            title="Опубликовано {{ $post->publish_at->format('d.m.Y H:i') }}"
                             class="text-body-secondary ms-auto user-select-none small"
-                            datetime="{{ $post->created_at->toISOString() }}"
-                            itemprop="datePublished">{{ $post->created_at->diffForHumans() }}</time>
+                            datetime="{{ $post->publish_at->toISOString() }}"
+                            itemprop="datePublished">{{ $post->publish_at->diffForHumans() }}</time>
                     </div>
                 </div>
             </article>

tests/Unit/Models/Scopes/PublishedScopeTest.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace Tests\Unit\Models\Scopes;
+
+use App\Models\Post;
+use App\Models\Scopes\PublishedScope;
+use App\Models\User;
+use Illuminate\Support\Carbon;
+use Tests\TestCase;
+
+class PublishedScopeTest extends TestCase
+{
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $testUser = User::factory()->create();
+
+        Post::factory()->create(['user_id' => $testUser->id, 'publish_at' => Carbon::now()->subDay()]);
+        Post::factory()->create(['user_id' => $testUser->id, 'publish_at' => Carbon::now()]);
+        Post::factory()->create(['user_id' => $testUser->id, 'publish_at' => Carbon::now()->addDay()]);
+        Post::factory()->create(['user_id' => $testUser->id, 'publish_at' => null]);
+    }
+
+    public function testFiltersCorrectlyForPosts(): void
+    {
+        Post::addGlobalScope(new PublishedScope);
+
+        $publishedPosts = Post::all();
+        $this->assertCount(2, $publishedPosts);
+        $this->assertTrue($publishedPosts->first()->publish_at->lessThan(Carbon::now()));
+    }
+}