Mirroristas/bigchaindb
2
0
Fork 0
mirror of https://github.com/bigchaindb/bigchaindb.git synced 2024-10-13 13:34:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix conflicts

Browse Source
This commit is contained in:
maoudia 2020-05-11 10:56:21 -04:00
commit 3b70e5c486
4 changed files with 58 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bigchaindb/web/routes.py
View File

@ -38,8 +38,13 @@ ROUTES_API_V1 = [
r('transactions/<string:tx_id>', tx.TransactionApi),
r('transactions', tx.TransactionListApi),
r('outputs/', outputs.OutputListApi),
<<<<<<< HEAD
r('query-assets/', assets.AssetQueryApi),
r('aggregate-assets/', assets.AssetAggregateApi),
=======
r('assets/query/', assets.AssetQueryApi),
r('assets/aggregate/', assets.AssetAggregateApi),
>>>>>>> 6ad10cef3d55b47891b3111a7460067b745f247a
r('validators/', validators.ValidatorsApi),
]

4
tests/db/test_bigchain_api.py
View File

@ -146,7 +146,11 @@ class TestBigchainApi(object):
# write the transactions to the DB
b.store_bulk_transactions([tx1, tx2, tx3])
# get the assets through text search
<<<<<<< HEAD
assets = list(b.query(json_query={'data.complex_key.complex_sub_key':'value_4'}))
=======
assets = list(b.query(json_query={'data.complex_key.complex_sub_key': 'value_4'}))
>>>>>>> 6ad10cef3d55b47891b3111a7460067b745f247a
assert len(assets) == 0
def test_aggregate(self, b, alice):

34
tests/web/test_assets_aggregate.py
View File

@ -6,7 +6,11 @@ import pytest
import json
import urllib.parse
<<<<<<< HEAD
AGGREGATE_ASSETS_ENDPOINT = '/api/v1/aggregate-assets/'
=======
AGGREGATE_ASSETS_ENDPOINT = '/api/v1/assets/aggregate'
>>>>>>> 6ad10cef3d55b47891b3111a7460067b745f247a
def insert_aggregation_assets(b, alice):
@ -19,6 +23,7 @@ def insert_aggregation_assets(b, alice):
asset6 = {'msg': 'BigchainDB 3', 'complex_key': {'complex_sub_key': 'value_6', 'aggregation_key': 'ak_3'}}
# create the transactions
<<<<<<< HEAD
tx1 = Transaction.create([alice.public_key], [([alice.public_key], 1)],
asset=asset1).sign([alice.private_key])
tx2 = Transaction.create([alice.public_key], [([alice.public_key], 1)],
@ -31,6 +36,14 @@ def insert_aggregation_assets(b, alice):
asset=asset5).sign([alice.private_key])
tx6 = Transaction.create([alice.public_key], [([alice.public_key], 1)],
asset=asset6).sign([alice.private_key])
=======
tx1 = Transaction.create([alice.public_key], [([alice.public_key], 1)], asset=asset1).sign([alice.private_key])
tx2 = Transaction.create([alice.public_key], [([alice.public_key], 1)], asset=asset2).sign([alice.private_key])
tx3 = Transaction.create([alice.public_key], [([alice.public_key], 1)], asset=asset3).sign([alice.private_key])
tx4 = Transaction.create([alice.public_key], [([alice.public_key], 1)], asset=asset4).sign([alice.private_key])
tx5 = Transaction.create([alice.public_key], [([alice.public_key], 1)], asset=asset5).sign([alice.private_key])
tx6 = Transaction.create([alice.public_key], [([alice.public_key], 1)], asset=asset6).sign([alice.private_key])
>>>>>>> 6ad10cef3d55b47891b3111a7460067b745f247a
# write the transactions to the DB
b.store_bulk_transactions([tx1, tx2, tx3, tx4, tx5, tx6])
@ -39,16 +52,35 @@ def insert_aggregation_assets(b, alice):
@pytest.mark.bdb
def test_aggregate_assets_with_query(client, b, alice):
insert_aggregation_assets(b, alice)
<<<<<<< HEAD
aggregation_functions = {'function_list': [{'$group': {'_id': "$data.complex_key.aggregation_key", 'count': {'$sum': 1}}}]}
res = client.get(AGGREGATE_ASSETS_ENDPOINT + f"?aggregation_functions={urllib.parse.quote(json.dumps(aggregation_functions))}")
=======
aggregation_functions = {'function_list':
[{'$group': {'_id': "$data.complex_key.aggregation_key", 'count': {'$sum': 1}}}]}
res = client.get(AGGREGATE_ASSETS_ENDPOINT +
f"?aggregation_functions={urllib.parse.quote(json.dumps(aggregation_functions))}")
>>>>>>> 6ad10cef3d55b47891b3111a7460067b745f247a
assert res.json == json.dumps({"results": [{'_id': 'ak_3', 'count': 3},
{'_id': 'ak_2', 'count': 1},
{'_id': 'ak_1', 'count': 2}]})
assert res.status_code == 200
<<<<<<< HEAD
@pytest.mark.bdb
def test_aggregate_assets_with_invalid_query(client, b, alice):
insert_aggregation_assets(b, alice)
aggregation_functions = {'something': [{'$group': {'_id': "$data.complex_key.aggregation_key", 'count': {'$sum': 1}}}]}
res = client.get(AGGREGATE_ASSETS_ENDPOINT + f"?aggregation_functions={urllib.parse.quote(json.dumps(aggregation_functions))}")
assert res.status_code == 400
assert res.status_code == 400
=======
@pytest.mark.bdb
def test_aggregate_assets_with_invalid_query(client, b, alice):
insert_aggregation_assets(b, alice)
aggregation_functions = {'something':
[{'$group': {'_id': "$data.complex_key.aggregation_key", 'count': {'$sum': 1}}}]}
res = client.get(AGGREGATE_ASSETS_ENDPOINT +
f"?aggregation_functions={urllib.parse.quote(json.dumps(aggregation_functions))}")
assert res.status_code == 400
>>>>>>> 6ad10cef3d55b47891b3111a7460067b745f247a

