Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion quantara/web_app/db/crud/user.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
from sqlalchemy.exc import SQLAlchemyError

from web_app.db.models import Base, Position, Status, TelegramUser, User
from sqlalchemy.orm import joinedload

from .base import DBConnector

Expand Down Expand Up @@ -37,7 +38,7 @@ def get_users_for_notifications(self) -> list[tuple[str, str]]:
Position.status == Status.OPENED.value,
TelegramUser.is_allowed_notification == True,
)
.distinct()
.options(joinedload(User.positions), joinedload(User.telegram_user))
.all()
)
return results
Expand Down
7 changes: 6 additions & 1 deletion quantara/web_app/db/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
between the data entities.
"""

from web_app.db.database import Base
from sqlalchemy.orm import relationship
from datetime import datetime
from enum import Enum as PyEnum
from uuid import uuid4
Expand All @@ -24,7 +26,7 @@
from sqlalchemy.dialects.postgresql import UUID
from sqlalchemy.sql import func

from web_app.db.database import Base



class Status(PyEnum):
Expand Down Expand Up @@ -55,6 +57,9 @@ class User(Base):
is_contract_deployed = Column(Boolean, default=False)
wallet_id = Column(String, nullable=False, unique=True, index=True)
contract_address = Column(String)
# Relationships
positions = relationship("Position", backref="user")
telegram_user = relationship("TelegramUser", backref="user", uselist=False)

class Referal(Base):
"""
Expand Down