Mirroristas/planetmint
2
0
Fork 0
mirror of https://github.com/planetmint/planetmint.git synced 2025-11-24 06:25:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolve conflicts

Browse Source
This commit is contained in:
ArpitShukla007 2022-06-28 08:48:47 +00:00
parent c9e40605fa
commit e6f87d20e9
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
planetmint/backend/tarantool/query.py
View File

@ -168,10 +168,12 @@ def get_asset(connection, asset_id: str):
def get_assets(connection, assets_ids: list) -> list:
_returned_data = []
for _id in list(set(assets_ids)):
asset = get_asset(connection, _id)
_returned_data.append(asset)
return sorted(_returned_data, key=lambda k: ("id" not in k, k.get("id", None)), reverse=False)
res = connection.run(
connection.space("assets").select(_id, index="txid_search")
)
_returned_data.append(res[0])
sorted_assets = sorted(_returned_data, key=lambda k: k[1], reverse=False)
return [(json.loads(asset[0]), asset[1]) for asset in sorted_assets]
@register_query(TarantoolDBConnection)

2
planetmint/transactions/common/transaction.py
View File

@ -695,7 +695,7 @@ class Transaction(object):
if asset is not None:
if 'id' in asset:
tx = tx_map[asset['id']]
tx['asset'] = asset
tx['asset'] = asset[0]
tx_ids = list(tx_map.keys())
metadata_list = list(planet.get_metadata(tx_ids))

2
tests/backend/tarantool/test_queries.py
View File

@ -58,7 +58,7 @@ def test_write_assets(db_conn):
documents = query.get_assets(assets_ids=[asset["id"] for asset in assets], connection=db_conn)
assert len(documents) == 3
assert list(documents)[0] == assets[:-1][0]
assert list(documents)[0][0] == assets[:-1][0]
def test_get_assets(db_conn):