Mascali
/
raspisms
mirror of https://github.com/RaspbianFrance/raspisms.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix bug where scheduled message was not removed when only target number has a stop sms or message is empty.

This commit is contained in:
osaajani 2021-09-17 22:31:23 +02:00
parent e2bb00cc0c
commit 1dd8756d3b
3 changed files with 35 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
v3.1.12
v3.1.13

10
controllers/internals/Scheduled.php
View File

@ -274,11 +274,11 @@ namespace controllers\internals;
/**
* Get all messages to send and the number to use to send theme.
*
* @return array : [['id_scheduled', 'text', 'id_phone', 'destination', 'flash', 'mms', 'medias'], ...]
* @return array : List of smss to send at this time per scheduled id ['1' => [['id_scheduled', 'text', 'id_phone', 'destination', 'flash', 'mms', 'medias'], ...], ...]
*/
public function get_smss_to_send()
{
$smss_to_send = [];
$smss_to_send_per_scheduled = [];
$internal_templating = new \controllers\internals\Templating();
$internal_setting = new \controllers\internals\Setting($this->bdd);
@ -297,6 +297,8 @@ namespace controllers\internals;
$scheduleds = $this->get_model()->gets_before_date($now);
foreach ($scheduleds as $scheduled)
{
$smss_to_send_per_scheduled[$scheduled['id']] = [];
if (!isset($users_settings[$scheduled['id_user']]))
{
$users_settings[$scheduled['id_user']] = [];
@ -487,11 +489,11 @@ namespace controllers\internals;
continue;
}
$smss_to_send[] = $message;
$smss_to_send_per_scheduled[$scheduled['id']][] = $message;
}
}
return $smss_to_send;
return $smss_to_send_per_scheduled;
}
/**

52
daemons/Sender.php
View File

@ -47,8 +47,8 @@ class Sender extends AbstractDaemon
$this->internal_scheduled = new \controllers\internals\Scheduled($this->bdd);
//Get smss and transmit order to send to appropriate phone daemon
$smss = $this->internal_scheduled->get_smss_to_send();
$this->transmit_smss($smss); //Add new queue to array of queues
$smss_per_scheduled = $this->internal_scheduled->get_smss_to_send();
$this->transmit_smss($smss_per_scheduled); //Add new queue to array of queues
usleep(0.5 * 1000000);
}
@ -56,34 +56,38 @@ class Sender extends AbstractDaemon
/**
* Function to transfer smss to send to phones daemons.
*
* @param array $smss : Smss to send
* @param array $smss_per_scheduled : Smss to send per scheduled id
*/
public function transmit_smss(array $smss): void
public function transmit_smss(array $smss_per_scheduled): void
{
foreach ($smss as $sms)
foreach ($smss_per_scheduled as $id_scheduled => $smss)
{
//If queue not already exists
$queue_id = (int) (QUEUE_ID_PHONE_PREFIX . $sms['id_phone']);
if (!msg_queue_exists($queue_id) || !isset($queues[$queue_id]))
foreach ($smss as $sms)
{
$this->queues[$queue_id] = msg_get_queue($queue_id);
//If queue not already exists
$queue_id = (int) (QUEUE_ID_PHONE_PREFIX . $sms['id_phone']);
if (!msg_queue_exists($queue_id) || !isset($queues[$queue_id]))
{
$this->queues[$queue_id] = msg_get_queue($queue_id);
}
$msg = [
'id_user' => $sms['id_user'],
'id_scheduled' => $sms['id_scheduled'],
'text' => $sms['text'],
'id_phone' => $sms['id_phone'],
'destination' => $sms['destination'],
'flash' => $sms['flash'],
'mms' => $sms['mms'],
'medias' => $sms['medias'] ?? [],
];
msg_send($this->queues[$queue_id], QUEUE_TYPE_SEND_MSG, $msg);
$this->logger->info('Transmit sms send signal to phone ' . $sms['id_phone'] . ' on queue ' . $queue_id . '.');
}
$msg = [
'id_user' => $sms['id_user'],
'id_scheduled' => $sms['id_scheduled'],
'text' => $sms['text'],
'id_phone' => $sms['id_phone'],
'destination' => $sms['destination'],
'flash' => $sms['flash'],
'mms' => $sms['mms'],
'medias' => $sms['medias'] ?? [],
];
msg_send($this->queues[$queue_id], QUEUE_TYPE_SEND_MSG, $msg);
$this->logger->info('Transmit sms send signal to phone ' . $sms['id_phone'] . ' on queue ' . $queue_id . '.');
$this->internal_scheduled->delete($sms['id_scheduled']);
$this->logger->info('Scheduled ' . $id_scheduled . ' treated and deleted.');
$this->internal_scheduled->delete($id_scheduled);
}
}