#24 - news (#39)

* #24 - news draft

* #24 - news pagination

* #24 - composer update

* #24 - gha php bump

* #24 - code review changes

* #24 - lintf

* #24 - lintf

* #24 - sanitizeHtml

* #24 - csf

* #24 - conflicts

.github/workflows/test-and-lint-php.yml

@@ -49,7 +49,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # 2.31.1
         with:
-          php-version: 8.2
+          php-version: 8.3
           extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_pgsql, intl
           coverage: none
 

app/Http/Controllers/Public/NewsController.php

@@ -5,14 +5,30 @@
 namespace App\Http\Controllers\Public;
 
 use App\Http\Controllers\Controller;
+use App\Models\News;
 use Inertia\Response;
 
 class NewsController extends Controller
 {
-    public function __invoke(): Response
+    public function index(): Response
     {
-        return inertia("Public/News", [
-            "title" => "mgr inż.",
+        $news = News::query()
+            ->orderBy("published_at", "desc")
+            ->paginate(9);
+
+        return inertia("Public/News/Index", [
+            "paginator" => $news,
+        ]);
+    }
+
+    public function get(string $slug): Response
+    {
+        $news = News::query()
+            ->where("slug", $slug)
+            ->sole();
+
+        return inertia("Public/News/News", [
+            "news" => $news,
         ]);
     }
 }

app/Models/GradeColumn.php

@@ -6,6 +6,7 @@
 
 use App\Observers\GradeColumnObserver;
 use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Attributes\ObservedBy;
 use Illuminate\Database\Eloquent\Concerns\HasUlids;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
@@ -23,6 +24,7 @@
  * @property-read Group $group
  * @property-read Collection<Grade> $grades
  */
+#[ObservedBy(GradeColumnObserver::class)]
 class GradeColumn extends Model
 {
     use HasFactory;
@@ -46,9 +48,4 @@ public function grades(): HasMany
     {
         return $this->hasMany(Grade::class);
     }
-
-    protected static function booted(): void
-    {
-        self::observe(GradeColumnObserver::class);
-    }
 }

app/Models/News.php

@@ -4,7 +4,9 @@
 
 namespace App\Models;
 
+use App\Observers\NewsObserver;
 use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Attributes\ObservedBy;
 use Illuminate\Database\Eloquent\Concerns\HasUlids;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
@@ -16,6 +18,7 @@
  * @property string $content
  * @property Carbon $published_at
  */
+#[ObservedBy(NewsObserver::class)]
 class News extends Model
 {
     use HasFactory;

app/Observers/NewsObserver.php

@@ -0,0 +1,45 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Observers;
+
+use App\Models\News;
+use Illuminate\Support\Str;
+
+class NewsObserver
+{
+    public function creating(News $news): void
+    {
+        if ($news->slug) {
+            return;
+        }
+
+        $slug = Str::slug($news->published_at->format("Y-m-d") . " " . $news->title);
+
+        if (!$this->checkIfSlugExists($slug)) {
+            $news->slug = $slug;
+
+            return;
+        }
+
+        $i = 2;
+
+        while (true) {
+            $newSlug = Str::slug($slug . " " . $i);
+
+            if (!$this->checkIfSlugExists($newSlug)) {
+                $news->slug = $newSlug;
+
+                return;
+            }
+
+            $i++;
+        }
+    }
+
+    protected function checkIfSlugExists(string $slug): bool
+    {
+        return News::query()->where("slug", $slug)->count() > 0;
+    }
+}

composer.json

@@ -6,7 +6,7 @@
     "keywords": ["framework", "laravel"],
     "license": "MIT",
     "require": {
-        "php": "^8.2",
+        "php": "^8.3",
         "ext-pdo": "*",
         "fakerphp/faker": "^1.23.1",
         "guzzlehttp/guzzle": "^7.9.2",

config/app.php

@@ -8,7 +8,7 @@
     "debug" => (bool)env("APP_DEBUG", false),
     "url" => env("APP_URL", "http://localhost"),
     "asset_url" => env("ASSET_URL"),
-    "timezone" => env("APP_TIMEZONE", "UTC"),
+    "timezone" => env("APP_TIMEZONE", "Europe/Warsaw"),
     "locale" => "pl",
     "fallback_locale" => "en",
     "faker_locale" => "pl",

database/factories/NewsFactory.php

@@ -4,21 +4,27 @@
 
 namespace Database\Factories;
 
-use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Factories\Factory;
-use Illuminate\Support\Str;
 
 class NewsFactory extends Factory
 {
+    protected const array NEWS_TITLES = [
+        "Odwołane zajęcia",
+        "Przeniesione zajęcia",
+        "Nieobecność",
+        "Początek roku akademickiego",
+        "Koniec roku akademickiego",
+        "Terminy egzaminów",
+    ];
+
     public function definition(): array
     {
-        $title = fake()->unique()->name();
+        $title = fake()->randomElement(static::NEWS_TITLES);
 
         return [
             "title" => $title,
-            "slug" => Str::slug($title),
             "content" => fake()->realText(),
-            "published_at" => Carbon::now(),
+            "published_at" => fake()->dateTimeThisYear(),
         ];
     }
 }

database/seeders/DemoSeeder.php

@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Database\Seeders;
+
+use App\Models\News;
+use Illuminate\Database\Seeder;
+
+class DemoSeeder extends Seeder
+{
+    public function run(): void
+    {
+        News::factory(20)->create();
+    }
+}

lang/pl/validation.php

@@ -129,6 +129,7 @@
         "university_name" => "nazwa uczelni",
         "department_name" => "nazwa wydziału",
         "title" => "tytuł",
+        "content" => "treść",
         "value" => "opis",
     ],
 ];