hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Test TextNode with private fields and concepts on private fields

Browse Source
This commit is contained in:
Mathieu Darse
2015-08-26 17:42:47 +02:00
parent b1bdd73662
commit e058814638
4 changed files with 111 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/Alchemy/Phrasea/SearchEngine/Elastic/AST/AbstractTermNode.php
View File

@@ -25,6 +25,28 @@ abstract class AbstractTermNode extends Node implements TermInterface
$this->concepts = $concepts;
}
protected function buildConceptQueries(QueryContext $context)
{
$concept_query = $this->buildConceptQuery($context);
if ($concept_query === null) {
return [];
}
// Extract all should clauses
if (
isset($concept_query['bool']) &&
isset($concept_query['bool']['should']) &&
count($concept_query) === 1 /* no options or must(_not) clauses */
) {
return isset($concept_query['bool']['should'][0]) ?
$concept_query['bool']['should'] :
[$concept_query['bool']['should']];
}
// Fallback to returning full query
return [$concept_query];
}
protected function buildConceptQuery(QueryContext $context)
{
$concepts = Concept::pruneNarrowConcepts($this->concepts);

17
lib/Alchemy/Phrasea/SearchEngine/Elastic/AST/TermNode.php
View File

@@ -9,18 +9,13 @@ class TermNode extends AbstractTermNode
{
public function buildQuery(QueryContext $context)
{
$query = $this->buildConceptQuery($context);
// Should not match anything if no concept is defined
if ($query === null) {
$query = [
'bool' => [
'should' => []
]
];
}
return $query;
// TODO Ensure no match when no concept queries are provided
return [
'bool' => [
'should' => $this->buildConceptQueries($context)
]
];
}
public function __toString()

4
lib/Alchemy/Phrasea/SearchEngine/Elastic/AST/TextNode.php
View File

@@ -68,8 +68,8 @@ class TextNode extends AbstractTermNode implements ContextAbleInterface
$query = QueryHelper::applyBooleanClause($query, 'should', $private_field_query);
}
$concept_query = $this->buildConceptQuery($context);
if ($concept_query !== null) {
$concept_queries = $this->buildConceptQueries($context);
foreach ($concept_queries as $concept_query) {
$query = QueryHelper::applyBooleanClause($query, 'should', $concept_query);
}

81
tests/Alchemy/Tests/Phrasea/SearchEngine/AST/TextNodeTest.php
View File

@@ -154,4 +154,85 @@ class TextNodeTest extends \PHPUnit_Framework_TestCase
$this->assertEquals(json_decode($expected, true), $query);
}
public function testQueryBuildWithPrivateFieldAndConcept()
{
$public_field = new Field('foo', Mapping::TYPE_STRING, ['private' => false]);
$private_field = new Field('bar', Mapping::TYPE_STRING, [
'private' => true,
'used_by_collections' => [1, 2, 3]
]);
$query_context = $this->prophesize(QueryContext::class);
$query_context
->getUnrestrictedFields()
->willReturn([$public_field]);
$query_context
->localizeField($public_field)
->willReturn(['foo.fr', 'foo.en']);
$query_context
->getPrivateFields()
->willReturn([$private_field]);
$query_context
->localizeField($private_field)
->willReturn(['private_caption.bar.fr', 'private_caption.bar.en']);
$node = new TextNode('baz');
$node->setConcepts([
new Concept('/qux'),
]);
$query = $node->buildQuery($query_context->reveal());
$expected = '{
"bool": {
"should": [{
"multi_match": {
"fields": ["foo.fr", "foo.en"],
"query": "baz",
"operator": "and",
"lenient": true
}
}, {
"filtered": {
"filter": {
"terms": {
"base_id": [1, 2, 3]
}
},
"query": {
"multi_match": {
"fields": ["private_caption.bar.fr", "private_caption.bar.en"],
"query": "baz",
"operator": "and",
"lenient": true
}
}
}
}, {
"multi_match": {
"fields": [
"concept_path.foo"
],
"query": "\/qux"
}
}, {
"filtered": {
"filter": {
"terms": {
"base_id": [1, 2, 3]
}
},
"query": {
"multi_match": {
"fields": ["concept_path.bar"],
"query": "/qux"
}
}
}
}]
}
}';
$this->assertEquals(json_decode($expected, true), $query);
}
}