Merge pull request #11285 from Vitaliy-1/stable-3_5_0-i11252

Vitaliy-1 · web-flow · commit 51fb604c158f · 2025-04-22T23:33:32.000+03:00
#11252 Show only reviews in the last round in action-required view
diff --git a/api/v1/_submissions/PKPBackendSubmissionsController.php b/api/v1/_submissions/PKPBackendSubmissionsController.php
@@ -368,7 +368,7 @@ public function getReviewAssignments(Request $illuminateRequest): JsonResponse
         }
         $currentUser = $request->getUser();
         $collector = Repo::reviewAssignment()->getCollector()
-            ->filterByReviewerIds([$currentUser->getId()])
+            ->filterByReviewerIds([$currentUser->getId()], true)
             ->filterByContextIds([$context->getId()]);
 
         foreach ($illuminateRequest->query() as $param => $val) {
@@ -391,6 +391,9 @@ public function getReviewAssignments(Request $illuminateRequest): JsonResponse
                 case 'published':
                     $collector->filterByPublished(true);
                     break;
+                case 'allReviewRounds':
+                    $collector->filterByReviewerIds([$currentUser->getId()]);
+                    break;
             }
         }
 
diff --git a/classes/submission/Repository.php b/classes/submission/Repository.php
@@ -1095,7 +1095,7 @@ protected function mapDashboardViews(Collection $types, Context $context, User $
                         ->filterByStatus([PKPSubmission::STATUS_QUEUED]);
                     return new DashboardView(
                         $key,
-                        in_array(Role::ROLE_ID_AUTHOR, $selectedRoleIds) ? __('submission.list.revisionsSubmitted')  : __('submission.dashboard.view.revisionsSubmitted'),
+                        in_array(Role::ROLE_ID_AUTHOR, $selectedRoleIds) ? __('submission.list.revisionsSubmitted') : __('submission.dashboard.view.revisionsSubmitted'),
                         [Role::ROLE_ID_SITE_ADMIN, Role::ROLE_ID_MANAGER, Role::ROLE_ID_SUB_EDITOR, Role::ROLE_ID_ASSISTANT, Role::ROLE_ID_AUTHOR],
                         $canAccessUnassignedSubmission
                             ? $collector
@@ -1121,7 +1121,7 @@ protected function mapDashboardViews(Collection $types, Context $context, User $
                         __('submission.dashboard.view.reviewAssignments.actionRequired'),
                         [Role::ROLE_ID_REVIEWER],
                         Repo::reviewAssignment()->getCollector()
-                            ->filterByReviewerIds([$user->getId()])
+                            ->filterByReviewerIds([$user->getId()], true)
                             ->filterByContextIds([$context->getId()])
                             ->filterByActionRequiredByReviewer(true),
                         'reviewerAssignments',
@@ -1133,7 +1133,7 @@ protected function mapDashboardViews(Collection $types, Context $context, User $
                         __('submission.dashboard.view.reviewAssignments.all'),
                         [Role::ROLE_ID_REVIEWER],
                         Repo::reviewAssignment()->getCollector()
-                            ->filterByReviewerIds([$user->getId()])
+                            ->filterByReviewerIds([$user->getId()], true)
                             ->filterByContextIds([$context->getId()])
                             ->filterByActive(true),
                         'reviewerAssignments',
@@ -1145,7 +1145,7 @@ protected function mapDashboardViews(Collection $types, Context $context, User $
                         __('submission.dashboard.view.reviewAssignments.completed'),
                         [Role::ROLE_ID_REVIEWER],
                         Repo::reviewAssignment()->getCollector()
-                            ->filterByReviewerIds([$user->getId()])
+                            ->filterByReviewerIds([$user->getId()], true)
                             ->filterByContextIds([$context->getId()])
                             ->filterByCompleted(true),
                         'reviewerAssignments',
@@ -1157,7 +1157,7 @@ protected function mapDashboardViews(Collection $types, Context $context, User $
                         __('submission.dashboard.view.reviewAssignments.published'),
                         [Role::ROLE_ID_REVIEWER],
                         Repo::reviewAssignment()->getCollector()
-                            ->filterByReviewerIds([$user->getId()])
+                            ->filterByReviewerIds([$user->getId()], true)
                             ->filterByContextIds([$context->getId()])
                             ->filterByPublished(true),
                         'reviewerAssignments',
@@ -1169,7 +1169,7 @@ protected function mapDashboardViews(Collection $types, Context $context, User $
                         __('submission.dashboard.view.reviewAssignments.archived'),
                         [Role::ROLE_ID_REVIEWER],
                         Repo::reviewAssignment()->getCollector()
-                            ->filterByReviewerIds([$user->getId()])
+                            ->filterByReviewerIds([$user->getId()], true)
                             ->filterByContextIds([$context->getId()])
                             ->filterByIsArchived(true),
                         'reviewerAssignments',
@@ -1181,7 +1181,7 @@ protected function mapDashboardViews(Collection $types, Context $context, User $
                         __('submission.dashboard.view.reviewAssignments.declined'),
                         [Role::ROLE_ID_REVIEWER],
                         Repo::reviewAssignment()->getCollector()
-                            ->filterByReviewerIds([$user->getId()])
+                            ->filterByReviewerIds([$user->getId()], true)
                             ->filterByContextIds([$context->getId()])
                             ->filterByDeclined(true),
                         'reviewerAssignments',
diff --git a/classes/submission/reviewAssignment/Collector.php b/classes/submission/reviewAssignment/Collector.php
@@ -45,6 +45,7 @@ class Collector implements CollectorInterface, ViewsCount
     public bool $isDeclined = false;
     public ?array $reviewRoundIds = null;
     public ?array $reviewerIds = null;
+    public ?bool $isLastReviewRoundByReviewer = false;
     public bool $isLastReviewRound = false;
     public ?int $count = null;
     public ?int $offset = null;
@@ -191,9 +192,18 @@ public function filterByReviewRoundIds(?array $reviewRoundIds): static
         return $this;
     }
 
-    public function filterByReviewerIds(?array $reviewerIds): static
+    /**
+     * Filter results by reviewer IDs
+     *
+     * @param array|null $reviewerIds user IDs of reviewers
+     * @param bool $lastReviewRound if true, only the last review round for each reviewer will be returned
+     *
+     * @return $this
+     */
+    public function filterByReviewerIds(?array $reviewerIds, bool $lastReviewRound = false): static
     {
         $this->reviewerIds = $reviewerIds;
+        $this->isLastReviewRoundByReviewer = $lastReviewRound;
         return $this;
     }
 
@@ -435,8 +445,25 @@ public function getQueryBuilder(): Builder
 
         $q->when(
             $this->reviewerIds !== null,
-            fn (Builder $q) =>
-            $q->whereIn('ra.reviewer_id', $this->reviewerIds)
+            fn (Builder $q) => $q
+                ->whereIn('ra.reviewer_id', $this->reviewerIds)
+                ->when(
+                    $this->isLastReviewRoundByReviewer,
+                    fn (Builder $q) => $q
+                        // Aggregate the latest review round number for the given assignment and reviewer
+                        ->leftJoinSub(
+                            DB::table('review_assignments as ramax')
+                                ->select(['ramax.submission_id', 'ramax.reviewer_id'])
+                                ->selectRaw('MAX(ramax.round) as latest_round')
+                                ->selectRaw('MAX(ramax.stage_id) as latest_stage')
+                                ->whereIn('ramax.reviewer_id', $this->reviewerIds)
+                                ->groupBy(['ramax.submission_id', 'ramax.reviewer_id']),
+                            'agrmax',
+                            fn (JoinClause $join) => $join->on('ra.submission_id', '=', 'agrmax.submission_id')
+                        )
+                        ->whereColumn('ra.round', 'agrmax.latest_round') // assignments from the last review round per reviewer only
+                        ->whereColumn('ra.stage_id', 'agrmax.latest_stage') // assignments for the current review stage only (for OMP)
+                )
         );
 
         $q->when(

Original file line number	Diff line number	Diff line change
`@@ -368,7 +368,7 @@ public function getReviewAssignments(Request $illuminateRequest): JsonResponse`
`368`	`368`	`}`
`369`	`369`	`$currentUser = $request->getUser();`
`370`	`370`	`$collector = Repo::reviewAssignment()->getCollector()`
`371`		`- ->filterByReviewerIds([$currentUser->getId()])`
	`371`	`+ ->filterByReviewerIds([$currentUser->getId()], true)`
`372`	`372`	`->filterByContextIds([$context->getId()]);`
`373`	`373`
`374`	`374`	`foreach ($illuminateRequest->query() as $param => $val) {`
`@@ -391,6 +391,9 @@ public function getReviewAssignments(Request $illuminateRequest): JsonResponse`
`391`	`391`	`case 'published':`
`392`	`392`	`$collector->filterByPublished(true);`
`393`	`393`	`break;`
	`394`	`+ case 'allReviewRounds':`
	`395`	`+ $collector->filterByReviewerIds([$currentUser->getId()]);`
	`396`	`+ break;`
`394`	`397`	`}`
`395`	`398`	`}`
`396`	`399`