openinfra/openstackid-resources
Code Issues Proposed changes

Added filtering by message to push notifications

Browse Source 
Change-Id: I785939bd07892ec74dd693f1e0a997f62b39cc65
This commit is contained in:
smarcet
2020-02-06 15:29:39 -03:00
parent 2b41e04669
commit 28a96f33c1
10 changed files with 311 additions and 295 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Repositories/Summit/DoctrineSummitEventRepository.php
View File

@@ -172,8 +172,8 @@ final class DoctrineSummitEventRepository
protected function getOrderMappings()
{
return [
'title' => 'e.title',
'id' => 'e.id',
'title' => 'e.title',
'start_date' => 'e.start_date',
'end_date' => 'e.end_date',
'created' => 'e.created',
@@ -211,10 +211,14 @@ final class DoctrineSummitEventRepository
if (!is_null($order)) {
$order->apply2Query($query, $this->getOrderMappings());
if(!$order->hasOrder('id')) {
$query = $query->addOrderBy("e.id", 'ASC');
}
} else {
//default order
$query = $query->addOrderBy("e.start_date",'ASC');
$query = $query->addOrderBy("e.end_date", 'ASC');
$query = $query->addOrderBy("e.id", 'ASC');
}

1
app/Repositories/Summit/DoctrineSummitNotificationRepository.php
View File

@@ -42,6 +42,7 @@ final class DoctrineSummitNotificationRepository
{
return [
'event_id' => 'e.id:json_int',
'message' => 'n.message:json_string',
'channel' => 'n.channel:json_string',
'sent_date' => 'n.sent_date:datetime_epoch',
'created' => 'n.created:datetime_epoch',