fixup! feat: allow inviting contact groups

nextcloud · Oct 14, 2024 · 16d93ed · 16d93ed
1 parent 6202619
commit 16d93ed
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/lib/Controller/ContactController.php b/lib/Controller/ContactController.php
@@ -109,7 +109,7 @@ public function searchAttendee(string $search):JSONResponse {
 
 		$contacts = [];
 		foreach ($result as $r) {
-			if (!$this->contactsService->hasEmail($r) || $this->contactsService->isSystemBook($r)) {
+			if ($this->contactsService->isSystemBook($r) || !$this->contactsService->hasEmail($r)) {
 				continue;
 			}
 			$name = $this->contactsService->getNameFromContact($r);

diff --git a/lib/Service/ContactsService.php b/lib/Service/ContactsService.php
@@ -109,7 +109,7 @@ public function filterGroupsWithCount(array $groups, string $search): array {
 		$categories = [];
 		foreach ($groups as $group) {
 			$categories[] = array_filter(explode(',', $group['CATEGORIES']), static function ($cat) use ($search) {
-				return str_contains(strtolower($cat), $search);
+				return str_contains(strtolower($cat), strtolower($search));
 			});
 		}
 		return array_count_values(array_merge(...$categories));

diff --git a/tests/php/unit/Controller/ContactControllerTest.php b/tests/php/unit/Controller/ContactControllerTest.php
@@ -8,6 +8,7 @@
 namespace OCA\Calendar\Controller;
 
 use ChristophWurst\Nextcloud\Testing\TestCase;
+use OCA\Calendar\Service\ContactsService;
 use OCP\App\IAppManager;
 use OCP\AppFramework\Http\JSONResponse;
 use OCP\Contacts\IManager;
@@ -30,6 +31,7 @@ class ContactControllerTest extends TestCase {
 
 	/** @var IUserManager|MockObject */
 	private $userManager;
+	private ContactsService|MockObject $service;
 
 	/** @var ContactController */
 	protected $controller;
@@ -42,8 +44,14 @@ protected function setUp():void {
 		$this->manager = $this->createMock(IManager::class);
 		$this->appManager = $this->createMock(IAppManager::class);
 		$this->userManager = $this->createMock(IUserManager::class);
+		$this->service = $this->createMock(ContactsService::class);
 		$this->controller = new ContactController($this->appName,
-			$this->request, $this->manager, $this->appManager, $this->userManager);
+			$this->request,
+			$this->manager,
+			$this->appManager,
+			$this->userManager,
+			$this->service
+		);
 	}
 
 	public function testSearchLocationDisabled():void {