feat: unified search

Signed-off-by: Crisciany Souza <crisciany.souza@librecode.coop>

Author: Any97Cris

lib/Db/SignRequestMapper.php

@@ -416,19 +416,20 @@ public function getFilesAssociatedFilesWithMeFormatted(
 		return $return;
 	}
 
-	public function getFilesToSearchProvider(IUser $user, string $term, int $limit, int $offset): array {
+	public function getFilesToSearchProvider(IUser $user, string $fileName, int $limit, int $offset): array {
 		$filter = [
 			'page' => ($offset / $limit) + 1,
 			'length' => $limit,
+			'fileName' => $fileName,
 		];
 
-		$qb = $this->getFilesAssociatedFilesWithMeQueryBuilder($user->getUID(), $filter);
+		$sort = [
+			'sortBy' => 'created_at',
+			'sortDirection' => 'desc',
+		];
+
+		$qb = $this->getFilesAssociatedFilesWithMeQueryBuilder($user->getUID(), $filter, false, $sort);
 
-		if (!empty($term)) {
-			$qb->andWhere(
-				$qb->expr()->like('f.name', $qb->createNamedParameter('%' . $this->db->escapeLikeParameter($term) . '%'))
-			);
-		}
 
 		$qb->orderBy('f.created_at', 'DESC');
 
@@ -437,16 +438,7 @@ public function getFilesToSearchProvider(IUser $user, string $term, int $limit,
 
 		while ($row = $result->fetch()) {
 			try {
-				$file = new File();
-				$file->setId((int)$row['id']);
-				$file->setUserId($row['user_id']);
-				$file->setNodeId((int)($row['node_id'] ?? 0));
-				$file->setSignedNodeId($row['signed_node_id'] ? (int)$row['signed_node_id'] : null);
-				$file->setName($row['name'] ?? '');
-				$file->setStatus((int)($row['status'] ?? 0));
-				$file->setUuid($row['uuid'] ?? '');
-				$file->setCreatedAt($row['created_at'] ?? '');
-
+				$file = File::fromRow($row);
 
 				$files[] = $file;
 			} catch (\Exception $e) {
@@ -530,7 +522,7 @@ public function getMyLibresignFile(string $userId, ?array $filter = []): File {
 		return $file->fromRow($row);
 	}
 
-	private function getFilesAssociatedFilesWithMeQueryBuilder(string $userId, array $filter = [], bool $count = false): IQueryBuilder {
+	private function getFilesAssociatedFilesWithMeQueryBuilder(string $userId, array $filter = [], bool $count = false, array $sort = []): IQueryBuilder {
 		$qb = $this->db->getQueryBuilder();
 		$qb->from('libresign_file', 'f')
 			->leftJoin('f', 'libresign_sign_request', 'sr', 'sr.file_id = f.id')
@@ -623,17 +615,14 @@ private function getFilesAssociatedFilesWithMeQueryBuilder(string $userId, array
 					$qb->expr()->lte('f.created_at', $qb->createNamedParameter($end, IQueryBuilder::PARAM_STR))
 				);
 			}
+			if (!empty($filter['fileName'])) {
+				$qb->andWhere(
+					$qb->expr()->like('f.name', $qb->createNamedParameter('%' . $this->db->escapeLikeParameter($filter['fileName']) . '%'))
+				);
+			}
 		}
-		return $qb;
-	}
 
-	private function getFilesAssociatedFilesWithMeStmt(
-		string $userId,
-		?array $filter = [],
-		?array $sort = [],
-	): Pagination {
-		$qb = $this->getFilesAssociatedFilesWithMeQueryBuilder($userId, $filter);
-		if (!empty($sort['sortBy'])) {
+		if (!empty($sort['sortBy']) && !empty($sort['sortDirection'])) {
 			switch ($sort['sortBy']) {
 				case 'name':
 				case 'status':
@@ -650,6 +639,16 @@ private function getFilesAssociatedFilesWithMeStmt(
 			}
 		}
 
+		return $qb;
+	}
+
+	private function getFilesAssociatedFilesWithMeStmt(
+		string $userId,
+		?array $filter = [],
+		?array $sort = [],
+	): Pagination {
+		$qb = $this->getFilesAssociatedFilesWithMeQueryBuilder($userId, $filter, false, $sort);
+
 		$countQb = $this->getFilesAssociatedFilesWithMeQueryBuilder(
 			userId: $userId,
 			filter: $filter,

lib/Search/FileSearchProvider.php

@@ -15,7 +15,6 @@
 use OCP\App\IAppManager;
 use OCP\Files\IMimeTypeDetector;
 use OCP\Files\IRootFolder;
-use OCP\IDBConnection;
 use OCP\IL10N;
 use OCP\IURLGenerator;
 use OCP\IUser;
@@ -30,7 +29,6 @@ public function __construct(
 		private IURLGenerator $urlGenerator,
 		private IRootFolder $rootFolder,
 		private IAppManager $appManager,
-		private IDBConnection $db,
 		private IMimeTypeDetector $mimeTypeDetector,
 		private SignRequestMapper $fileMapper,
 	) {
@@ -81,13 +79,6 @@ public function search(IUser $user, ISearchQuery $query): SearchResult {
 		);
 	}
 
-	/**
-	 * Format a File entity as a SearchResultEntry
-	 *
-	 * @param File $file The file entity to format
-	 * @param IUser $user Current user
-	 * @return SearchResultEntry Formatted search result entry
-	 */
 	private function formatResult(File $file, IUser $user): SearchResultEntry {
 		$userFolder = $this->rootFolder->getUserFolder($user->getUID());
 		$thumbnailUrl = '';