CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-09-29 17:01:37 +13:00
Code Issues Projects Releases Wiki Activity

adds search attribute filter

Browse source
This commit is contained in:
prateek banga 2023-11-14 14:07:52 +05:30
parent 8f53301209
commit f84a00dded
5 changed files with 76 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/config/collections.php
View file

@ -1467,9 +1467,9 @@ $commonCollections = [
'size' => 65535, 'size' => 65535,
'signed' => true, 'signed' => true,
'required' => false, 'required' => false,
'default' => null, 'default' => '',
'array' => false, 'array' => false,
'filters' => [], 'filters' => ['providerSearch'],
], ],
], ],
'indexes' => [ 'indexes' => [
@ -1640,9 +1640,9 @@ $commonCollections = [
'size' => 16384, 'size' => 16384,
'signed' => true, 'signed' => true,
'required' => false, 'required' => false,
'default' => null, 'default' => '',
'array' => false, 'array' => false,
'filters' => [], 'filters' => ['messageSearch'],
], ],
], ],
'indexes' => [ 'indexes' => [
@ -1712,9 +1712,9 @@ $commonCollections = [
'size' => 16384, 'size' => 16384,
'signed' => true, 'signed' => true,
'required' => false, 'required' => false,
'default' => null, 'default' => '',
'array' => false, 'array' => false,
'filters' => [], 'filters' => ['topicSearch'],
], ],
], ],
'indexes' => [ 'indexes' => [

44
app/controllers/api/messaging.php
View file

@ -68,7 +68,6 @@ App::post('/v1/messaging/providers/mailgun')
'provider' => 'mailgun', 'provider' => 'mailgun',
'type' => 'email', 'type' => 'email',
'enabled' => $enabled, 'enabled' => $enabled,
'search' => $providerId . ' ' . $name . ' ' . 'mailgun' . ' ' . 'email',
'credentials' => [ 'credentials' => [
'apiKey' => $apiKey, 'apiKey' => $apiKey,
'domain' => $domain, 'domain' => $domain,
@ -133,7 +132,6 @@ App::post('/v1/messaging/providers/sendgrid')
'provider' => 'sendgrid', 'provider' => 'sendgrid',
'type' => 'email', 'type' => 'email',
'enabled' => $enabled, 'enabled' => $enabled,
'search' => $providerId . ' ' . $name . ' ' . 'sendgrid' . ' ' . 'email',
'credentials' => [ 'credentials' => [
'apiKey' => $apiKey, 'apiKey' => $apiKey,
], ],
@ -196,7 +194,6 @@ App::post('/v1/messaging/providers/msg91')
'name' => $name, 'name' => $name,
'provider' => 'msg91', 'provider' => 'msg91',
'type' => 'sms', 'type' => 'sms',
'search' => $providerId . ' ' . $name . ' ' . 'msg91' . ' ' . 'sms',
'enabled' => $enabled, 'enabled' => $enabled,
'credentials' => [ 'credentials' => [
'senderId' => $senderId, 'senderId' => $senderId,
@ -261,7 +258,6 @@ App::post('/v1/messaging/providers/telesign')
'name' => $name, 'name' => $name,
'provider' => 'telesign', 'provider' => 'telesign',
'type' => 'sms', 'type' => 'sms',
'search' => $providerId . ' ' . $name . ' ' . 'telesign' . ' ' . 'sms',
'enabled' => $enabled, 'enabled' => $enabled,
'credentials' => [ 'credentials' => [
'username' => $username, 'username' => $username,
@ -324,9 +320,8 @@ App::post('/v1/messaging/providers/textmagic')
$provider = new Document([ $provider = new Document([
'$id' => $providerId, '$id' => $providerId,
'name' => $name, 'name' => $name,
'provider' => 'text-magic', 'provider' => 'textmagic',
'type' => 'sms', 'type' => 'sms',
'search' => $providerId . ' ' . $name . ' ' . 'text-magic' . ' ' . 'sms',
'enabled' => $enabled, 'enabled' => $enabled,
'credentials' => [ 'credentials' => [
'username' => $username, 'username' => $username,
@ -391,7 +386,6 @@ App::post('/v1/messaging/providers/twilio')
'name' => $name, 'name' => $name,
'provider' => 'twilio', 'provider' => 'twilio',
'type' => 'sms', 'type' => 'sms',
'search' => $providerId . ' ' . $name . ' ' . 'twilio' . ' ' . 'sms',
'enabled' => $enabled, 'enabled' => $enabled,
'credentials' => [ 'credentials' => [
'accountSid' => $accountSid, 'accountSid' => $accountSid,
@ -456,7 +450,6 @@ App::post('/v1/messaging/providers/vonage')
'name' => $name, 'name' => $name,
'provider' => 'vonage', 'provider' => 'vonage',
'type' => 'sms', 'type' => 'sms',
'search' => $providerId . ' ' . $name . ' ' . 'vonage' . ' ' . 'sms',
'enabled' => $enabled, 'enabled' => $enabled,
'credentials' => [ 'credentials' => [
'apiKey' => $apiKey, 'apiKey' => $apiKey,
@ -519,7 +512,6 @@ App::post('/v1/messaging/providers/fcm')
'name' => $name, 'name' => $name,
'provider' => 'fcm', 'provider' => 'fcm',
'type' => 'push', 'type' => 'push',
'search' => $providerId . ' ' . $name . ' ' . 'fcm' . ' ' . 'push',
'enabled' => $enabled, 'enabled' => $enabled,
'credentials' => [ 'credentials' => [
'serverKey' => $serverKey, 'serverKey' => $serverKey,
@ -582,7 +574,6 @@ App::post('/v1/messaging/providers/apns')
'name' => $name, 'name' => $name,
'provider' => 'apns', 'provider' => 'apns',
'type' => 'push', 'type' => 'push',
'search' => $providerId . ' ' . $name . ' ' . 'apns' . ' ' . 'push',
'enabled' => $enabled, 'enabled' => $enabled,
'credentials' => [ 'credentials' => [
'authKey' => $authKey, 'authKey' => $authKey,
@ -806,7 +797,6 @@ App::patch('/v1/messaging/providers/mailgun/:providerId')
if (!empty($name)) { if (!empty($name)) {
$provider->setAttribute('name', $name); $provider->setAttribute('name', $name);
$provider->setAttribute('search', $provider->getId() . ' ' . $name . ' ' . 'mailgun' . ' ' . 'email');
} }
if (!empty($from)) { if (!empty($from)) {
@ -894,7 +884,6 @@ App::patch('/v1/messaging/providers/sendgrid/:providerId')
if (!empty($name)) { if (!empty($name)) {
$provider->setAttribute('name', $name); $provider->setAttribute('name', $name);
$provider->setAttribute('search', $provider->getId() . ' ' . $name . ' ' . 'sendgrid' . ' ' . 'email');
} }
if (!empty($from)) { if (!empty($from)) {
@ -973,7 +962,6 @@ App::patch('/v1/messaging/providers/msg91/:providerId')
if (!empty($name)) { if (!empty($name)) {
$provider->setAttribute('name', $name); $provider->setAttribute('name', $name);
$provider->setAttribute('search', $provider->getId() . ' ' . $name . ' ' . 'msg91' . ' ' . 'sms');
} }
if (!empty($from)) { if (!empty($from)) {
@ -1058,7 +1046,6 @@ App::patch('/v1/messaging/providers/telesign/:providerId')
if (!empty($name)) { if (!empty($name)) {
$provider->setAttribute('name', $name); $provider->setAttribute('name', $name);
$provider->setAttribute('search', $provider->getId() . ' ' . $name . ' ' . 'telesign' . ' ' . 'sms');
} }
if (!empty($from)) { if (!empty($from)) {
@ -1137,13 +1124,12 @@ App::patch('/v1/messaging/providers/textmagic/:providerId')
} }
$providerAttr = $provider->getAttribute('provider'); $providerAttr = $provider->getAttribute('provider');
if ($providerAttr !== 'text-magic') { if ($providerAttr !== 'textmagic') {
throw new Exception(Exception::PROVIDER_INCORRECT_TYPE); throw new Exception(Exception::PROVIDER_INCORRECT_TYPE);
} }
if (!empty($name)) { if (!empty($name)) {
$provider->setAttribute('name', $name); $provider->setAttribute('name', $name);
$provider->setAttribute('search', $provider->getId() . ' ' . $name . ' ' . 'textmagic' . ' ' . 'sms');
} }
if (!empty($from)) { if (!empty($from)) {
@ -1228,7 +1214,6 @@ App::patch('/v1/messaging/providers/twilio/:providerId')
if (!empty($name)) { if (!empty($name)) {
$provider->setAttribute('name', $name); $provider->setAttribute('name', $name);
$provider->setAttribute('search', $provider->getId() . ' ' . $name . ' ' . 'twilio' . ' ' . 'sms');
} }
if (!empty($from)) { if (!empty($from)) {
@ -1313,7 +1298,6 @@ App::patch('/v1/messaging/providers/vonage/:providerId')
if (!empty($name)) { if (!empty($name)) {
$provider->setAttribute('name', $name); $provider->setAttribute('name', $name);
$provider->setAttribute('search', $provider->getId() . ' ' . $name . ' ' . 'vonage' . ' ' . 'sms');
} }
if (!empty($from)) { if (!empty($from)) {
@ -1396,7 +1380,6 @@ App::patch('/v1/messaging/providers/fcm/:providerId')
if (!empty($name)) { if (!empty($name)) {
$provider->setAttribute('name', $name); $provider->setAttribute('name', $name);
$provider->setAttribute('search', $provider->getId() . ' ' . $name . ' ' . 'fcm' . ' ' . 'push');
} }
if ($enabled === true || $enabled === false) { if ($enabled === true || $enabled === false) {
@ -1470,7 +1453,6 @@ App::patch('/v1/messaging/providers/apns/:providerId')
if (!empty($name)) { if (!empty($name)) {
$provider->setAttribute('name', $name); $provider->setAttribute('name', $name);
$provider->setAttribute('search', $provider->getId() . ' ' . $name . ' ' . 'apns' . ' ' . 'push');
} }
if ($enabled === true || $enabled === false) { if ($enabled === true || $enabled === false) {
@ -1588,9 +1570,6 @@ App::post('/v1/messaging/topics')
if ($description) { if ($description) {
$topic->setAttribute('description', $description); $topic->setAttribute('description', $description);
$topic->setAttribute('search', $topic->getId() . ' ' . $name . ' ' . $description);
} else {
$topic->setAttribute('search', $topic->getId() . ' ' . $name);
} }
try { try {
@ -1796,16 +1775,6 @@ App::patch('/v1/messaging/topics/:topicId')
$topic->setAttribute('description', $description); $topic->setAttribute('description', $description);
} }
if (!empty($name) || !empty($description)) {
if (!empty($name) && !empty($description)) {
$topic->setAttribute('search', $topic->getId() . ' ' . $name . ' ' . $description);
} elseif (!empty($name)) {
$topic->setAttribute('search', $topic->getId() . ' ' . $name . ' ' . $topic->getAttribute('description'));
} else {
$topic->setAttribute('search', $topic->getId() . ' ' . $topic->getAttribute('name') . ' ' . $description);
}
}
$topic = $dbForProject->updateDocument('topics', $topicId, $topic); $topic = $dbForProject->updateDocument('topics', $topicId, $topic);
$queueForEvents $queueForEvents
@ -2174,7 +2143,6 @@ App::post('/v1/messaging/messages/email')
'html' => $html, 'html' => $html,
], ],
'status' => $status, 'status' => $status,
'search' => $messageId . ' ' . $description . ' ' . $subject,
])); ]));
if ($status === 'processing') { if ($status === 'processing') {
@ -2236,7 +2204,6 @@ App::post('/v1/messaging/messages/sms')
'content' => $content, 'content' => $content,
], ],
'status' => $status, 'status' => $status,
'search' => $messageId . ' ' . $description,
])); ]));
if ($status === 'processing') { if ($status === 'processing') {
@ -2338,7 +2305,6 @@ App::post('/v1/messaging/messages/push')
'deliveryTime' => $deliveryTime, 'deliveryTime' => $deliveryTime,
'data' => $pushData, 'data' => $pushData,
'status' => $status, 'status' => $status,
'search' => $messageId . ' ' . $description . ' ' . $title,
])); ]));
if ($status === 'processing') { if ($status === 'processing') {
@ -2583,8 +2549,6 @@ App::patch('/v1/messaging/messages/email/:messageId')
$message->setAttribute('description', $description); $message->setAttribute('description', $description);
} }
$message->setAttribute('search', $message->getId() . ' ' . $message->getAttribute('description') . ' ' . $data['subject'] . ' ' . $message->getAttribute('providerId'));
if (!empty($status)) { if (!empty($status)) {
$message->setAttribute('status', $status); $message->setAttribute('status', $status);
} }
@ -2683,8 +2647,6 @@ App::patch('/v1/messaging/messages/sms/:messageId')
$message->setAttribute('deliveryTime', $deliveryTime); $message->setAttribute('deliveryTime', $deliveryTime);
} }
$message->setAttribute('search', $message->getId() . ' ' . $message->getAttribute('description') . ' ' . $message->getAttribute('providerId'));
$message = $dbForProject->updateDocument('messages', $message->getId(), $message); $message = $dbForProject->updateDocument('messages', $message->getId(), $message);
if ($status === 'processing') { if ($status === 'processing') {
@ -2814,8 +2776,6 @@ App::patch('/v1/messaging/messages/push/:messageId')
$message->setAttribute('deliveryTime', $deliveryTime); $message->setAttribute('deliveryTime', $deliveryTime);
} }
$message->setAttribute('search', $message->getId() . ' ' . $message->getAttribute('description') . ' ' . $pushData['title'] . ' ' . $message->getAttribute('providerId'));
$message = $dbForProject->updateDocument('messages', $message->getId(), $message); $message = $dbForProject->updateDocument('messages', $message->getId(), $message);
if ($status === 'processing') { if ($status === 'processing') {

64
app/init.php
View file

@ -557,6 +557,70 @@ Database::addFilter(
return []; return [];
} }
); );
Database::addFilter(
'providerSearch',
function (mixed $value, Document $provider) {
$searchValues = [
$provider->getId(),
$provider->getAttribute('name', ''),
$provider->getAttribute('provider', ''),
$provider->getAttribute('type', '')
];
$search = implode(' ', \array_filter($searchValues));
return $search;
},
function (mixed $value) {
return $value;
}
);
Database::addFilter(
'topicSearch',
function (mixed $value, Document $topic) {
$searchValues = [
$topic->getId(),
$topic->getAttribute('name', ''),
$topic->getAttribute('description', ''),
];
$search = implode(' ', \array_filter($searchValues));
return $search;
},
function (mixed $value) {
return $value;
}
);
Database::addFilter(
'messageSearch',
function (mixed $value, Document $message) {
$searchValues = [
$message->getId(),
$message->getAttribute('description', ''),
$message->getAttribute('status', ''),
];
if (\array_key_exists('subject', $message->getAttribute('data'))) {
$searchValues[] = \array_merge($searchValues, [$message->getAttribute('data')['subject'], 'email']);
} else if (\array_key_exists('content', $message->getAttribute('data'))) {
$searchValues[] = \array_merge($searchValues, [$message->getAttribute('data')['content'], 'sms']);
} else {
$searchValues[] = \array_merge($searchValues, [$message->getAttribute('data')['title'], 'push']);
}
$search = implode(' ', \array_filter($searchValues));
return $search;
},
function (mixed $value) {
return $value;
}
);
/** /**
* DB Formats * DB Formats
*/ */

4
composer.lock generated
View file

@ -1958,7 +1958,7 @@
"issues": "https://github.com/utopia-php/database/issues", "issues": "https://github.com/utopia-php/database/issues",
"source": "https://github.com/utopia-php/database/tree/0.45.1" "source": "https://github.com/utopia-php/database/tree/0.45.1"
}, },
"time": "2023-11-01T08:30:19+00:00" "time": "2023-11-09T22:39:48+00:00"
}, },
{ {
"name": "utopia-php/domains", "name": "utopia-php/domains",
@ -5822,5 +5822,5 @@
"platform-overrides": { "platform-overrides": {
"php": "8.0" "php": "8.0"
}, },
"plugin-api-version": "2.6.0" "plugin-api-version": "2.3.0"
} }

4
tests/e2e/Services/Messaging/MessagingBase.php
View file

@ -353,7 +353,7 @@ trait MessagingBase
*/ */
public function testGetSubscriber(array $data) public function testGetSubscriber(array $data)
{ {
$response = $this->client->call(Client::METHOD_GET, '/messaging/topics/' . $data['topicId'] . '/subscriber/' . $data['subscriberId'], \array_merge([ $response = $this->client->call(Client::METHOD_GET, '/messaging/topics/' . $data['topicId'] . '/subscribers/' . $data['subscriberId'], \array_merge([
'content-type' => 'application/json', 'content-type' => 'application/json',
'x-appwrite-project' => $this->getProject()['$id'], 'x-appwrite-project' => $this->getProject()['$id'],
'x-appwrite-key' => $this->getProject()['apiKey'], 'x-appwrite-key' => $this->getProject()['apiKey'],
@ -496,7 +496,7 @@ trait MessagingBase
*/ */
public function testDeleteSubscriber(array $data) public function testDeleteSubscriber(array $data)
{ {
$response = $this->client->call(Client::METHOD_DELETE, '/messaging/topics/' . $data['topicId'] . '/subscriber/' . $data['subscriberId'], \array_merge([ $response = $this->client->call(Client::METHOD_DELETE, '/messaging/topics/' . $data['topicId'] . '/subscribers/' . $data['subscriberId'], \array_merge([
'content-type' => 'application/json', 'content-type' => 'application/json',
'x-appwrite-project' => $this->getProject()['$id'], 'x-appwrite-project' => $this->getProject()['$id'],
], $this->getHeaders())); ], $this->getHeaders()));