Quick-Search: Added Quick-search in the topbar
Changed how and what we store in elastic to unify it with how we store things in mongodb so we can have more generic javascript code to render the data. Elastic changes: Added: Node.project.url Altered to store id instead of url Node.picture Made Post searchable ./manage.py elastic reset_index ./manage.py elastic reindex Thanks to Pablo and Sybren
This commit is contained in:
335
tests/test_api/test_search_queries_nodes.py
Normal file
335
tests/test_api/test_search_queries_nodes.py
Normal file
@@ -0,0 +1,335 @@
|
||||
import copy
|
||||
|
||||
from pillar.api.search.queries import create_node_search, create_multi_node_search
|
||||
from pillar.tests import AbstractPillarTest
|
||||
|
||||
EMPTY_QUERY = {
|
||||
"query": {
|
||||
"bool": {
|
||||
"must": [
|
||||
{
|
||||
"bool": {}
|
||||
}
|
||||
]
|
||||
}
|
||||
},
|
||||
}
|
||||
|
||||
AGGREGATIONS = {
|
||||
"aggs": {
|
||||
"node_type": {
|
||||
"terms": {
|
||||
"field": "node_type"
|
||||
}
|
||||
},
|
||||
"media": {
|
||||
"terms": {
|
||||
"field": "media"
|
||||
}
|
||||
},
|
||||
"tags": {
|
||||
"terms": {
|
||||
"field": "tags"
|
||||
}
|
||||
},
|
||||
"is_free": {
|
||||
"terms": {
|
||||
"field": "is_free"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
SORTED_DESC_BY_CREATED = {
|
||||
"sort": [{
|
||||
"created_at": {"order": "desc"}
|
||||
}]
|
||||
}
|
||||
|
||||
PAGE_1 = {
|
||||
"from": 0,
|
||||
"size": 10
|
||||
}
|
||||
|
||||
IN_PROJECT = {
|
||||
"term": {
|
||||
"project.id": "MyProjectId"
|
||||
}
|
||||
}
|
||||
|
||||
NODE_INDEX = {
|
||||
"index": ["test_nodes"]
|
||||
}
|
||||
|
||||
|
||||
class TestSearchNodesGlobal(AbstractPillarTest):
|
||||
def test_empty_query(self):
|
||||
with self.app.app_context():
|
||||
search = create_node_search(query='', terms={}, page=0)
|
||||
expected = {
|
||||
**EMPTY_QUERY,
|
||||
**AGGREGATIONS,
|
||||
**SORTED_DESC_BY_CREATED,
|
||||
**PAGE_1
|
||||
}
|
||||
|
||||
self.assertEquals(expected, search.to_dict())
|
||||
|
||||
def test_empty_query_page_2(self):
|
||||
with self.app.app_context():
|
||||
search = create_node_search(query='', terms={}, page=1)
|
||||
page_2 = copy.deepcopy(PAGE_1)
|
||||
page_2['from'] = 10
|
||||
|
||||
expected = {
|
||||
**EMPTY_QUERY,
|
||||
**AGGREGATIONS,
|
||||
**SORTED_DESC_BY_CREATED,
|
||||
**page_2
|
||||
}
|
||||
|
||||
self.assertEquals(expected, search.to_dict())
|
||||
|
||||
def test_empty_query_with_terms(self):
|
||||
with self.app.app_context():
|
||||
terms = {
|
||||
'is_free': '0',
|
||||
'node_type': 'asset',
|
||||
}
|
||||
search = create_node_search(query='', terms=terms, page=0)
|
||||
query = copy.deepcopy(EMPTY_QUERY)
|
||||
query['query']['bool']['filter'] = [
|
||||
{
|
||||
"term": {
|
||||
"is_free": False
|
||||
}
|
||||
},
|
||||
{
|
||||
"term": {
|
||||
"node_type": "asset"
|
||||
}
|
||||
}
|
||||
]
|
||||
|
||||
expected = {
|
||||
**query,
|
||||
**AGGREGATIONS,
|
||||
**SORTED_DESC_BY_CREATED,
|
||||
**PAGE_1
|
||||
}
|
||||
|
||||
self.assertEquals(expected, search.to_dict())
|
||||
|
||||
def test_query(self):
|
||||
with self.app.app_context():
|
||||
search = create_node_search(query='is there life on mars?', terms={}, page=0)
|
||||
query = copy.deepcopy(EMPTY_QUERY)
|
||||
query['query']['bool']['must'] = [
|
||||
{
|
||||
"bool": {
|
||||
"should": [
|
||||
{
|
||||
"match": {
|
||||
"name": "is there life on mars?"
|
||||
}
|
||||
},
|
||||
{
|
||||
"match": {
|
||||
"project.name": "is there life on mars?"
|
||||
}
|
||||
},
|
||||
{
|
||||
"match": {
|
||||
"user.name": "is there life on mars?"
|
||||
}
|
||||
},
|
||||
{
|
||||
"match": {
|
||||
"description": "is there life on mars?"
|
||||
}
|
||||
},
|
||||
{
|
||||
"term": {
|
||||
"media": "is there life on mars?"
|
||||
}
|
||||
},
|
||||
{
|
||||
"term": {
|
||||
"tags": "is there life on mars?"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
]
|
||||
|
||||
expected = {
|
||||
**query,
|
||||
**AGGREGATIONS,
|
||||
**PAGE_1
|
||||
}
|
||||
|
||||
self.assertEquals(expected, search.to_dict())
|
||||
|
||||
|
||||
class TestSearchNodesInProject(AbstractPillarTest):
|
||||
def test_empty_query(self):
|
||||
with self.app.app_context():
|
||||
search = create_node_search(query='', terms={}, page=0, project_id='MyProjectId')
|
||||
project_query = copy.deepcopy(EMPTY_QUERY)
|
||||
project_query['query']['bool']['filter'] = [IN_PROJECT]
|
||||
|
||||
expected = {
|
||||
**project_query,
|
||||
**AGGREGATIONS,
|
||||
**SORTED_DESC_BY_CREATED,
|
||||
**PAGE_1
|
||||
}
|
||||
|
||||
self.assertEquals(expected, search.to_dict())
|
||||
|
||||
def test_empty_query_page_2(self):
|
||||
with self.app.app_context():
|
||||
search = create_node_search(query='', terms={}, page=1, project_id='MyProjectId')
|
||||
project_query = copy.deepcopy(EMPTY_QUERY)
|
||||
project_query['query']['bool']['filter'] = [IN_PROJECT]
|
||||
page_2 = copy.deepcopy(PAGE_1)
|
||||
page_2['from'] = 10
|
||||
|
||||
expected = {
|
||||
**project_query,
|
||||
**AGGREGATIONS,
|
||||
**SORTED_DESC_BY_CREATED,
|
||||
**page_2
|
||||
}
|
||||
|
||||
self.assertEquals(expected, search.to_dict())
|
||||
|
||||
def test_empty_query_with_terms(self):
|
||||
with self.app.app_context():
|
||||
terms = {
|
||||
'is_free': '1',
|
||||
'media': 'video',
|
||||
}
|
||||
search = create_node_search(query='', terms=terms, page=1, project_id='MyProjectId')
|
||||
project_query = copy.deepcopy(EMPTY_QUERY)
|
||||
project_query['query']['bool']['filter'] = [
|
||||
IN_PROJECT,
|
||||
{
|
||||
"term": {
|
||||
"is_free": True
|
||||
}
|
||||
},
|
||||
{
|
||||
"term": {
|
||||
"media": "video"
|
||||
}
|
||||
}
|
||||
]
|
||||
page_2 = copy.deepcopy(PAGE_1)
|
||||
page_2['from'] = 10
|
||||
|
||||
expected = {
|
||||
**project_query,
|
||||
**AGGREGATIONS,
|
||||
**SORTED_DESC_BY_CREATED,
|
||||
**page_2
|
||||
}
|
||||
|
||||
self.assertEquals(expected, search.to_dict())
|
||||
|
||||
def test_query(self):
|
||||
with self.app.app_context():
|
||||
search = create_node_search(query='is there life on mars?', terms={}, page=0, project_id='MyProjectId')
|
||||
query = copy.deepcopy(EMPTY_QUERY)
|
||||
query['query']['bool']['filter'] = [IN_PROJECT]
|
||||
query['query']['bool']['must'] = [
|
||||
{
|
||||
"bool": {
|
||||
"should": [
|
||||
{
|
||||
"match": {
|
||||
"name": "is there life on mars?"
|
||||
}
|
||||
},
|
||||
{
|
||||
"match": {
|
||||
"project.name": "is there life on mars?"
|
||||
}
|
||||
},
|
||||
{
|
||||
"match": {
|
||||
"user.name": "is there life on mars?"
|
||||
}
|
||||
},
|
||||
{
|
||||
"match": {
|
||||
"description": "is there life on mars?"
|
||||
}
|
||||
},
|
||||
{
|
||||
"term": {
|
||||
"media": "is there life on mars?"
|
||||
}
|
||||
},
|
||||
{
|
||||
"term": {
|
||||
"tags": "is there life on mars?"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
]
|
||||
|
||||
expected = {
|
||||
**query,
|
||||
**AGGREGATIONS,
|
||||
**PAGE_1
|
||||
}
|
||||
|
||||
self.assertEquals(expected, search.to_dict())
|
||||
|
||||
|
||||
class TestSearchMultiNodes(AbstractPillarTest):
|
||||
def test(self):
|
||||
with self.app.app_context():
|
||||
queries = [{
|
||||
'query': '',
|
||||
'terms': {},
|
||||
'page': 0,
|
||||
'project_id': ''
|
||||
}, {
|
||||
'query': '',
|
||||
'terms': {},
|
||||
'page': 1,
|
||||
'project_id': 'MyProjectId'
|
||||
}]
|
||||
search = create_multi_node_search(queries)
|
||||
|
||||
first = {
|
||||
**EMPTY_QUERY,
|
||||
**AGGREGATIONS,
|
||||
**SORTED_DESC_BY_CREATED,
|
||||
**PAGE_1
|
||||
}
|
||||
project_query = copy.deepcopy(EMPTY_QUERY)
|
||||
project_query['query']['bool']['filter'] = [IN_PROJECT]
|
||||
page_2 = copy.deepcopy(PAGE_1)
|
||||
page_2['from'] = 10
|
||||
|
||||
second = {
|
||||
** project_query,
|
||||
**AGGREGATIONS,
|
||||
**SORTED_DESC_BY_CREATED,
|
||||
**page_2,
|
||||
}
|
||||
|
||||
expected = [
|
||||
NODE_INDEX,
|
||||
first,
|
||||
NODE_INDEX,
|
||||
second
|
||||
]
|
||||
|
||||
self.assertEquals(expected, search.to_dict())
|
||||
285
tests/test_api/test_search_queries_users.py
Normal file
285
tests/test_api/test_search_queries_users.py
Normal file
@@ -0,0 +1,285 @@
|
||||
import copy
|
||||
|
||||
from pillar.api.search import queries
|
||||
from pillar.tests import AbstractPillarTest
|
||||
|
||||
SOURCE = {
|
||||
"_source": {
|
||||
"include": ["full_name", "objectID", "username"]
|
||||
}
|
||||
}
|
||||
|
||||
EMPTY_QUERY = {
|
||||
"query": {
|
||||
"bool": {
|
||||
"must": [
|
||||
{
|
||||
"bool": {}
|
||||
}
|
||||
]
|
||||
}
|
||||
},
|
||||
}
|
||||
|
||||
AGGREGATIONS = {
|
||||
"aggs": {
|
||||
"roles": {
|
||||
"terms": {
|
||||
"field": "roles"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
PAGE_1 = {
|
||||
"from": 0,
|
||||
"size": 10
|
||||
}
|
||||
|
||||
|
||||
class TestSearchUsers(AbstractPillarTest):
|
||||
def test_empty_query(self):
|
||||
with self.app.app_context():
|
||||
search = queries.create_user_search(query='', terms={}, page=0)
|
||||
|
||||
expected = {
|
||||
**SOURCE,
|
||||
**EMPTY_QUERY,
|
||||
**AGGREGATIONS,
|
||||
**PAGE_1
|
||||
}
|
||||
self.assertEquals(expected, search.to_dict())
|
||||
|
||||
def test_query(self):
|
||||
with self.app.app_context():
|
||||
search = queries.create_user_search(query='Jens', terms={}, page=0)
|
||||
query = copy.deepcopy(EMPTY_QUERY)
|
||||
query['query']['bool']['must'] = [
|
||||
{
|
||||
"bool": {
|
||||
"should": [
|
||||
{
|
||||
"match": {
|
||||
"username": "Jens"
|
||||
}
|
||||
},
|
||||
{
|
||||
"match": {
|
||||
"full_name": "Jens"
|
||||
}
|
||||
},
|
||||
{
|
||||
"match": {
|
||||
"email": {
|
||||
"query": "Jens",
|
||||
"boost": 1
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"term": {
|
||||
"username_exact": {
|
||||
"value": "Jens",
|
||||
"boost": 50
|
||||
}
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
]
|
||||
|
||||
expected = {
|
||||
**SOURCE,
|
||||
**query,
|
||||
**AGGREGATIONS,
|
||||
**PAGE_1
|
||||
}
|
||||
self.assertEquals(expected, search.to_dict())
|
||||
|
||||
def test_email_query(self):
|
||||
with self.app.app_context():
|
||||
search = queries.create_user_search(query='mail@mail.com', terms={}, page=0)
|
||||
query = copy.deepcopy(EMPTY_QUERY)
|
||||
query['query']['bool']['must'] = [
|
||||
{
|
||||
"bool": {
|
||||
"should": [
|
||||
{
|
||||
"term": {
|
||||
"email_exact": {
|
||||
"value": "mail@mail.com",
|
||||
"boost": 50
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"match": {
|
||||
"username": "mail@mail.com"
|
||||
}
|
||||
},
|
||||
{
|
||||
"match": {
|
||||
"full_name": "mail@mail.com"
|
||||
}
|
||||
},
|
||||
{
|
||||
"match": {
|
||||
"email": {
|
||||
"query": "mail@mail.com",
|
||||
"boost": 25
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"term": {
|
||||
"username_exact": {
|
||||
"value": "mail@mail.com",
|
||||
"boost": 50
|
||||
}
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
]
|
||||
|
||||
expected = {
|
||||
**SOURCE,
|
||||
**query,
|
||||
**AGGREGATIONS,
|
||||
**PAGE_1
|
||||
}
|
||||
self.assertEquals(expected, search.to_dict())
|
||||
|
||||
|
||||
class TestSearchUsersAdmin(AbstractPillarTest):
|
||||
def test_empty_query(self):
|
||||
with self.app.app_context():
|
||||
search = queries.create_user_admin_search(query='', terms={}, page=0)
|
||||
|
||||
expected = {
|
||||
**EMPTY_QUERY,
|
||||
**AGGREGATIONS,
|
||||
**PAGE_1
|
||||
}
|
||||
self.assertEquals(expected, search.to_dict())
|
||||
|
||||
def test_query(self):
|
||||
with self.app.app_context():
|
||||
search = queries.create_user_admin_search(query='Jens', terms={}, page=0)
|
||||
query = copy.deepcopy(EMPTY_QUERY)
|
||||
query['query']['bool']['must'] = [
|
||||
{
|
||||
"bool": {
|
||||
"should": [
|
||||
{
|
||||
"match": {
|
||||
"username": "Jens"
|
||||
}
|
||||
},
|
||||
{
|
||||
"match": {
|
||||
"full_name": "Jens"
|
||||
}
|
||||
},
|
||||
{
|
||||
"match": {
|
||||
"email": {
|
||||
"query": "Jens",
|
||||
"boost": 1
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"term": {
|
||||
"username_exact": {
|
||||
"value": "Jens",
|
||||
"boost": 50
|
||||
}
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
]
|
||||
|
||||
expected = {
|
||||
**query,
|
||||
**AGGREGATIONS,
|
||||
**PAGE_1
|
||||
}
|
||||
self.assertEquals(expected, search.to_dict())
|
||||
|
||||
def test_terms(self):
|
||||
with self.app.app_context():
|
||||
search = queries.create_user_admin_search(query='', terms={'roles': 'Admin'}, page=0)
|
||||
query = copy.deepcopy(EMPTY_QUERY)
|
||||
query['query']['bool']['filter'] = [
|
||||
{
|
||||
"term": {
|
||||
"roles": "Admin"
|
||||
}
|
||||
}
|
||||
]
|
||||
|
||||
expected = {
|
||||
**query,
|
||||
**AGGREGATIONS,
|
||||
**PAGE_1
|
||||
}
|
||||
self.assertEquals(expected, search.to_dict())
|
||||
|
||||
def test_object_id_query(self):
|
||||
with self.app.app_context():
|
||||
search = queries.create_user_admin_search(query='563aca02c379cf0005e8e17d', terms={}, page=0)
|
||||
query = copy.deepcopy(EMPTY_QUERY)
|
||||
query['query']['bool']['must'] = [
|
||||
{
|
||||
"bool": {
|
||||
"should": [
|
||||
{
|
||||
"match": {
|
||||
"username": "563aca02c379cf0005e8e17d"
|
||||
}
|
||||
},
|
||||
{
|
||||
"match": {
|
||||
"full_name": "563aca02c379cf0005e8e17d"
|
||||
}
|
||||
},
|
||||
{
|
||||
"match": {
|
||||
"email": {
|
||||
"query": "563aca02c379cf0005e8e17d",
|
||||
"boost": 1
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"term": {
|
||||
"username_exact": {
|
||||
"value": "563aca02c379cf0005e8e17d",
|
||||
"boost": 50
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"term": {
|
||||
"objectID": {
|
||||
"value": "563aca02c379cf0005e8e17d",
|
||||
"boost": 100
|
||||
}
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
]
|
||||
|
||||
expected = {
|
||||
**query,
|
||||
**AGGREGATIONS,
|
||||
**PAGE_1
|
||||
}
|
||||
self.assertEquals(expected, search.to_dict())
|
||||
Reference in New Issue
Block a user