16
tests/web/test_assets_query.py
View File

@ -6,7 +6,12 @@ import pytest
import json
import urllib.parse
<<<<<<< HEAD
QUERY_ASSETS_ENDPOINT = '/api/v1/query-assets/'
=======
QUERY_ASSETS_ENDPOINT = '/api/v1/assets/query'
>>>>>>> 6ad10cef3d55b47891b3111a7460067b745f247a
@pytest.mark.bdb
def test_query_assets_with_query(client, b, alice):
@ -27,6 +32,10 @@ def test_query_assets_with_query(client, b, alice):
assert json.loads(res.json)[0]["data"] == {'msg': 'abc 1'}
assert res.status_code == 200
<<<<<<< HEAD
=======
>>>>>>> 6ad10cef3d55b47891b3111a7460067b745f247a
@pytest.mark.bdb
def test_query_assets_with_empty_query(client, b, alice):
from bigchaindb.models import Transaction
@ -83,10 +92,17 @@ def test_query_assets_with_empty_query_limit_0(client, b, alice):
b.store_bulk_transactions([tx1])
b.store_bulk_transactions([tx2])
<<<<<<< HEAD
res = client.get(QUERY_ASSETS_ENDPOINT + '?limit=0'+ f"&query={urllib.parse.quote(json.dumps({}))}")
=======
res = client.get(QUERY_ASSETS_ENDPOINT + '?limit=0' + f"&query={urllib.parse.quote(json.dumps({}))}")
>>>>>>> 6ad10cef3d55b47891b3111a7460067b745f247a
print(res.json)
assert len(json.loads(res.json)) == 2
assert json.loads(res.json)[0]["data"] == {'msg': 'abc 1'}
assert json.loads(res.json)[1]["data"] == {'msg': 'abc 2'}
assert res.status_code == 200
<<<<<<< HEAD
=======
>>>>>>> 6ad10cef3d55b47891b3111a7460067b745f247a