From 8662f123d781a6df4eb5bd05b3556cca94fcf334 Mon Sep 17 00:00:00 2001 From: Thomas Lange Date: Thu, 22 Jul 2021 21:36:42 +0200 Subject: Move repository search functionality into a trait Move the methods for the search functionality of the abstract Repository class into a separate trait and use it in the Page and Post repository. The reason because of this is that only the Page and Post repositories having a search functionality, while the other repositories have not. --- core/namespace/ORM/Repositories/PageRepository.php | 3 + core/namespace/ORM/Repositories/PostRepository.php | 3 + core/namespace/ORM/Repository.php | 99 -------------------- core/namespace/ORM/RepositorySearch.php | 103 +++++++++++++++++++++ 4 files changed, 109 insertions(+), 99 deletions(-) create mode 100644 core/namespace/ORM/RepositorySearch.php diff --git a/core/namespace/ORM/Repositories/PageRepository.php b/core/namespace/ORM/Repositories/PageRepository.php index 8c7c94b..993fb67 100644 --- a/core/namespace/ORM/Repositories/PageRepository.php +++ b/core/namespace/ORM/Repositories/PageRepository.php @@ -1,8 +1,11 @@ fetchEntities($Statement); } - - #=============================================================================== - # Get entities based on search query - #=============================================================================== - public function search(string $search, array $filter = [], int $limit = NULL, int $offset = 0): array { - if(strlen($filter['year'] ?? '') !== 0) { - $extend[] = 'YEAR(time_insert) = ? AND'; - $params[] = $filter['year']; - } - - if(strlen($filter['month'] ?? '') !== 0) { - $extend[] = 'MONTH(time_insert) = ? AND'; - $params[] = $filter['month']; - } - - if(strlen($filter['day'] ?? '') !== 0) { - $extend[] = 'DAY(time_insert) = ? AND'; - $params[] = $filter['day']; - } - - if($limit) { - $limit = "LIMIT $offset,$limit"; - } - - $dateparts = implode(' ', $extend ?? []); - - $query = 'SELECT *, COUNT(*) OVER() AS _count FROM %s WHERE %s MATCH(name, body) - AGAINST(? IN BOOLEAN MODE) %s'; - $query = sprintf($query, static::getTableName(), $dateparts, $limit ?? 'LIMIT 20'); - - $Statement = $this->Database->prepare($query); - $Statement->execute(array_merge($params ?? [], [$search])); - - if($entities = $this->fetchEntities($Statement)) { - # Temporary (maybe crappy) solution to prevent a second count query. - # Virtual column "_count" does not belong into the entities. - $this->lastSearchOverallCount = $entities[0]->get('_count'); - } - - return $entities; - } - - #=============================================================================== - # Get the number of overall results for the last performed search - #=============================================================================== - public function getLastSearchOverallCount(): int { - return $this->lastSearchOverallCount; - } - - #=============================================================================== - # Get a list of distinct days - #=============================================================================== - public function getDistinctDays(): array { - $query = 'SELECT DISTINCT DAY(time_insert) AS d FROM %s ORDER BY d'; - $query = sprintf($query, static::getTableName()); - - $Statement = $this->Database->query($query); - - if($result = $Statement->fetchAll($this->Database::FETCH_COLUMN)) { - return $result; - } - - return []; - } - - #=============================================================================== - # Get a list of distinct months - #=============================================================================== - public function getDistinctMonths(): array { - $query = 'SELECT DISTINCT MONTH(time_insert) AS m FROM %s ORDER BY m'; - $query = sprintf($query, static::getTableName()); - - $Statement = $this->Database->query($query); - - if($result = $Statement->fetchAll($this->Database::FETCH_COLUMN)) { - return $result; - } - - return []; - } - - #=============================================================================== - # Get a list of distinct years - #=============================================================================== - public function getDistinctYears(): array { - $query = 'SELECT DISTINCT YEAR(time_insert) AS y FROM %s ORDER BY y'; - $query = sprintf($query, static::getTableName()); - - $Statement = $this->Database->query($query); - - if($result = $Statement->fetchAll($this->Database::FETCH_COLUMN)) { - return $result; - } - - return []; - } } diff --git a/core/namespace/ORM/RepositorySearch.php b/core/namespace/ORM/RepositorySearch.php new file mode 100644 index 0000000..8a61998 --- /dev/null +++ b/core/namespace/ORM/RepositorySearch.php @@ -0,0 +1,103 @@ +Database->prepare($query); + $Statement->execute(array_merge($params ?? [], [$search])); + + if($entities = $this->fetchEntities($Statement)) { + # Temporary (maybe crappy) solution to prevent a second count query. + # Virtual column "_count" does not belong into the entities. + $this->lastSearchOverallCount = $entities[0]->get('_count'); + } + + return $entities; + } + + #=============================================================================== + # Get the number of overall results for the last performed search + #=============================================================================== + public function getLastSearchOverallCount(): int { + return $this->lastSearchOverallCount; + } + + #=============================================================================== + # Get a list of distinct days + #=============================================================================== + public function getDistinctDays(): array { + $query = 'SELECT DISTINCT DAY(time_insert) AS d FROM %s ORDER BY d'; + $query = sprintf($query, static::getTableName()); + + $Statement = $this->Database->query($query); + + if($result = $Statement->fetchAll($this->Database::FETCH_COLUMN)) { + return $result; + } + + return []; + } + + #=============================================================================== + # Get a list of distinct months + #=============================================================================== + public function getDistinctMonths(): array { + $query = 'SELECT DISTINCT MONTH(time_insert) AS m FROM %s ORDER BY m'; + $query = sprintf($query, static::getTableName()); + + $Statement = $this->Database->query($query); + + if($result = $Statement->fetchAll($this->Database::FETCH_COLUMN)) { + return $result; + } + + return []; + } + + #=============================================================================== + # Get a list of distinct years + #=============================================================================== + public function getDistinctYears(): array { + $query = 'SELECT DISTINCT YEAR(time_insert) AS y FROM %s ORDER BY y'; + $query = sprintf($query, static::getTableName()); + + $Statement = $this->Database->query($query); + + if($result = $Statement->fetchAll($this->Database::FETCH_COLUMN)) { + return $result; + } + + return []; + } +} -- cgit v1.2.3