Merge pull request #11376 from Vitaliy-1/i11374_review_anonymity

#11374 Fix reviewer latest review related issues

Author: Vitaliy-1

api/v1/reviews/PKPReviewController.php

@@ -242,9 +242,8 @@ public function getHistory(Request $illuminateRequest): JsonResponse
         $lastReviewAssignment = Repo::reviewAssignment()->getCollector()
             ->filterByContextIds([$contextId])
             ->filterBySubmissionIds([$submissionId])
-            ->filterByReviewerIds([$reviewerId])
+            ->filterByReviewerIds([$reviewerId], true)
             ->filterByStageId($stageId)
-            ->filterByLastReviewRound(true)
             ->getMany()
             ->first();
 

api/v1/submissions/PKPSubmissionController.php

@@ -1047,8 +1047,7 @@ public function getPublications(Request $illuminateRequest): JsonResponse
 
         $currentUserReviewAssignment = Repo::reviewAssignment()->getCollector()
             ->filterBySubmissionIds([$submission->getId()])
-            ->filterByReviewerIds([$request->getUser()->getId()])
-            ->filterByLastReviewRound(true)
+            ->filterByReviewerIds([$request->getUser()->getId()], true)
             ->getMany()
             ->first();
 

classes/submission/Repository.php

@@ -229,8 +229,7 @@ public function getWorkflowUrlByUserRoles(Submission $submission, ?int $userId =
         // Send reviewers to review wizard
         $reviewAssignment = Repo::reviewAssignment()->getCollector()
             ->filterBySubmissionIds([$submission->getId()])
-            ->filterByReviewerIds([$user->getId()])
-            ->filterByLastReviewRound(true)
+            ->filterByReviewerIds([$user->getId()], true)
             ->getMany()
             ->first();
 

classes/submission/maps/Schema.php

@@ -456,8 +456,7 @@ protected function mapByProperties(array $props, Submission $submission, bool|Co
         if (in_array('publications', $props)) {
             $currentUserReviewAssignment = Repo::reviewAssignment()->getCollector()
                 ->filterBySubmissionIds([$submission->getId()])
-                ->filterByReviewerIds([$this->request->getUser()->getId()])
-                ->filterByLastReviewRound(true)
+                ->filterByReviewerIds([$this->request->getUser()->getId()], true)
                 ->getMany()
                 ->first();
             $anonymize = $currentUserReviewAssignment && $currentUserReviewAssignment->getReviewMethod() === ReviewAssignment::SUBMISSION_REVIEW_METHOD_DOUBLEANONYMOUS;

classes/submission/reviewAssignment/Collector.php

@@ -291,25 +291,7 @@ public function orderBySubmissionId(string $direction = self::ORDER_DIR_ASC): st
      */
     public function getQueryBuilder(): Builder
     {
-        $q = DB::table($this->dao->table . ' as ra')
-            // Aggregating data regarding latest review round and stage. For OMP the latest round isn't equal to the round with the highest number per submission
-            ->leftJoinSub(
-                DB::table('review_assignments as rr')
-                    ->select(['rr.submission_id', 'rr.stage_id'])
-                    ->selectRaw('MAX(rr.round) as latest_round')
-                    ->groupBy('rr.submission_id', 'rr.stage_id')
-                    ->leftJoinSub(
-                        DB::table('review_assignments as rs')
-                            ->select('rs.submission_id')
-                            ->selectRaw('MAX(rs.stage_id) as latest_stage')
-                            ->groupBy('rs.submission_id'),
-                        'rsmax',
-                        fn (JoinClause $join) => $join->on('rr.submission_id', '=', 'rsmax.submission_id')
-                    )
-                    ->whereColumn('rr.stage_id', 'rsmax.latest_stage'), // Take the highest round only from the latest stage
-                'rrmax',
-                fn (JoinClause $join) => $join->on('ra.submission_id', '=', 'rrmax.submission_id')
-            );
+        $q = DB::table($this->dao->table . ' as ra');
 
         $q->when(
             $this->contextIds !== null,
@@ -331,6 +313,24 @@ public function getQueryBuilder(): Builder
 
         $q->when($this->isLastReviewRound || $this->isIncomplete, function (Builder $q) {
             $q
+                // Aggregating data regarding latest review round and stage. For OMP the latest round isn't equal to the round with the highest number per submission
+                ->leftJoinSub(
+                    DB::table('review_rounds as rr')
+                        ->select(['rr.submission_id', 'rr.stage_id'])
+                        ->selectRaw('MAX(rr.round) as latest_round')
+                        ->groupBy('rr.submission_id', 'rr.stage_id')
+                        ->leftJoinSub(
+                            DB::table('review_rounds as rs')
+                                ->select('rs.submission_id')
+                                ->selectRaw('MAX(rs.stage_id) as latest_stage')
+                                ->groupBy('rs.submission_id'),
+                            'rsmax',
+                            fn (JoinClause $join) => $join->on('rr.submission_id', '=', 'rsmax.submission_id')
+                        )
+                        ->whereColumn('rr.stage_id', 'rsmax.latest_stage'), // Take the highest round only from the latest stage
+                    'rrmax',
+                    fn (JoinClause $join) => $join->on('ra.submission_id', '=', 'rrmax.submission_id')
+                )
                 ->whereColumn('ra.round', '=', 'rrmax.latest_round') // assignments from the last review round only
                 ->whereColumn('ra.stage_id', '=', 'rrmax.stage_id') // assignments for the current review stage only (for OMP)
                 ->when(