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 2e7f6b108333041954434cb7830edec23992a190..aa463c3a5defc1b7607892c642506056b11b4b9d 100644 --- a/hive/server/condenser_api/objects.py +++ b/hive/server/condenser_api/objects.py @@ -181,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'] @@ -201,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(row['pending_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