From 229872fb29d24e2862409d8020df7b36dc8a5c07 Mon Sep 17 00:00:00 2001 From: andrei Date: Thu, 17 Feb 2022 16:56:46 +0200 Subject: [PATCH] Commit to save code [2 TEST PASSES] --- planetmint/backend/tarantool/query.py | 8 ++++---- tests/backend/tarantool/test_queries.py | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/planetmint/backend/tarantool/query.py b/planetmint/backend/tarantool/query.py index 28a588a..b7c0af2 100644 --- a/planetmint/backend/tarantool/query.py +++ b/planetmint/backend/tarantool/query.py @@ -131,9 +131,9 @@ def get_metadata(transaction_ids: list, space): # @register_query(LocalMongoDBConnection) def store_asset(asset: dict, connection): space = connection.space("assets") - unique = token_hex(8) + # unique = token_hex(8) try: - space.insert((asset["id"], unique, asset["data"])) + space.insert((asset["id"], asset["data"])) except: # TODO Add Raise For Duplicate pass @@ -158,11 +158,11 @@ def get_asset(asset_id: str, connection): def get_assets(assets_ids: list, connection) -> list: _returned_data = [] space = connection.space("assets") - for _id in assets_ids: + for _id in list(set(assets_ids)): asset = space.select(_id, index="assetid_search") asset = asset.data[0] _returned_data.append({"id": asset[0], "data": asset[1]}) - return _returned_data + return sorted(_returned_data, key=lambda k: k["id"], reverse=False) # @register_query(LocalMongoDBConnection) diff --git a/tests/backend/tarantool/test_queries.py b/tests/backend/tarantool/test_queries.py index 1012380..664c816 100644 --- a/tests/backend/tarantool/test_queries.py +++ b/tests/backend/tarantool/test_queries.py @@ -66,7 +66,8 @@ def test_write_assets(): def test_get_assets(): - from planetmint.backend import connect, query + from planetmint.backend import connect + from planetmint.backend.tarantool import query conn = connect() assets = [