[BUGFIX] Enable creation of filter options from categories for hidden…

… and time restricted categories. fixes #144
tpwd · Jan 27, 2023 · d388aa1 · d388aa1
1 parent 8469e99
commit d388aa1
Show file tree

Hide file tree

Showing 11 changed files with 98 additions and 183 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -6,6 +6,7 @@ Upcoming version
 
 Version 4.6.2, 13 January 2023
 [BUGFIX]   Fix SQL query for assigning tags from page properties to work with sql_mode ONLY_FULL_GROUP_BY. Thanks to p-view. https://github.com/teaminmedias-pluswerk/ke_search/issues/448
+[BUGFIX]   Enable creation of filter options from categories for hidden and time restricted categories. Thanks to Andreas Kessel. https://github.com/tpwd/ke_search/pull/144
 
 Version 4.6.1, 13 January 2023
 [TASK]     Respect workspace flag for content elements. Thanks to alexmari81. https://github.com/tpwd/ke_search/issues/139

diff --git a/Classes/Domain/Repository/BaseRepository.php b/Classes/Domain/Repository/BaseRepository.php
@@ -6,6 +6,10 @@
 use PDO;
 use TYPO3\CMS\Core\Database\Connection;
 use TYPO3\CMS\Core\Database\ConnectionPool;
+use TYPO3\CMS\Core\Database\Query\QueryBuilder;
+use TYPO3\CMS\Core\Database\Query\Restriction\EndTimeRestriction;
+use TYPO3\CMS\Core\Database\Query\Restriction\HiddenRestriction;
+use TYPO3\CMS\Core\Database\Query\Restriction\StartTimeRestriction;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
 /***************************************************************
@@ -36,14 +40,28 @@ class BaseRepository
      */
     protected $tableName = '';
 
