#9674 Code Review Changes

pkp · Mar 5, 2024 · 27cca1d · 27cca1d
1 parent b79b2f0
commit 27cca1d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 12 deletions.
diff --git a/classes/decision/Repository.php b/classes/decision/Repository.php
@@ -158,15 +158,13 @@ public function validate(array $props, DecisionType $decisionType, Submission $s
             // have at least one assigned editor who can make a decision
             if ($this->isRecommendation($decisionType->getDecision())) {
                 // Replaces StageAssignmentDAO::getDecidingEditorIds
-                $assignedEditorIds = StageAssignment::withSubmissionId($submission->getId())
+                $existingAssignedEditors = StageAssignment::withSubmissionId($submission->getId())
                     ->withStageId($decisionType->getStageId())
                     ->withRoleIds([Role::ROLE_ID_MANAGER, Role::ROLE_ID_SUB_EDITOR])
                     ->withRecommendOnly(false)
-                    ->get()
-                    ->pluck('userId')
-                    ->all();
+                    ->exists();
 
-                if (!$assignedEditorIds) {
+                if (!$existingAssignedEditors) {
                     $validator->errors()->add('decision', __('editor.submission.workflowDecision.requiredDecidingEditor'));
                 }
             }

diff --git a/classes/security/authorization/StageRolePolicy.php b/classes/security/authorization/StageRolePolicy.php
@@ -19,7 +19,6 @@
 
 use APP\core\Application;
 use APP\facades\Repo;
-use PKP\db\DAORegistry;
 use PKP\security\Role;
 use PKP\stageAssignment\StageAssignment;
 

diff --git a/classes/submission/maps/Schema.php b/classes/submission/maps/Schema.php
@@ -363,11 +363,6 @@ public function getPropertyStages(Submission $submission): array
         $request = Application::get()->getRequest();
         $currentUser = $request->getUser();
 
-        // Replaces StageAssignmentDAO::getBySubmissionAndUserIdAndStageId
-        $stageAssignments = StageAssignment::withSubmissionId($submission->getId())
-            ->withUserId($currentUser->getId() ?? 0)
-            ->get();
-
         $queryDao = DAORegistry::getDAO('QueryDAO'); /** @var QueryDAO $queryDao */
         $openPerStage = $queryDao->countOpenPerStage($submission->getId(), [$request->getUser()->getId()]);
 
@@ -383,6 +378,11 @@ public function getPropertyStages(Submission $submission): array
 
             $currentUserAssignedRoles = [];
             if ($currentUser) {
+                // Replaces StageAssignmentDAO::getBySubmissionAndUserIdAndStageId
+                $stageAssignments = StageAssignment::withSubmissionId($submission->getId())
+                    ->withUserId($currentUser->getId() ?? 0)
+                    ->get();
+
                 foreach ($stageAssignments as $stageAssignment) {
                     $userGroup = $this->getUserGroup($stageAssignment->userGroupId);
                     if ($userGroup) {

diff --git a/classes/submission/reviewRound/ReviewRound.php b/classes/submission/reviewRound/ReviewRound.php
@@ -23,7 +23,6 @@
 
 use APP\decision\Decision;
 use APP\facades\Repo;
-use PKP\db\DAORegistry;
 use PKP\security\Role;
 use PKP\stageAssignment\StageAssignment;
 use PKP\submission\reviewAssignment\ReviewAssignment;