Merge pull request #4166 from defstat/pkp/pkp-lib#9674

[OJS][main] #9674 Port StageAssignmentDAO and StageAssignment to Eloquent Model
pkp · Apr 25, 2024 · 42d6fcc · 42d6fcc
2 parents 0f7b217 + a7e0250
commit 42d6fcc
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 13 deletions.
diff --git a/api/v1/_submissions/BackendSubmissionsController.php b/api/v1/_submissions/BackendSubmissionsController.php
@@ -29,7 +29,7 @@
 use PKP\db\DAORegistry;
 use PKP\security\authorization\SubmissionAccessPolicy;
 use PKP\security\Role;
-use PKP\stageAssignment\StageAssignmentDAO;
+use PKP\stageAssignment\StageAssignment;
 
 class BackendSubmissionsController extends \PKP\API\v1\_submissions\PKPBackendSubmissionsController
 {
@@ -137,13 +137,15 @@ public function payment(Request $illuminateRequest): JsonResponse
                 }
 
                 // Record a fulfilled payment.
-                $stageAssignmentDao = DAORegistry::getDAO('StageAssignmentDAO'); /** @var StageAssignmentDAO $stageAssignmentDao */
-                $submitterAssignments = $stageAssignmentDao->getBySubmissionAndRoleIds($submission->getId(), [Role::ROLE_ID_AUTHOR]);
-                $submitterAssignment = $submitterAssignments->next();
+                // Replaces StageAssignmentDAO::getBySubmissionAndRoleIds
+                $submitterAssignment = StageAssignment::withSubmissionIds([$submission->getId()])
+                    ->withRoleIds([Role::ROLE_ID_AUTHOR])
+                    ->first();
+
                 $queuedPayment = $paymentManager->createQueuedPayment(
                     $request,
                     OJSPaymentManager::PAYMENT_TYPE_PUBLICATION,
-                    $submitterAssignment->getUserId(),
+                    $submitterAssignment->userId,
                     $submission->getId(),
                     $context->getSetting('publicationFee'),
                     $context->getSetting('currency')

diff --git a/classes/install/Upgrade.php b/classes/install/Upgrade.php
@@ -147,4 +147,4 @@ public function _fileStageToPath($fileStage)
 
 if (!PKP_STRICT_MODE) {
     class_alias('\APP\install\Upgrade', '\Upgrade');
-}
+}
diff --git a/lib/pkp b/lib/pkp
diff --git a/plugins/reports/articles/ArticleReportPlugin.php b/plugins/reports/articles/ArticleReportPlugin.php
@@ -22,7 +22,7 @@
 use PKP\facades\Locale;
 use PKP\plugins\ReportPlugin;
 use PKP\security\Role;
-use PKP\stageAssignment\StageAssignmentDAO;
+use PKP\stageAssignment\StageAssignment;
 use PKP\submission\PKPSubmission;
 use PKP\submission\SubmissionAgencyDAO;
 use PKP\submission\SubmissionDisciplineDAO;
@@ -85,7 +85,6 @@ public function display($args, $request)
         // Add BOM (byte order mark) to fix UTF-8 in Excel
         fprintf($fp, chr(0xEF) . chr(0xBB) . chr(0xBF));
 
-        $stageAssignmentDao = DAORegistry::getDAO('StageAssignmentDAO'); /** @var StageAssignmentDAO $stageAssignmentDao */
         $submissionKeywordDao = DAORegistry::getDAO('SubmissionKeywordDAO'); /** @var SubmissionKeywordDAO $submissionKeywordDao */
         $submissionSubjectDao = DAORegistry::getDAO('SubmissionSubjectDAO'); /** @var SubmissionSubjectDAO $submissionSubjectDao */
         $submissionDisciplineDao = DAORegistry::getDAO('SubmissionDisciplineDAO'); /** @var SubmissionDisciplineDAO $submissionDisciplineDao */
@@ -127,11 +126,14 @@ public function display($args, $request)
             }
 
             // Load editor and decision information
-            $stageAssignmentsFactory = $stageAssignmentDao->getBySubmissionAndStageId($submission->getId());
+            // Replaces StageAssignmentDAO::getBySubmissionAndStageId
+            $stageAssignments = StageAssignment::withSubmissionIds([$submission->getId()])
+                ->get();
+
             $editors = $editorsById = [];
-            while ($stageAssignment = $stageAssignmentsFactory->next()) {
-                $userId = $stageAssignment->getUserId();
-                if (!in_array($stageAssignment->getUserGroupId(), $editorUserGroupIds)) {
+            foreach ($stageAssignments as $stageAssignment) {
+                $userId = $stageAssignment->userId;
+                if (!in_array($stageAssignment->userGroupId, $editorUserGroupIds)) {
                     continue;
                 }
                 if (isset($editors[$userId])) {