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

chg: [internal] Optimise Attribute::valueIsUnique check

pull/7823/head
Jakub Onderka 2021-10-09 17:45:12 +02:00
parent 5e320a1dbd
commit 6da85b4494
1 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/Model/Attribute.php
View File

@ -678,7 +678,7 @@ class Attribute extends AppModel
*/
public function valueIsUnique($fields)
{
if (isset($this->data['Attribute']['deleted']) && $this->data['Attribute']['deleted']) {
if (!empty($this->data['Attribute']['deleted'])) {
return true;
}
// We escape this rule for objects as we can have the same category/type/value combination in different objects
@ -686,14 +686,11 @@ class Attribute extends AppModel
return true;
}
$eventId = $this->data['Attribute']['event_id'];
$category = $this->data['Attribute']['category'];
$type = $this->data['Attribute']['type'];
$conditions = array(
'Attribute.event_id' => $eventId,
'Attribute.event_id' => $this->data['Attribute']['event_id'],
'Attribute.type' => $type,
'Attribute.category' => $category,
'Attribute.category' => $this->data['Attribute']['category'],
'Attribute.deleted' => 0,
'Attribute.object_id' => 0,
);
@ -711,18 +708,7 @@ class Attribute extends AppModel
$conditions['Attribute.id !='] = $this->data['Attribute']['id'];
}
$params = array(
'recursive' => -1,
'fields' => array('id'),
'conditions' => $conditions,
'order' => false,
);
if (!empty($this->find('first', $params))) {
// value isn't unique
return false;
}
// value is unique
return true;
return !$this->hasAny($conditions);
}
public function validateTypeValue($fields)