pkp/pkp-lib#10506 submodules updates, use Eloquent for UserGroup

Hafsa-Naeem · Nov 22, 2024 · 5795fa9 · 5795fa9
1 parent 0a46028
commit 5795fa9
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 11 deletions.
diff --git a/api/v1/_dois/BackendDoiController.php b/api/v1/_dois/BackendDoiController.php
@@ -146,7 +146,7 @@ public function editIssue(Request $illuminateRequest): JsonResponse
 
     protected function getUserGroups(int $contextId): LazyCollection
     {
-        return UserGroup::where('contextId', $contextId)->get();
+        return UserGroup::withContextIds($contextId)->cursor();
     }
 
     protected function getGenres(int $contextId): array

diff --git a/api/v1/issues/IssueController.php b/api/v1/issues/IssueController.php
@@ -269,7 +269,7 @@ public function get(Request $illuminateRequest): JsonResponse
 
     protected function getUserGroups(int $contextId): LazyCollection
     {
-        return UserGroup::where('contextId', $contextId)->get();
+        return UserGroup::withContextIds($contextId)->cursor();
 
     }
 

diff --git a/classes/search/ArticleSearch.php b/classes/search/ArticleSearch.php
@@ -78,7 +78,7 @@ public function getSparseArray($unorderedResults, $orderBy, $orderDir, $exclude)
         }
 
         $i = 0; // Used to prevent ties from clobbering each other
-        $authorUserGroups = UserGroup::where('roleId', \PKP\security\Role::ROLE_ID_AUTHOR)->get();
+        $authorUserGroups = UserGroup::withRoleIds(\PKP\security\Role::ROLE_ID_AUTHOR)->get();
 
         foreach ($unorderedResults as $submissionId => $data) {
             // Exclude unwanted IDs.

diff --git a/classes/submission/Submission.php b/classes/submission/Submission.php
@@ -70,7 +70,7 @@ public function _getContextLicenseFieldValue($locale, $field, $publication = nul
                             $publication = $this->getCurrentPublication();
                         }
 
-                        $authorUserGroups = UserGroup::where('roleId', \PKP\security\Role::ROLE_ID_AUTHOR)->where('contextId', $context->getId())->get();
+                        $authorUserGroups = UserGroup::withRoleIds(\PKP\security\Role::ROLE_ID_AUTHOR)->withContextIds($context->getId())->get();
                         $fieldValue = [$context->getPrimaryLocale() => $publication->getAuthorString($authorUserGroups)];
                         break;
                     case 'context':

diff --git a/controllers/grid/users/subscriberSelect/SubscriberSelectGridHandler.php b/controllers/grid/users/subscriberSelect/SubscriberSelectGridHandler.php
@@ -68,9 +68,9 @@ public function initialize($request, $args = null)
         $stageId = $this->getAuthorizedContextObject(Application::ASSOC_TYPE_WORKFLOW_STAGE);
         $contextId = $request->getContext()->getId();
 
-        $userGroups = UserGroup::where('contextId', $contextId)
+        $userGroups = UserGroup::withContextIds($contextId)
             ->whereHas('userGroupStages', function ($query) use ($stageId) {
-                $query->where('stageId', $stageId);
+                $query->withStageId($stageId);
             })
             ->get();
 
@@ -153,7 +153,7 @@ protected function loadData($request, $filter)
     public function renderFilter($request, $filterData = [])
     {
         $contextId = $request->getContext()->getId();
-        $userGroups = UserGroup::where('contextId', $contextId)->get();
+        $userGroups = UserGroup::withContextIds($contextId)->get();
 
         foreach ($userGroups as $userGroup) {
             $userGroupOptions[$userGroup->id] = $userGroup->getLocalizedData('name');

diff --git a/lib/pkp b/lib/pkp
diff --git a/lib/ui-library b/lib/ui-library
diff --git a/plugins/generic/customBlockManager b/plugins/generic/customBlockManager
diff --git a/plugins/generic/staticPages b/plugins/generic/staticPages
-Original file line number
+Diff line change
@@ Expand Up @@
         protected function getUserGroups(int $contextId): LazyCollection
         {
-            return UserGroup::where('contextId', $contextId)->get();
+            return UserGroup::withContextIds($contextId)->cursor();
         }
@@ Expand Down @@
+1 −1		CustomBlockManagerPlugin.php
+1 −0		controllers/grid/CustomBlockGridHandler.php
+2 −2		controllers/grid/CustomBlockGridRow.php
+6 −5		cypress/tests/functional/CustomBlocks.cy.js
+1 −1		StaticPagesPlugin.php
+1 −0		controllers/grid/StaticPageGridHandler.php
+2 −2		controllers/grid/StaticPageGridRow.php