-    /**
-     * @return mixed
-     */
-    public function findAll()
+    public function getQueryBuilder(bool $includeHiddenAndTimeRestricted = false): QueryBuilder
     {
         /** @var ConnectionPool $connectionPool */
         $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
         $queryBuilder = $connectionPool->getQueryBuilderForTable($this->tableName);
+        if ($includeHiddenAndTimeRestricted) {
+            $queryBuilder
+                ->getRestrictions()
+                ->removeByType(HiddenRestriction::class)
+                ->removeByType(StartTimeRestriction::class)
+                ->removeByType(EndTimeRestriction::class);
+        }
+        return $queryBuilder;
+    }
+
+    /**
+     * @param bool $includeHiddenAndTimeRestricted
+     * @return mixed
+     */
+    public function findAll(bool $includeHiddenAndTimeRestricted = false)
+    {
+        $queryBuilder = $this->getQueryBuilder($includeHiddenAndTimeRestricted);
         return $queryBuilder
             ->select('*')
             ->from($this->tableName)
@@ -53,13 +71,12 @@ public function findAll()
 
     /**
      * @param $uid
+     * @param bool $includeHiddenAndTimeRestricted
      * @return mixed
      */
-    public function findOneByUid($uid)
+    public function findByUid($uid, bool $includeHiddenAndTimeRestricted = false)
     {
-        /** @var ConnectionPool $connectionPool */
-        $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
-        $queryBuilder = $connectionPool->getQueryBuilderForTable($this->tableName);
+        $queryBuilder = $this->getQueryBuilder($includeHiddenAndTimeRestricted);
         return $queryBuilder
             ->select('*')
             ->from($this->tableName)

diff --git a/Classes/Domain/Repository/CategoryRepository.php b/Classes/Domain/Repository/CategoryRepository.php
@@ -4,8 +4,6 @@
 
 use PDO;
 use Tpwd\KeSearch\Lib\SearchHelper;
-use TYPO3\CMS\Core\Database\ConnectionPool;
-use TYPO3\CMS\Core\Utility\GeneralUtility;
 
 /***************************************************************
  *  Copyright notice
@@ -28,59 +26,21 @@
 /**
  * @author Christian Bülter
  */
-class CategoryRepository
+class CategoryRepository extends BaseRepository
 {
     /**
      * @var string
      */
     protected $tableName = 'sys_category';
 
-    /**
-     * @return mixed
-     */
-    public function findAll()
-    {
-        /** @var ConnectionPool $connectionPool */
-        $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
-        $queryBuilder = $connectionPool->getQueryBuilderForTable($this->tableName);
-        return $queryBuilder
-            ->select('*')
-            ->from($this->tableName)
-            ->execute()
-            ->fetchAll();
-    }
-
     /**
      * @param $categoryUid
+     * @param bool $includeHiddenAndTimeRestricted
      * @return mixed
      */
-    public function findOneByUid($categoryUid)
+    public function findAllSubcategoriesByParentUid($categoryUid, bool $includeHiddenAndTimeRestricted = false)
     {
-        /** @var ConnectionPool $connectionPool */
-        $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
-        $queryBuilder = $connectionPool->getQueryBuilderForTable($this->tableName);
-        return $queryBuilder
-            ->select('*')
-            ->from($this->tableName)
-            ->where(
-                $queryBuilder->expr()->eq(
-                    'uid',
-                    $queryBuilder->createNamedParameter($categoryUid, PDO::PARAM_INT)
-                )
-            )
-            ->execute()
-            ->fetch();
-    }
-
-    /**
-     * @param $categoryUid
-     * @return mixed
-     */
-    public function findAllSubcategoriesByParentUid($categoryUid)
-    {
-        /** @var ConnectionPool $connectionPool */
-        $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
-        $queryBuilder = $connectionPool->getQueryBuilderForTable($this->tableName);
+        $queryBuilder = $this->getQueryBuilder($includeHiddenAndTimeRestricted);
         return $queryBuilder
             ->select('*')
             ->from($this->tableName)
@@ -96,11 +56,13 @@ public function findAllSubcategoriesByParentUid($categoryUid)
 
     /**
      * @param string $tag
+     * @param bool $includeHiddenAndTimeRestricted
+     * @return mixed
      */
-    public function findByTag(string $tag)
+    public function findByTag(string $tag, bool $includeHiddenAndTimeRestricted = false)
     {
         $uid = (int)(str_replace(SearchHelper::$systemCategoryPrefix, '', $tag));
-        return $this->findOneByUid($uid);
+        return $this->findByUid($uid, $includeHiddenAndTimeRestricted);
     }
 
     /**
@@ -110,12 +72,9 @@ public function findByTag(string $tag)
      * @param int $uid
      * @return mixed
      */
-    public function findAssignedToRecord(string $tableName, int $uid)
+    public function findAssignedToRecord(string $tableName, int $uid, bool $includeHiddenAndTimeRestricted = false)
     {
-        /** @var ConnectionPool $connectionPool */
-        $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
-        $queryBuilder = $connectionPool->getQueryBuilderForTable($this->tableName);
-
+        $queryBuilder = $this->getQueryBuilder($includeHiddenAndTimeRestricted);
         return $queryBuilder
             ->select('sys_category.*')
             ->from('sys_category')

diff --git a/Classes/Domain/Repository/FileMetaDataRepository.php b/Classes/Domain/Repository/FileMetaDataRepository.php
@@ -4,8 +4,6 @@
 namespace Tpwd\KeSearch\Domain\Repository;
 
 use PDO;
-use TYPO3\CMS\Core\Database\ConnectionPool;
-use TYPO3\CMS\Core\Utility\GeneralUtility;
 
 /***************************************************************
  *  Copyright notice
@@ -43,10 +41,7 @@ class FileMetaDataRepository extends BaseRepository
      */
     public function findByFileUidAndLanguageUid(int $fileUid, $languageUid)
     {
-        /** @var ConnectionPool $connectionPool */
-        $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
-        $queryBuilder = $connectionPool->getQueryBuilderForTable($this->tableName);
-
+        $queryBuilder = $this->getQueryBuilder();
         $record = $queryBuilder
             ->select('*')
             ->from($this->tableName)

diff --git a/Classes/Domain/Repository/FileReferenceRepository.php b/Classes/Domain/Repository/FileReferenceRepository.php
@@ -5,9 +5,6 @@
 
 use Doctrine\DBAL\Connection as DoctrineDbalConnection;
 use PDO;
-use TYPO3\CMS\Core\Database\ConnectionPool;
-use TYPO3\CMS\Core\Database\Query\QueryBuilder;
-use TYPO3\CMS\Core\Utility\GeneralUtility;
 
 /***************************************************************
  *  Copyright notice
@@ -43,9 +40,7 @@ public function findOneByTableAndFieldnameAndUidForeignAndLanguage(
         string $uid_foreign,
         array $languageIds = [0, -1]
     ) {
-        /** @var QueryBuilder $queryBuilder */
-        $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)
-            ->getQueryBuilderForTable($this->tableName);
+        $queryBuilder = $this->getQueryBuilder();
         return $queryBuilder
             ->select('*')
             ->from($this->tableName)