can create same name task as was deleted

vladimir-xz · Sep 5, 2024 · 47f567a · 47f567a
1 parent f187641
commit 47f567a
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/app/Http/Requests/TaskRequest.php b/app/Http/Requests/TaskRequest.php
@@ -23,7 +23,7 @@ public function rules(): array
                 'required',
                 'string',
                 'max:255',
-                Rule::unique('tasks')->ignore($this->route()?->parameter('task')),
+                Rule::unique('tasks')->withoutTrashed()->ignore($this->route()?->parameter('task')),
             ]
         ];
     }

diff --git a/app/Services/TaskNotification/NotificationFactory.php b/app/Services/TaskNotification/NotificationFactory.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Services\TaskNotification;
+
+use App\Models\TaskNotification;
+
+class NotificationFactory
+{
+    public function create()
+    {
+        return new TaskNotification();
+    }
+}
diff --git a/app/Services/TaskNotification/TaskNotificationService.php b/app/Services/TaskNotification/TaskNotificationService.php
@@ -12,11 +12,13 @@ class TaskNotificationService
 {
     protected Task $task;
     protected ?TaskComment $comment;
+    protected NotificationFactory $factory;
 
-    public function __construct()
+    public function __construct(NotificationFactory $notFactory)
     {
         $this->task = request('task', null);
         $this->comment = request('comment', null);
+        $this->factory = $notFactory;
     }
 
     public function retrieveWithDelete()
@@ -56,7 +58,7 @@ public function storeSeveral(string $labelName, array $recipientsIds = [], ?Task
                     return $carry;
                 }
 
-                $notification = new TaskNotification();
+                $notification = $this->factory->create();
                 $notification->comment()->associate($comment);
                 $notification->recipient()->associate($userId);
                 $notification->label()->associate($label);