fix: use properly calculated relative ratio for /entries and /exits
This commit is contained in:
@@ -1997,17 +1997,8 @@ class Trade(ModelBase, LocalTrade):
|
|||||||
if pair is not None:
|
if pair is not None:
|
||||||
filters.append(Trade.pair == pair)
|
filters.append(Trade.pair == pair)
|
||||||
|
|
||||||
enter_tag_perf = Trade.session.execute(
|
pair_rates_query = Trade._generic_performance_query([Trade.enter_tag], filters, "Other")
|
||||||
select(
|
enter_tag_perf = Trade.session.execute(pair_rates_query).all()
|
||||||
Trade.enter_tag,
|
|
||||||
func.sum(Trade.close_profit).label("profit_sum"),
|
|
||||||
func.sum(Trade.close_profit_abs).label("profit_sum_abs"),
|
|
||||||
func.count(Trade.pair).label("count"),
|
|
||||||
)
|
|
||||||
.filter(*filters)
|
|
||||||
.group_by(Trade.enter_tag)
|
|
||||||
.order_by(desc("profit_sum_abs"))
|
|
||||||
).all()
|
|
||||||
|
|
||||||
return [
|
return [
|
||||||
{
|
{
|
||||||
@@ -2031,17 +2022,9 @@ class Trade(ModelBase, LocalTrade):
|
|||||||
filters: list = [Trade.is_open.is_(False)]
|
filters: list = [Trade.is_open.is_(False)]
|
||||||
if pair is not None:
|
if pair is not None:
|
||||||
filters.append(Trade.pair == pair)
|
filters.append(Trade.pair == pair)
|
||||||
sell_tag_perf = Trade.session.execute(
|
|
||||||
select(
|
pair_rates_query = Trade._generic_performance_query([Trade.exit_reason], filters, "Other")
|
||||||
Trade.exit_reason,
|
sell_tag_perf = Trade.session.execute(pair_rates_query).all()
|
||||||
func.sum(Trade.close_profit).label("profit_sum"),
|
|
||||||
func.sum(Trade.close_profit_abs).label("profit_sum_abs"),
|
|
||||||
func.count(Trade.pair).label("count"),
|
|
||||||
)
|
|
||||||
.filter(*filters)
|
|
||||||
.group_by(Trade.exit_reason)
|
|
||||||
.order_by(desc("profit_sum_abs"))
|
|
||||||
).all()
|
|
||||||
|
|
||||||
return [
|
return [
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user