Allow to select contact groups as attendees

lib/Controller/ContactController.php

@@ -138,10 +138,12 @@ public function searchAttendee(string $search):JSONResponse {
 			return new JSONResponse();
 		}
 
-		$result = $this->contactsManager->search($search, ['FN', 'EMAIL']);
+		$contactsResult = $this->contactsManager->search($search, ['FN', 'EMAIL']);
+
+		$groupsContactsResult = $this->contactsManager->search($search, ['CATEGORIES']);
 
 		$contacts = [];
-		foreach ($result as $r) {
+		foreach ($contactsResult as $r) {
 			// Information about system users is fetched via DAV nowadays
 			if (isset($r['isLocalSystemBook']) && $r['isLocalSystemBook']) {
 				continue;
@@ -151,43 +153,30 @@ public function searchAttendee(string $search):JSONResponse {
 				continue;
 			}
 
-			$name = $this->getNameFromContact($r);
-			if (\is_string($r['EMAIL'])) {
-				$r['EMAIL'] = [$r['EMAIL']];
-			}
+			$contacts[] = $this->processContact($r);
+		}
 
-			$photo = isset($r['PHOTO'])
-				? $this->getPhotoUri($r['PHOTO'])
-				: null;
+		$groupsContacts = array_reduce($groupsContactsResult, function (array $acc, array $groupContact) use ($search) {
 
-			$lang = null;
-			if (isset($r['LANG'])) {
-				if (\is_array($r['LANG'])) {
-					$lang = $r['LANG'][0];
-				} else {
-					$lang = $r['LANG'];
-				}
+			// Information about system users is fetched via DAV nowadays
+			if (isset($groupContact['isLocalSystemBook']) && $groupContact['isLocalSystemBook']) {
+				return $acc;
 			}
 
-			$timezoneId = null;
-			if (isset($r['TZ'])) {
-				if (\is_array($r['TZ'])) {
-					$timezoneId = $r['TZ'][0];
-				} else {
-					$timezoneId = $r['TZ'];
-				}
+			if (!isset($groupContact['EMAIL'])) {
+				return $acc;
 			}
 
-			$contacts[] = [
-				'name' => $name,
-				'emails' => $r['EMAIL'],
-				'lang' => $lang,
-				'tzid' => $timezoneId,
-				'photo' => $photo,
-			];
-		}
+			$categories = array_filter(explode(',', $groupContact['CATEGORIES']), function (string $category) use ($search) {
+				return str_contains(mb_strtolower($category), mb_strtolower($search));
+			});
+			foreach ($categories as $category) {
+				$acc[$category][] = $this->processContact($groupContact);
+			}
+			return $acc;
+		}, []);
 
-		return new JSONResponse($contacts);
+		return new JSONResponse(['contacts' => $contacts, 'groups' => $groupsContacts]);
 	}
 
 	/**
@@ -328,4 +317,41 @@ private function getPhotoUri(string $raw):?string {
 
 		return null;
 	}
+
+	private function processContact(array $contactData): array {
+		$name = $this->getNameFromContact($contactData);
+		if (\is_string($contactData['EMAIL'])) {
+			$contactData['EMAIL'] = [$contactData['EMAIL']];
+		}
+
+		$photo = isset($contactData['PHOTO'])
+			? $this->getPhotoUri($contactData['PHOTO'])
+			: null;
+
+		$lang = null;
+		if (isset($contactData['LANG'])) {
+			if (\is_array($contactData['LANG'])) {
+				$lang = $contactData['LANG'][0];
+			} else {
+				$lang = $contactData['LANG'];
+			}
+		}
+
+		$timezoneId = null;
+		if (isset($contactData['TZ'])) {
+			if (\is_array($contactData['TZ'])) {
+				$timezoneId = $contactData['TZ'][0];
+			} else {
+				$timezoneId = $contactData['TZ'];
+			}
+		}
+
+		return [
+			'name' => $name,
+			'emails' => $contactData['EMAIL'],
+			'lang' => $lang,
+			'tzid' => $timezoneId,
+			'photo' => $photo,
+		];
+	}
 }

src/components/Editor/Invitees/InviteesListItem.vue

@@ -40,6 +40,9 @@
 				class="invitees-list-item__member-count">
 				({{ $n('calendar', '%n member', '%n members', members.length) }})
 			</span>
+			<span v-else class="invitees-list-item__member-count">
+				({{ attendeeEmail }})
+			</span>
 		</div>
 		<div class="invitees-list-item__actions">
 			<NcButton v-if="members.length"
@@ -55,11 +58,16 @@
 				</template>
 			</NcButton>
 			<Actions v-if="isViewedByOrganizer">
+				<ActionText>
+					{{ attendeeEmail }}
+					<template #icon>
+						<Email :size="20" decorative />
+					</template>
+				</ActionText>
 				<ActionCheckbox :checked="attendee.rsvp"
 					@change="toggleRSVP">
 					{{ $t('calendar', 'Request reply') }}
 				</ActionCheckbox>
-
 				<ActionRadio :name="radioName"
 					:checked="isChair"
 					@change="changeRole('CHAIR')">
@@ -111,12 +119,14 @@
 	NcActionRadio as ActionRadio,
 	NcActionCheckbox as ActionCheckbox,
 	NcButton,
+	NcActionText as ActionText,
 } from '@nextcloud/vue'
 import { removeMailtoPrefix } from '../../../utils/attendee.js'
 import ChevronDown from 'vue-material-design-icons/ChevronDown.vue'
 import ChevronUp from 'vue-material-design-icons/ChevronUp.vue'
 
 import Delete from 'vue-material-design-icons/Delete.vue'
+import Email from 'vue-material-design-icons/Email.vue'
 
 export default {
 	name: 'InviteesListItem',
@@ -125,7 +135,9 @@
 		ActionButton,
 		ActionCheckbox,
 		ActionRadio,
+	  ActionText,
 		Actions,
+	  Email,
 		Delete,
 		NcButton,
 		ChevronDown,
@@ -189,6 +201,12 @@
 
 			return ''
 		},
+		attendeeEmail() {
+			if (this.attendee.uri) {
+				return removeMailtoPrefix(this.attendee.uri)
+			}
+			return ''
+		},
 		radioName() {
 			return this._uid + '-role-radio-input-group'
 		},

src/components/Editor/Invitees/InviteesListSearch.vue

@@ -38,8 +38,12 @@
 		@option:selected="addAttendee">
 		<template #option="option">
 			<div class="invitees-search-list-item">
-				<!-- We need to specify a unique key here for the avatar to be reactive. -->
-				<Avatar v-if="option.isUser"
+				<Avatar v-if="option.type === 'group'">
+					<template #icon>
+						<AccountMultiple :size="20" />
+					</template>
+				</Avatar><!-- We need to specify a unique key here for the avatar to be reactive. -->
+				<Avatar v-else-if="option.isUser"
 					:key="option.uid"
 					:user="option.avatar"
 					:display-name="option.dropdownName" />
@@ -57,12 +61,15 @@
 					<div>
 						{{ option.dropdownName }}
 					</div>
-					<div v-if="option.email !== option.dropdownName && option.type !== 'circle'">
+					<div v-if="option.email !== option.dropdownName && option.type !== 'circle' && option.type !== 'group'">
 						{{ option.email }}
 					</div>
 					<div v-if="option.type === 'circle'">
 						{{ option.subtitle }}
 					</div>
+					<div v-if="option.type === 'group'">
+						{{ option.subtitle }}
+					</div>
 				</div>
 			</div>
 		</template>
@@ -86,13 +93,15 @@
 import { randomId } from '../../../utils/randomId.js'
 import GoogleCirclesCommunitiesIcon from 'vue-material-design-icons/GoogleCirclesCommunities.vue'
 import { showInfo } from '@nextcloud/dialogs'
+import AccountMultiple from 'vue-material-design-icons/AccountMultiple.vue'
 
 export default {
 	name: 'InviteesListSearch',
 	components: {
 		Avatar,
 		NcSelect,
 		GoogleCirclesCommunitiesIcon,
+	  AccountMultiple,
 	},
 	props: {
 		alreadyInvitedEmails: {
@@ -180,8 +189,13 @@
 			if (selectedValue.type === 'circle') {
 				showInfo(this.$t('calendar', 'Note that members of circles get invited but are not synced yet.'))
 				this.resolveCircleMembers(selectedValue.id, selectedValue.email)
+			} else if (selectedValue.type === 'group') {
+				selectedValue.contacts.forEach((contact) => {
+					this.$emit('add-attendee', contact)
+				})
+			} else {
+				this.$emit('add-attendee', selectedValue)
 			}
-			this.$emit('add-attendee', selectedValue)
 		},
 		async resolveCircleMembers(circleId, groupId) {
 			let results
@@ -195,7 +209,7 @@
 				return []
 			}
 			results.data.forEach((member) => {
-				if (!this.organizer || member.email !== this.organizer.uri) {
+				if (!this.alreadyInvitedEmails.includes(member.email) && (!this.organizer || member.email !== this.organizer.uri)) {
 					this.$emit('add-attendee', member)
 				}
 			})
@@ -212,11 +226,31 @@
 				return []
 			}
 
-			const data = response.data
-			return data.reduce((arr, result) => {
+			const contacts = []
+			/** Groups are shown before contacts */
+			for (const [groupName, groupContacts] of Object.entries(response.data.groups)) {
+				const processedGroupContacts = this.buildEmailsFromContactData(groupContacts)
+				if (processedGroupContacts.length > 0) {
+					contacts.push({
+						type: 'group',
+						dropdownName: groupName,
+						subtitle: this.$n('calendar', 'Contains %n contact(s) with email addresses', 'Contains %n contact(s) with email addresses', processedGroupContacts.length),
+						contacts: processedGroupContacts,
+					})
+				}
+			}
+
+			return contacts
+		},
+		buildEmailsFromContactData(contactsData) {
+			return contactsData.reduce((arr, result) => {
 				const hasMultipleEMails = result.emails.length > 1
 
 				result.emails.forEach((email) => {
+					if(email === '') {
+						return
+					}
+
 					let name
 					if (result.name && !hasMultipleEMails) {
 						name = result.name
@@ -231,6 +265,7 @@
 					}
 
 					arr.push({
+						type: 'contact',
 						calendarUserType: 'INDIVIDUAL',
 						commonName: result.name,
 						email,

tests/php/unit/Controller/ContactControllerTest.php

@@ -176,10 +176,10 @@ public function testSearchAttendee():void {
 			->with()
 			->willReturn(true);
 
-		$this->manager->expects(self::once())
+		$this->manager->expects(self::exactly(2))
 			->method('search')
-			->with('search 123', ['FN', 'EMAIL'])
-			->willReturn([
+			->withConsecutive(['search 123', ['FN', 'EMAIL']], ['search 123', ['CATEGORIES']])
+			->willReturnOnConsecutiveCalls([
 				[
 					'FN' => 'Person 1',
 					'ADR' => [
@@ -222,29 +222,68 @@ public function testSearchAttendee():void {
 					'TZ' => 'Australia/Adelaide',
 					'PHOTO' => 'VALUE:BINARY:4242424242'
 				],
+			], [
+				[
+					'FN' => 'Person 4',
+					'EMAIL' => '[email protected]',
+					'CATEGORIES' => 'search 123,other'
+				],
+				[
+					'FN' => 'Person 5',
+					'CATEGORIES' => 'search 123'
+				],
+				[
+					'FN' => 'Person 6',
+					'EMAIL' => '[email protected]',
+					'CATEGORIES' => 'search 123'
+				],
 			]);
 
 		$response = $this->controller->searchAttendee('search 123');
 
 		$this->assertInstanceOf(JSONResponse::class, $response);
 		$this->assertEquals([
-			[
-				'name' => 'Person 1',
-				'emails' => [
-					'[email protected]',
-					'[email protected]',
-				],
-				'lang' => 'de',
-				'tzid' => 'Europe/Berlin',
-				'photo' => 'http://foo.bar',
-			], [
-				'name' => 'Person 2',
-				'emails' => [
-					'[email protected]'
-				],
-				'lang' => null,
-				'tzid' => null,
-				'photo' => null,
+			'contacts' => [
+				[
+					'name' => 'Person 1',
+					'emails' => [
+						'[email protected]',
+						'[email protected]',
+					],
+					'lang' => 'de',
+					'tzid' => 'Europe/Berlin',
+					'photo' => 'http://foo.bar',
+				], [
+					'name' => 'Person 2',
+					'emails' => [
+						'[email protected]'
+					],
+					'lang' => null,
+					'tzid' => null,
+					'photo' => null,
+				]
+			],
+			'groups' => [
+				'search 123' => [
+					[
+						'name' => 'Person 4',
+						'emails' => [
+							'[email protected]'
+						],
+						'lang' => null,
+						'tzid' => null,
+						'photo' => null,
+					],
+					[
+						'name' => 'Person 6',
+						'emails' => [
+							'[email protected]'
+						],
+						'lang' => null,
+						'tzid' => null,
+						'photo' => null,
+					]
+				]
 			]
 		], $response->getData());
 		$this->assertEquals(200, $response->getStatus());