diff --git a/database/models.py b/database/models.py index af5e5cd..df8845e 100644 --- a/database/models.py +++ b/database/models.py @@ -91,14 +91,10 @@ class UserAdditionalSettings(Base): ForeignKey("users.id", ondelete="CASCADE"), nullable=False, unique=True) trade_mode = Column(String, nullable=False, default="Merged_Single") - order_type = Column(String, nullable=False, default="Market") - conditional_order_type = Column(String, nullable=False, default="Market") - limit_price = Column(Float, nullable=False, default=0.0) + switch_side = Column(String, nullable=False, default="По направлению") trigger_price = Column(Float, nullable=False, default=0.0) margin_type = Column(String, nullable=False, default="ISOLATED_MARGIN") leverage = Column(String, nullable=False, default="10") - leverage_to_buy = Column(String, nullable=False, default="10") - leverage_to_sell = Column(String, nullable=False, default="10") order_quantity = Column(Float, nullable=False, default=5.0) martingale_factor = Column(Float, nullable=False, default=1.0) max_bets_in_series = Column(Integer, nullable=False, default=1) @@ -114,9 +110,8 @@ class UserRiskManagement(Base): user_id = Column(Integer, ForeignKey("users.id", ondelete="CASCADE"), nullable=False, unique=True) - take_profit_percent = Column(Integer, nullable=False, default=1) - stop_loss_percent = Column(Integer, nullable=False, default=1) - max_risk_percent = Column(Integer, nullable=False, default=100) + take_profit_percent = Column(Float, nullable=False, default=1) + stop_loss_percent = Column(Float, nullable=False, default=1) commission_fee = Column(String, nullable=False, default="Yes_commission_fee") user = relationship("User", back_populates="user_risk_management") @@ -148,13 +143,9 @@ class UserDeals(Base): current_step = Column(Integer, nullable=True) symbol = Column(String, nullable=True) trade_mode = Column(String, nullable=True) - trading_type = Column(String, nullable=True) + base_quantity = Column(Float, nullable=True) margin_type = Column(String, nullable=True) - order_type = Column(String, nullable=True) - conditional_order_type = Column(String, nullable=True) leverage = Column(String, nullable=True) - leverage_to_buy = Column(String, nullable=True) - leverage_to_sell = Column(String, nullable=True) last_side = Column(String, nullable=True) closed_side = Column(String, nullable=True) order_quantity = Column(Float, nullable=True) @@ -162,9 +153,6 @@ class UserDeals(Base): max_bets_in_series = Column(Integer, nullable=True) take_profit_percent = Column(Integer, nullable=True) stop_loss_percent = Column(Integer, nullable=True) - max_risk_percent = Column(Integer, nullable=True) - switch_side_mode = Column(Boolean, nullable=True) - limit_price = Column(Float, nullable=True) trigger_price = Column(Float, nullable=True) user = relationship("User", back_populates="user_deals") @@ -184,7 +172,7 @@ class UserAutoTrading(Base): nullable=False) symbol = Column(String, nullable=True) auto_trading = Column(Boolean, nullable=True) - side = Column(String, nullable=True) fee = Column(Float, nullable=True) + total_fee = Column(Float, nullable=True) user = relationship("User", back_populates="user_auto_trading") \ No newline at end of file