MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

chg: [internal] Small optimisation for filterEventIds

pull/6816/head
Jakub Onderka 2021-01-04 18:29:32 +01:00
parent db03e8f4f3
commit 355abc05eb
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Lib/Dashboard/CsseCovidTrendsWidget.php
View File

@ -55,7 +55,7 @@ class CsseCovidTrendsWidget
'date' => (empty($options['timeframe']) ? 10 : $options['timeframe']) . 'd'
);
$eventIds = $this->Event->filterEventIds($user, $params);
$eventIds = array_reverse(array_values($eventIds));
$eventIds = array_reverse($eventIds);
$data = array();
if (empty($options['type'])) {
$options['type'] = 'confirmed';

19
app/Model/Event.php
View File

@ -1691,6 +1691,12 @@ class Event extends AppModel
return $tempConditions;
}
/**
* @param array $user
* @param array $params
* @param int $result_count
* @return array Event IDs, when `include_attribute_count` is enabled, then it is Event ID => Attribute count
*/
public function filterEventIds($user, &$params = array(), &$result_count = 0)
{
$conditions = $this->createEventConditions($user);
@ -1774,14 +1780,9 @@ class Event extends AppModel
}
}
}
$fields = array('Event.id');
if (!empty($params['include_attribute_count'])) {
$fields[] = 'Event.attribute_count';
}
$find_params = array(
'conditions' => $conditions,
'recursive' => -1,
'fields' => $fields
);
if (isset($params['order'])) {
$find_params['order'] = $params['order'];
@ -1794,7 +1795,13 @@ class Event extends AppModel
$find_params['page'] = $params['page'];
}
}
$results = $this->find('list', $find_params);
if (!empty($params['include_attribute_count'])) {
$find_params['fields'] = array('Event.id', 'Event.attribute_count');
$results = $this->find('list', $find_params);
} else {
$find_params['fields'] = array('Event.id');
$results = $this->find('column', $find_params);
}
if (!isset($params['limit'])) {
$result_count = count($results);
}