forked from kodorvan/stcs
Fixed
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
from datetime import datetime
|
||||
import logging.config
|
||||
from sqlalchemy.sql.sqltypes import DateTime
|
||||
from sqlalchemy.sql.sqltypes import DateTime, Numeric
|
||||
|
||||
from sqlalchemy import BigInteger, Boolean, Integer, String, ForeignKey
|
||||
from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column
|
||||
@@ -120,17 +120,16 @@ class Margin_type(Base):
|
||||
|
||||
class Trigger(Base):
|
||||
"""
|
||||
Справочник видов триггеров для сделок.
|
||||
Справочник триггеров для сделок.
|
||||
|
||||
Атрибуты:
|
||||
id (int): Первичный ключ.
|
||||
trigger (str): Название триггера (например, 'Ручной', 'Автоматический').
|
||||
id (int): Первичный ключ..
|
||||
"""
|
||||
__tablename__ = 'triggers'
|
||||
|
||||
id: Mapped[int] = mapped_column(primary_key=True)
|
||||
|
||||
trigger = mapped_column(String(15), unique=True)
|
||||
trigger_price = mapped_column(Integer(), default=0)
|
||||
|
||||
|
||||
class User_Main_Settings(Base):
|
||||
@@ -163,10 +162,10 @@ class User_Main_Settings(Base):
|
||||
size_leverage = mapped_column(Integer(), default=1)
|
||||
starting_quantity = mapped_column(Integer(), default=1)
|
||||
martingale_factor = mapped_column(Integer(), default=1)
|
||||
martingale_step = mapped_column(Integer(), default=1)
|
||||
martingale_step = mapped_column(Integer(), default=0)
|
||||
maximal_quantity = mapped_column(Integer(), default=10)
|
||||
entry_order_type = mapped_column(String(10), default='Market')
|
||||
limit_order_price = mapped_column(String(20), nullable=True)
|
||||
limit_order_price = mapped_column(Numeric(18, 15), nullable=True)
|
||||
|
||||
|
||||
class User_Risk_Management_Settings(Base):
|
||||
@@ -297,7 +296,7 @@ async def async_main():
|
||||
await conn.run_sync(Base.metadata.create_all)
|
||||
|
||||
# Заполнение таблиц
|
||||
modes = ['Long', 'Short', 'Switch', 'Smart']
|
||||
modes = ['Long', 'Short', 'Smart']
|
||||
for mode in modes:
|
||||
result = await conn.execute(select(Trading_Mode).where(Trading_Mode.mode == mode))
|
||||
if not result.first():
|
||||
@@ -310,10 +309,3 @@ async def async_main():
|
||||
if not result.first():
|
||||
logger.info("Заполение таблицы типов маржи")
|
||||
await conn.execute(Margin_type.__table__.insert().values(type=type))
|
||||
|
||||
triggers = ['Ручной', 'Автоматический']
|
||||
for trigger in triggers:
|
||||
result = await conn.execute(select(Trigger).where(Trigger.trigger == trigger))
|
||||
if not result.first():
|
||||
logger.info("Заполение таблицы триггеров")
|
||||
await conn.execute(Trigger.__table__.insert().values(trigger=trigger))
|
||||
|
Reference in New Issue
Block a user