pkp/pkp-lib#6903 Convert categories to new collector toolset and set …

…foreign keys
asmecher · Nov 4, 2021 · 01ed22d · 01ed22d
1 parent c4bcfe8
commit 01ed22d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/classes/components/forms/publication/IssueEntryForm.inc.php b/classes/components/forms/publication/IssueEntryForm.inc.php
@@ -104,8 +104,9 @@ public function __construct($action, $locales, $publication, $publicationContext
 
         // Categories
         $categoryOptions = [];
-        $categoryDao = \DAORegistry::getDAO('CategoryDAO'); /* @var $categoryDao CategoryDAO */
-        $categories = $categoryDao->getByContextId($publicationContext->getId())->toAssociativeArray();
+        $categories = iterator_to_array(Repo::category()->getMany(
+            Repo::category()->getCollector()
+            ->filterByContextIds([$publicationContext->getId()])));
         foreach ($categories as $category) {
             $label = $category->getLocalizedTitle();
             if ($category->getParentId()) {

diff --git a/classes/publication/DAO.inc.php b/classes/publication/DAO.inc.php
@@ -14,6 +14,7 @@
 namespace APP\publication;
 
 use APP\core\Services;
+use APP\facades\Repo;
 use stdClass;
 
 class DAO extends \PKP\publication\DAO
@@ -42,6 +43,8 @@ public function fromRow(stdClass $primaryRow): Publication
         $publication->setData('galleys', iterator_to_array(
             Services::get('galley')->getMany(['publicationIds' => $publication->getId()])
         ));
+        $publication->setData('categoryIds', iterator_to_array(Repo::category()->getIds(Repo::category()->getCollector()
+            ->filterByPublicationIds([$publication->getId()]))));
         return $publication;
     }
 }
diff --git a/dbscripts/xml/install.xml b/dbscripts/xml/install.xml
@@ -16,7 +16,6 @@
 	<code function="createDirectories"/>
 
 	<!-- PKP schema components -->
-	<migration class="PKP\migration\install\CategoriesMigration" />
 	<migration class="PKP\migration\install\CommonMigration" />
 	<migration class="PKP\migration\install\ControlledVocabMigration" />
 	<migration class="PKP\migration\install\FilesMigration" />
@@ -42,6 +41,7 @@
 	<migration class="APP\migration\install\OJSMigration" />
 
 	<migration class="PKP\migration\install\AnnouncementsMigration" />
+	<migration class="PKP\migration\install\CategoriesMigration" />
 
 	<!-- Other install tasks -->
 	<code function="createData"/>

diff --git a/pages/article/ArticleHandler.inc.php b/pages/article/ArticleHandler.inc.php
@@ -237,9 +237,10 @@ public function view($args, $request)
             fatalError('Cannot view galley.');
         }
 
-        $categoryDao = DAORegistry::getDAO('CategoryDAO'); /* @var $categoryDao CategoryDAO */
         $templateMgr->assign([
-            'categories' => $categoryDao->getByPublicationId($publication->getId())->toArray()
+            'categories' => iterator_to_array(Repo::category()->getMany(
+                Repo::category()->getCollector()
+                ->filterByPublicationIds([$publication->getId()])))
         ]);
 
         // Get galleys sorted into primary and supplementary groups