pkp#8887 Fixes & clean up

Vitaliy-1 · Oct 24, 2023 · 48f9d07 · 48f9d07
1 parent 9c7a8d5
commit 48f9d07
Show file tree

Hide file tree

Showing 6 changed files with 68 additions and 697 deletions.
diff --git a/classes/submission/reviewAssignment/Collector.php b/classes/submission/reviewAssignment/Collector.php
@@ -202,7 +202,7 @@ public function getQueryBuilder(): Builder
 
         $q->when($this->isLastReviewRound || $this->isIncomplete, function(Builder $q) {$q
             ->whereRaw('ra.round = agrr.current_round') // assignments from the last review round only
-            ->whereRaw('ra.stage_id = agrr.stage_id') // assignments for the current review stage only (for OMP)
+            ->whereRaw('ra.stage_id = agrr.current_stage') // assignments for the current review stage only (for OMP)
             ->when($this->isIncomplete, fn(Builder $q) => $q
                 ->where(fn(Builder $q) => $q
                     ->whereNotNull('ra.date_notified')

diff --git a/classes/submission/reviewAssignment/DAO.php b/classes/submission/reviewAssignment/DAO.php
@@ -13,6 +13,7 @@
 
 namespace PKP\submission\reviewAssignment;
 
+use APP\facades\Repo;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\LazyCollection;
 use PKP\core\EntityDAO;
@@ -134,6 +135,20 @@ public function getMany(Collector $query): LazyCollection
         });
     }
 
+    /**
+     * @copydoc EntityDAO::fromRow()
+     */
+    public function fromRow(object $row): ReviewAssignment
+    {
+        $reviewAssignment = parent::fromRow($row);
+        $reviewAssignment->setData(
+            'reviewerFullName',
+            Repo::user()->get($reviewAssignment->getReviewerId())->getFullName()
+        );
+
+        return $reviewAssignment;
+    }
+
     /**
      * @copydoc EntityDAO::insert()
      */

diff --git a/classes/submission/reviewAssignment/ReviewAssignment.php b/classes/submission/reviewAssignment/ReviewAssignment.php
@@ -11,8 +11,6 @@
  *
  * @ingroup submission
  *
- * @see ReviewAssignmentDAO
- *
  * @brief Describes review assignment properties.
  */