integrate optional search into existing functions

Signed-off-by: Christian Hartmann <[email protected]>

Author: Chartman123

lib/Db/FormMapper.php

@@ -11,8 +11,6 @@
 use OCP\AppFramework\Db\QBMapper;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
-use OCP\IUser;
-use OCP\Search\ISearchQuery;
 use OCP\Share\IShare;
 
 /**
@@ -99,9 +97,10 @@ public function findByHash(string $hash): Form {
 	 * @param string[] $groups IDs of groups the user is memeber of
 	 * @param string[] $teams IDs of teams the user is memeber of
 	 * @param bool $filterShown Set to false to also include forms shared but not visible on sidebar
+	 * @param string $queryTerm optional: The search query for universal search
 	 * @return Form[]
 	 */
-	public function findSharedForms(string $userId, array $groups = [], array $teams = [], bool $filterShown = true): array {
+	public function findSharedForms(string $userId, array $groups = [], array $teams = [], bool $filterShown = true, ?string $queryTerm = null): array {
 		$qbShares = $this->db->getQueryBuilder();
 		$qbForms = $this->db->getQueryBuilder();
 
@@ -158,16 +157,28 @@ public function findSharedForms(string $userId, array $groups = [], array $teams
 			->addOrderBy('last_updated', 'DESC')
 			->addOrderBy('created', 'DESC');
 
+		if ($queryTerm) {
+			$qbForms->andWhere(
+				$qbForms->orWhere(
+					$qbForms->expr()->like('title', $qbForms->createNamedParameter('%' . $queryTerm . '%'))
+				)
+					->orWhere(
+						$qbForms->expr()->like('description', $qbForms->createNamedParameter('%' . $queryTerm . '%'))
+					)
+			);
+		}
+
 		// We need to add the parameters from the shared forms IDs select to the final select query
 		$qbForms->setParameters($qbShares->getParameters(), $qbShares->getParameterTypes());
 
 		return $this->findEntities($qbForms);
 	}
 
 	/**
+	 * @param string $queryTerm optional: The search query for universal search
 	 * @return Form[]
 	 */
-	public function findAllByOwnerId(string $ownerId): array {
+	public function findAllByOwnerId(string $ownerId, ?string $queryTerm = null): array {
 		$qb = $this->db->getQueryBuilder();
 
 		$qb->select('*')
@@ -179,18 +190,17 @@ public function findAllByOwnerId(string $ownerId): array {
 			->addOrderBy('last_updated', 'DESC')
 			->addOrderBy('created', 'DESC');
 
-		return $this->findEntities($qb);
-	}
+		if ($queryTerm) {
+			$qb->andWhere(
+				$qb->orWhere(
+					$qb->expr()->like('title', $qb->createNamedParameter('%' . $queryTerm . '%'))
+				)
+					->orWhere(
+						$qb->expr()->like('description', $qb->createNamedParameter('%' . $queryTerm . '%'))
+					)
+			);
+		}
 
-	/**
-	 * @param IUser $user the user that performs the search
-	 * @param ISearchQuery $query the query to search the forms
-	 * @throws \OCP\AppFramework\Db\DoesNotExistException if not found
-	 * @return Form[] array of Forms
-	 */
-	public function search(IUser $user, ISearchQuery $query): array {
-		$qb = $this->db->getQueryBuilder();
-		// TODO: implement search for Query Builder
 		return $this->findEntities($qb);
 	}
 

lib/Search/Provider.php

@@ -38,7 +38,7 @@ public function getName(): string {
 	}
 
 	public function search(IUser $user, ISearchQuery $query): SearchResult {
-		$forms = $this->formsService->search($user, $query);
+		$forms = $this->formsService->search($query);
 
 		$results = array_map(function (Form $form) {
 			$formUrl = $this->urlGenerator->linkToRoute('forms.page.views', ['hash' => $form->getHash(), 'view' => 'submit']);

lib/Service/FormsService.php

@@ -702,14 +702,23 @@ public function areExtraSettingsValid(array $extraSettings, string $questionType
 	/**
 	 * Get list of forms
 	 *
-	 * @param IUser $user the user that performs the search
 	 * @param ISearchQuery $query the query to search the forms
 	 * @return array list of forms that match the query
 	 */
-	public function search(IUser $user, ISearchQuery $query): array {
+	public function search(ISearchQuery $query): array {
 		$formsList = [];
+		$groups = $this->groupManager->getUserGroupIds($this->currentUser);
+		$teams = $this->circlesService->getUserTeamIds($this->currentUser->getUID());
+
 		try {
-			$formsList = $this->formMapper->search($user, $query);
+			$formsList = $this->formMapper->findAllByOwnerId($this->currentUser->getUID(), $query->getTerm());
+			$formsList[] = $this->formMapper->findSharedForms(
+				$this->currentUser->getUID(),
+				$groups,
+				$teams,
+				true,
+				$query->getTerm()
+			);
 		} catch (DoesNotExistException $e) {
 			// silent catch
 		}