feat(search): allow contacts person search

Signed-off-by: hamza221 <hamzamahjoubi221@gmail.com> Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
nextcloud · Nov 14, 2023 · 19c21f2 · 19c21f2
1 parent 8b5d85a
commit 19c21f2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/apps/dav/lib/CardDAV/CardDavBackend.php b/apps/dav/lib/CardDAV/CardDavBackend.php
@@ -1118,6 +1118,7 @@ public function searchPrincipalUri(string $principalUri,
 	 *   wildcard?: bool,
 	 *   since?: DateTimeFilter|null,
 	 *   until?: DateTimeFilter|null,
+	 *   person?: string
 	 * } $options
 	 * @return array
 	 */
@@ -1182,6 +1183,9 @@ private function searchByAddressBookIds(array $addressBookIds,
 			$query2->setFirstResult($options['offset']);
 		}
 
+		if (isset($options['person'])) {
+			$query2->andWhere($query2->expr()->ilike('cp.value', $query2->createNamedParameter('%' . $this->db->escapeLikeParameter($options['person']) . '%')));
+		}
 		if (isset($options['since']) || isset($options['until'])) {
 			$query2->join('cp', $this->dbCardsPropertiesTable, 'cp_bday', 'cp.cardid = cp_bday.cardid');
 			$query2->andWhere($query2->expr()->eq('cp_bday.name', $query2->createNamedParameter('BDAY')));

diff --git a/apps/dav/lib/Search/ContactsSearchProvider.php b/apps/dav/lib/Search/ContactsSearchProvider.php
@@ -27,6 +27,7 @@
  */
 namespace OCA\DAV\Search;
 
+use OC\Search\Filter\UserFilter;
 use OCA\DAV\CardDAV\CardDavBackend;
 use OCP\App\IAppManager;
 use OCP\IL10N;
@@ -110,7 +111,7 @@ public function search(IUser $user, ISearchQuery $query): SearchResult {
 				'offset' => $query->getCursor(),
 				'since' => $query->getFilter('since'),
 				'until' => $query->getFilter('until'),
-				'person' => $query->getFilter('person'),
+				'person' => $this->getPersonDisplayName($query->getFilter('person')),
 				'company' => $query->getFilter('company'),
 			],
 		);
@@ -137,6 +138,13 @@ public function search(IUser $user, ISearchQuery $query): SearchResult {
 			$query->getCursor() + count($formattedResults)
 		);
 	}
+	private function getPersonDisplayName(?UserFilter $person): ?string{
+		$user = $person?->get();
+		if ($user instanceof IUser) {
+			return $user->getDisplayName();
+		}
+		return null;
+	}
 
 	protected function getDavUrlForContact(
 		string $principalUri,