mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

[ticket/17010] Move get subscription map to separate function and extend tests

Browse Source 
Unit tests will also now ensure there are no special surprises with more than
one subscription for users.

PHPBB3-17010
This commit is contained in:
Marc Alexander
2023-06-26 08:53:26 +02:00
parent b779ce5910
commit 79ff21fdf5
2 changed files with 36 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
phpBB/phpbb/notification/method/webpush.php
View File

@@ -169,15 +169,7 @@ class webpush extends messenger_base
$this->user_loader->load_users($notify_users, array(USER_IGNORE));
// Get subscriptions for users
$user_subscription_map = [];
$sql = 'SELECT subscription_id, user_id, endpoint, p256dh, auth
FROM ' . $this->push_subscriptions_table . '
WHERE ' . $this->db->sql_in_set('user_id', $notify_users);
$result = $this->db->sql_query($sql);
while ($row = $this->db->sql_fetchrow($result))
{
$user_subscription_map[$row['user_id']][] = $row;
}
$user_subscription_map = $this->get_user_subscription_map($notify_users);
$auth = [
'VAPID' => [
@@ -316,4 +308,29 @@ class webpush extends messenger_base
return array_intersect_key($data, $row);
}
/**
* Get subscriptions for notify users
*
* @param array $notify_users Users to notify
*
* @return array Subscription map
*/
protected function get_user_subscription_map(array $notify_users): array
{
// Get subscriptions for users
$user_subscription_map = [];
$sql = 'SELECT subscription_id, user_id, endpoint, p256dh, auth
FROM ' . $this->push_subscriptions_table . '
WHERE ' . $this->db->sql_in_set('user_id', $notify_users);
$result = $this->db->sql_query($sql);
while ($row = $this->db->sql_fetchrow($result))
{
$user_subscription_map[$row['user_id']][] = $row;
}
$this->db->sql_freeresult($result);
return $user_subscription_map;
}
}