Merge pull request #12255 from Vitaliy-1/i11912_creator_validate

#11912 Task/Discussion creator should be a participant

Author: Vitaliy-1

api/v1/submissions/tasks/formRequests/AddTask.php

@@ -61,4 +61,9 @@ protected function getStageId(): int
     {
         return (int) $this->input('stageId');
     }
+
+    protected function getCreatorId(): int
+    {
+        return (int) $this->input('createdBy');
+    }
 }

api/v1/submissions/tasks/formRequests/EditTask.php

@@ -160,6 +160,22 @@ function (string $attribute, array $value, Closure $fail) {
                     if ($this->input('type') == EditorialTaskType::DISCUSSION->value && count($value) < 2) {
                         $fail(__('submission.task.validation.error.participants.required'));
                     }
+                },
+
+                // Check if the task creator is among participants
+                function (string $attribute, array $value, Closure $fail) {
+                    $participantIds = Arr::pluck($this->input('participants'), 'userId');
+                    $creatorId = $this->getCreatorId();
+
+                    if ($creatorId === null) {
+                        return true; // We allow absent creator when task is automatically created
+                    }
+
+                    if (!in_array($this->getCreatorId(), $participantIds)) {
+                        return $fail(__('submission.task.validation.error.participant.creator'));
+                    }
+
+                    return true;
                 }
             ],
             EditorialTask::ATTRIBUTE_PARTICIPANTS . '.*' => [
@@ -263,4 +279,9 @@ protected function getStageId(): int
     {
         return $this->task->stageId;
     }
+
+    protected function getCreatorId(): ?int
+    {
+        return $this->task->createdBy;
+    }
 }

locale/en/submission.po

@@ -2327,6 +2327,9 @@ msgstr "You can update this discussion for {$allowedEditTimeNoticeLimit} minutes
 msgid "submission.task.validation.error.participant.responsible"
 msgstr "There should be one user responsible for the task."
 
+msgid "submission.task.validation.error.participant.creator"
+msgstr "The creator must participate in the task/discussion."
+
 msgid "submission.task.validation.error.reviewer.anonymous"
 msgstr "Cannot disclose the identity of reviewers in the task/discussion."