#1660 fixed filtering to use context id

pkp · Jan 26, 2025 · 15db26a · 15db26a
1 parent 5b14b26
commit 15db26a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/classes/submission/reviewAssignment/ReviewAssignment.php b/classes/submission/reviewAssignment/ReviewAssignment.php
@@ -817,8 +817,8 @@ public static function getReviewerRecommendationOptions(
             ->when(
                 $reviewAssignment, 
                 fn ($query) => $query->orWhere(
-                    fn ($query) => $query->withRecommendation(
-                        $reviewAssignment->getData("recommendation")
+                    fn ($query) => $query->withRecommendations(
+                        [$reviewAssignment->getData("recommendation")]
                     )
                 )
             )

diff --git a/classes/submission/reviewer/recommendation/ReviewerRecommendation.php b/classes/submission/reviewer/recommendation/ReviewerRecommendation.php
@@ -164,6 +164,7 @@ protected function removable(): Attribute
         return Attribute::make(
             get: fn () => !Repo::reviewAssignment()
                 ->getCollector()
+                ->filterByContextIds([$this->contextId])
                 ->filterByRecommenddations([$this->value])
                 ->getQueryBuilder()
                 ->exists()
@@ -188,7 +189,8 @@ protected function reviewAssignments(): Attribute
         return Attribute::make(
             get: fn () => Repo::reviewAssignment()
                 ->getCollector()
-                ->filterByRecommenddations([$this->id])
+                ->filterByContextIds([$this->contextId])
+                ->filterByRecommenddations([$this->value])
                 ->getMany()
         )->shouldCache();
     }
@@ -212,8 +214,8 @@ public function scopeWithActive(Builder $query, bool $active = true): Builder
     /**
      * Scope a query to filter by recommendation value
      */
-    public function scopeWithRecommendation(Builder $query, int $recommendation): Builder
+    public function scopeWithRecommendations(Builder $query, array $recommendations): Builder
     {
-        return $query->where('value', $recommendation);
+        return $query->whereIn('value', $recommendations);
     }
 }