diff --git a/hive/db/schema.py b/hive/db/schema.py index 410878899c1635da99eecaf6a64c4112a2506694..24679cf5eb2a88bb9085732da03f5f854f072ee1 100644 --- a/hive/db/schema.py +++ b/hive/db/schema.py @@ -590,6 +590,7 @@ def setup(db): hp.depth, hp.promoted, hp.payout, + hp.pending_payout, hp.payout_at, hp.is_paidout, hp.children, @@ -731,7 +732,7 @@ def setup(db): sql = """ DROP TYPE IF EXISTS database_api_post CASCADE; CREATE TYPE database_api_post AS ( - id INT, + id INT, community_id INT, author VARCHAR(16), permlink VARCHAR(255), @@ -785,7 +786,7 @@ def setup(db): AS $function$ BEGIN - RETURN QUERY + RETURN QUERY SELECT hp.id, hp.community_id, hp.author, hp.permlink, hp.title, hp.body, hp.category, hp.depth, hp.promoted, hp.payout, hp.payout_at, hp.is_paidout, @@ -823,7 +824,7 @@ def setup(db): AS $function$ BEGIN - RETURN QUERY + RETURN QUERY SELECT hp.id, hp.community_id, hp.author, hp.permlink, hp.title, hp.body, hp.category, hp.depth, hp.promoted, hp.payout, hp.payout_at, hp.is_paidout, @@ -863,7 +864,7 @@ def setup(db): AS $function$ BEGIN - RETURN QUERY + RETURN QUERY SELECT hp.id, hp.community_id, hp.author, hp.permlink, hp.title, hp.body, hp.category, hp.depth, hp.promoted, hp.payout, hp.payout_at, hp.is_paidout, @@ -881,11 +882,11 @@ def setup(db): root_author >= _root_author AND root_permlink >= _root_permlink AND hp.id >= (SELECT id FROM hive_posts_view hp1 WHERE hp1.author >= _start_post_author AND hp1.permlink >= _start_post_permlink ORDER BY id LIMIT 1) - ORDER BY - root_author ASC, + ORDER BY + root_author ASC, root_permlink ASC, id ASC - LIMIT + LIMIT _limit ; END @@ -905,7 +906,7 @@ def setup(db): AS $function$ BEGIN - RETURN QUERY + RETURN QUERY SELECT hp.id, hp.community_id, hp.author, hp.permlink, hp.title, hp.body, hp.category, hp.depth, hp.promoted, hp.payout, hp.payout_at, hp.is_paidout, @@ -947,7 +948,7 @@ def setup(db): AS $function$ BEGIN - RETURN QUERY + RETURN QUERY SELECT hp.id, hp.community_id, hp.author, hp.permlink, hp.title, hp.body, hp.category, hp.depth, hp.promoted, hp.payout, hp.payout_at, hp.is_paidout, @@ -962,14 +963,14 @@ def setup(db): WHERE NOT hp.is_muted AND NOT hp.is_deleted AND - hp.parent_author >= _parent_author AND - hp.updated_at >= _updated_at AND + hp.parent_author >= _parent_author AND + hp.updated_at >= _updated_at AND hp.id >= (SELECT id FROM hive_posts_view hp1 WHERE hp1.author >= _start_post_author AND hp1.permlink >= _start_post_permlink ORDER BY id LIMIT 1) - ORDER BY - hp.parent_author ASC, - hp.updated_at ASC, - hp.id ASC - LIMIT + ORDER BY + hp.parent_author ASC, + hp.updated_at ASC, + hp.id ASC + LIMIT _limit ; END @@ -988,7 +989,7 @@ def setup(db): AS $function$ BEGIN - RETURN QUERY + RETURN QUERY SELECT hp.id, hp.community_id, hp.author, hp.permlink, hp.title, hp.body, hp.category, hp.depth, hp.promoted, hp.payout, hp.payout_at, hp.is_paidout, @@ -1003,14 +1004,14 @@ def setup(db): WHERE NOT hp.is_muted AND NOT hp.is_deleted AND - hp.author >= _author AND - hp.updated_at >= _updated_at AND + hp.author >= _author AND + hp.updated_at >= _updated_at AND hp.id >= (SELECT id FROM hive_posts_view hp1 WHERE hp1.author >= _start_post_author AND hp1.permlink >= _start_post_permlink ORDER BY id LIMIT 1) - ORDER BY - hp.parent_author ASC, - hp.updated_at ASC, - hp.id ASC - LIMIT + ORDER BY + hp.parent_author ASC, + hp.updated_at ASC, + hp.id ASC + LIMIT _limit ; END diff --git a/hive/server/condenser_api/methods.py b/hive/server/condenser_api/methods.py index 151cf75762e2f86226a7afe218aa09cc103e8cc0..aa2ddddc0530319fc897a6d483c78b1f4413c4a0 100644 --- a/hive/server/condenser_api/methods.py +++ b/hive/server/condenser_api/methods.py @@ -34,6 +34,7 @@ SQL_TEMPLATE = """ hp.promoted, hp.payout, hp.payout_at, + hp.pending_payout, hp.is_paidout, hp.children, hp.votes, diff --git a/hive/server/condenser_api/objects.py b/hive/server/condenser_api/objects.py index 661a7784ca3d3228f951d43b382c1cb78667f770..aa463c3a5defc1b7607892c642506056b11b4b9d 100644 --- a/hive/server/condenser_api/objects.py +++ b/hive/server/condenser_api/objects.py @@ -52,6 +52,7 @@ async def load_posts_keyed(db, ids, truncate_body=0): hp.depth, hp.promoted, hp.payout, + hp.pending_payout, hp.payout_at, hp.is_paidout, hp.children, @@ -180,6 +181,7 @@ def _condenser_post_object(row, truncate_body=0): if not row['category']: row['category'] = 'undefined' + full_payout = row['pending_payout'] + row['payout']; post = {} post['post_id'] = row['id'] post['author'] = row['author'] @@ -200,7 +202,7 @@ def _condenser_post_object(row, truncate_body=0): post['cashout_time'] = json_date(None if paid else row['payout_at']) post['total_payout_value'] = _amount(row['payout'] if paid else 0) post['curator_payout_value'] = _amount(0) - post['pending_payout_value'] = _amount(0 if paid else row['payout']) + post['pending_payout_value'] = _amount(0 if paid else full_payout) post['promoted'] = _amount(row['promoted']) post['replies'] = [] diff --git a/tests/tests_api b/tests/tests_api index a88d42a79b9f006466d7a15650ccdc68f56004ea..ee20b992bb7dae36ea964bde1e3b7f58b103dae6 160000 --- a/tests/tests_api +++ b/tests/tests_api @@ -1 +1 @@ -Subproject commit a88d42a79b9f006466d7a15650ccdc68f56004ea +Subproject commit ee20b992bb7dae36ea964bde1e3b7f58b103dae6