pkp#8885 Stage Assignments model pattern

Vitaliy-1 · Apr 29, 2024 · 9a97657 · 9a97657
1 parent 27b8e2d
commit 9a97657
Showing 1 changed file with 10 additions and 11 deletions.
diff --git a/classes/submission/maps/Schema.php b/classes/submission/maps/Schema.php
@@ -168,7 +168,7 @@ public function mapMany(Enumerable $collection, LazyCollection $userGroups, arra
         $associatedReviewAssignments = $this->reviewAssignments->groupBy(fn (ReviewAssignment $reviewAssignment, int $key) =>
             $reviewAssignment->getData('submissionId'));
         $associatedStageAssignments = $this->stageAssignments->groupBy(fn (StageAssignment $stageAssignment, int $key) =>
-            $stageAssignment->getData('submissionId'));
+            $stageAssignment->submissionId);
 
         return $collection->map(
             fn ($item) =>
@@ -204,7 +204,7 @@ public function summarizeMany(Enumerable $collection, LazyCollection $userGroups
         );
         $associatedStageAssignment = $this->stageAssignments->groupBy(
             fn (StageAssignment $stageAssignment, int $key) =>
-            $stageAssignment->getData('submissionId')
+            $stageAssignment->submissionId
         );
 
         return $collection->map(
@@ -264,7 +264,7 @@ public function mapManyToSubmissionsList(Enumerable $collection, LazyCollection
         );
         $associatedStageAssignment = $this->stageAssignments->groupBy(
             fn (StageAssignment $stageAssignment, int $key) =>
-            $stageAssignment->getData('submissionId')
+            $stageAssignment->submissionId
         );
 
         return $collection->map(
@@ -419,7 +419,6 @@ protected function getPropertyReviewAssignments(Enumerable $reviewAssignments):
             $reviews[] = [
                 'id' => (int) $reviewAssignment->getId(),
                 'isCurrentUserAssigned' => $currentUser->getId() == (int) $reviewAssignment->getReviewerId(),
-                'dateAssigned' => $reviewAssignment->getData('dateAssigned'),
                 'statusId' => (int) $reviewAssignment->getStatus(),
                 'status' => __($reviewAssignment->getStatusKey()),
                 'dateDue' => $dateDue,
@@ -625,7 +624,7 @@ protected function getPropertyStageAssignments(Enumerable $stageAssignments): bo
         }
 
         foreach ($stageAssignments as $stageAssignment) {
-            if (!$stageAssignment->getRecommendOnly()) {
+            if (!$stageAssignment->recommendOnly) {
                 return true;
             }
         }
@@ -648,14 +647,14 @@ protected function getUserGroup(int $userGroupId): ?UserGroup
      *
      * @param Enumerable<Submission> $submissions
      *
-     * @return LazyCollection<StageAssignment> The collection of stage assignments associated with submissions
+     * @return Collection<StageAssignment> The collection of stage assignments associated with submissions
      */
-    protected function getStageAssignmentsBySubmissions(Enumerable $submissions, array $roleIds = []): LazyCollection
+    protected function getStageAssignmentsBySubmissions(Enumerable $submissions, array $roleIds = []): Collection
     {
         $submissionIds = $submissions->map(fn (Submission $submission) => $submission->getId())->toArray();
-
-        $stageAssignmentDao = DAORegistry::getDAO('StageAssignmentDAO'); /** @var StageAssignmentDAO $stageAssignmentDao */
-        return $stageAssignmentDao->getCurrentBySubmissionIds($submissionIds, $roleIds)->remember();
+        return StageAssignment::withSubmissionIds($submissionIds)
+            ->withRoleIds($roleIds)
+            ->get();
     }
 
     /**
@@ -678,7 +677,7 @@ protected function getReviewRoundsFromSubmission(Submission $submission): Collec
      */
     protected function areRecommendationsIn(ReviewRound $currentReviewRound, Enumerable $stageAssignments): ?bool
     {
-        $hasDecidingEditors = $stageAssignments->first(fn (StageAssignment $stageAssignment) => $stageAssignment->getData('recommendOnly'));
+        $hasDecidingEditors = $stageAssignments->first(fn (StageAssignment $stageAssignment) => $stageAssignment->recommendOnly);
         if (!$hasDecidingEditors) {
             return null;
         }