From 883f65da72c954158626adf07a64e5da97488a88 Mon Sep 17 00:00:00 2001
From: Vitalii Bezsheiko <vitaliybezsh@gmail.com>
Date: Fri, 13 Dec 2024 17:42:58 +0200
Subject: [PATCH] pkp/pkp-lib#10506 User Group refactoring to Eloquent Model

---
 classes/submission/Submission.php | 8 ++++++--
 pages/search/SearchHandler.php    | 9 ++++-----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/classes/submission/Submission.php b/classes/submission/Submission.php
index 6a841e14ba5..30ae72200de 100644
--- a/classes/submission/Submission.php
+++ b/classes/submission/Submission.php
@@ -22,9 +22,9 @@
 
 namespace APP\submission;
 
-use APP\facades\Repo;
 use APP\publication\Publication;
 use PKP\submission\PKPSubmission;
+use PKP\userGroup\UserGroup;
 
 class Submission extends PKPSubmission
 {
@@ -67,7 +67,11 @@ public function _getContextLicenseFieldValue($locale, $field, $publication = nul
                         if (!$publication) {
                             $publication = $this->getCurrentPublication();
                         }
-                        $authorUserGroups = Repo::userGroup()->getCollector()->filterByRoleIds([\PKP\security\Role::ROLE_ID_AUTHOR])->filterByContextIds([$context->getId()])->getMany();
+
+                        $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/pages/search/SearchHandler.php b/pages/search/SearchHandler.php
index ecb6fada01c..404247775f9 100644
--- a/pages/search/SearchHandler.php
+++ b/pages/search/SearchHandler.php
@@ -17,10 +17,10 @@
 namespace APP\pages\search;
 
 use APP\core\Request;
-use APP\facades\Repo;
 use APP\handler\Handler;
 use APP\search\MonographSearch;
 use APP\template\TemplateManager;
+use PKP\userGroup\UserGroup;
 
 class SearchHandler extends Handler
 {
@@ -57,10 +57,9 @@ public function search($args, $request)
         $templateMgr->assign([
             'results' => $monographSearch->retrieveResults($request, $press, [null => $query], $error, null, null, $rangeInfo),
             'searchQuery' => $query,
-            'authorUserGroups' => Repo::userGroup()->getCollector()
-                ->filterByRoleIds([\PKP\security\Role::ROLE_ID_AUTHOR])
-                ->filterByContextIds($press ? [$press->getId()] : null)
-                ->getMany()->remember(),
+            'authorUserGroups' => UserGroup::withRoleIds([\PKP\security\Role::ROLE_ID_AUTHOR])
+                ->withContextIds($press ? [$press->getId()] : null)
+                ->get(),
         ]);
 
         // Display