addded column system for labels and delete some redundant code in tas…

…k.index
vladimir-xz · Sep 5, 2024 · 502441c · 502441c
1 parent 2e8547f
commit 502441c
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 7 deletions.
diff --git a/app/Http/Controllers/TaskController.php b/app/Http/Controllers/TaskController.php
@@ -45,7 +45,7 @@ public function create(Task $task)
     {
         $usersByIds = Utils::groupByIdWithName(User::all());
         $statusesByIds = Utils::groupByIdWithName(TaskStatus::all());
-        $labelsById = Utils::groupByIdWithName(Label::all());
+        $labelsById = Utils::groupByIdWithName(Label::where('system', false)->get());
 
         return view('tasks.create', compact('task', 'usersByIds', 'statusesByIds', 'labelsById'));
     }

diff --git a/app/Models/Task.php b/app/Models/Task.php
@@ -43,7 +43,7 @@ public function assignedTo(): BelongsTo
 
     public function labels(): BelongsToMany
     {
-        return $this->belongsToMany(Label::class);
+        return $this->belongsToMany(Label::class)->where('system', false);
     }
 
     public function comments(): HasMany

diff --git a/database/migrations/2024_09_05_105246_add_column_system_to_labels_table.php b/database/migrations/2024_09_05_105246_add_column_system_to_labels_table.php
@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('labels', function (Blueprint $table) {
+            $table->boolean('system')->default(false);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('labels', function (Blueprint $table) {
+            $table->dropColumn('system');
+        });
+    }
+};
diff --git a/database/seeders/LabelSeeder.php b/database/seeders/LabelSeeder.php
@@ -27,11 +27,13 @@ public function run(): void
         ]);
         Label::firstOrCreate([
             'name' => 'error',
-            'description' => 'Произошла ошибка'
+            'description' => 'Произошла ошибка',
+            'system' => true
         ]);
         Label::firstOrCreate([
             'name' => 'new response',
-            'description' => 'Новое сообщение'
+            'description' => 'Новое сообщение',
+            'system' => true
         ]);
     }
 }
diff --git a/resources/views/tasks/index.blade.php b/resources/views/tasks/index.blade.php
@@ -67,9 +67,7 @@
                         @endif
 
                         @if ($task->notifications()->exists())
-                            @php $newMessage = $task->notifications->first(fn ($notif) => $notif->label->name === 'new response' && $notif->recipient == Auth::user())
-                            @endphp
-                            @if ($newMessage)
+                            @if ($newMessage = $task->notifications()->where('user_id', Auth::user()?->id)->first())
                             <x-label :withIcon='false'>
                                 {{ $newMessage->label->name }}
                             </x-label>