Skip to content

Commit 7d4d213

Browse files
committed
EventUser fix
1 parent 9513e1f commit 7d4d213

3 files changed

Lines changed: 41 additions & 63 deletions

File tree

calendar_backend/models/db.py

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -150,12 +150,6 @@ class Event(BaseDbModel):
150150
back_populates="event",
151151
primaryjoin="and_(Event.id==CommentEvent.event_id, not_(CommentEvent.is_deleted), CommentEvent.approve_status=='APPROVED')",
152152
)
153-
user_event: Mapped[list[EventUser]] = relationship(
154-
"EventUser",
155-
back_populates="event",
156-
order_by="EventUser.updated_at.desc()",
157-
primaryjoin="and_(Event.id==EventUser.event_id, not_(EventUser.is_deleted))",
158-
)
159153

160154

161155
class EventsLecturers(BaseDbModel):
@@ -235,10 +229,3 @@ class EventUser(BaseDbModel):
235229
DateTime, nullable=False, default=datetime.utcnow, onupdate=datetime.utcnow
236230
)
237231
is_deleted: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False)
238-
239-
event: Mapped[Event] = relationship(
240-
"Event",
241-
foreign_keys="EventUser.event_id",
242-
back_populates="user_event",
243-
primaryjoin="and_(EventUser.event_id==Event.id, not_(Event.is_deleted))",
244-
)

migrations/versions/8006ac22acc4_add_eventuser_table.py

Lines changed: 0 additions & 50 deletions
This file was deleted.
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
"""EventUser building
2+
3+
Revision ID: b060027b11b3
4+
Revises: 55a049fde8f4
5+
Create Date: 2026-04-20 17:56:39.185374
6+
7+
"""
8+
from alembic import op
9+
import sqlalchemy as sa
10+
11+
12+
# revision identifiers, used by Alembic.
13+
revision = 'b060027b11b3'
14+
down_revision = '55a049fde8f4'
15+
branch_labels = None
16+
depends_on = None
17+
18+
19+
def upgrade():
20+
# ### commands auto generated by Alembic - please adjust! ###
21+
op.create_table('event_user',
22+
sa.Column('id', sa.Integer(), nullable=False),
23+
sa.Column('event_id', sa.Integer(), nullable=False),
24+
sa.Column('user_id', sa.Integer(), nullable=False),
25+
sa.Column('status', sa.Enum('NO_STATUS', 'GOING', 'NOT_GOING', 'ATTENDED', name='eventuserstatus', native_enum=False), nullable=False),
26+
sa.Column('updated_at', sa.DateTime(), nullable=False),
27+
sa.Column('is_deleted', sa.Boolean(), nullable=False),
28+
sa.ForeignKeyConstraint(['event_id'], ['event.id'], ),
29+
sa.PrimaryKeyConstraint('id')
30+
)
31+
op.drop_constraint(op.f('lesson_group_id_fkey'), 'event', type_='foreignkey')
32+
op.drop_column('event', 'group_id')
33+
# ### end Alembic commands ###
34+
35+
36+
def downgrade():
37+
# ### commands auto generated by Alembic - please adjust! ###
38+
op.add_column('event', sa.Column('group_id', sa.INTEGER(), autoincrement=False, nullable=True))
39+
op.create_foreign_key(op.f('lesson_group_id_fkey'), 'event', 'group', ['group_id'], ['id'])
40+
op.drop_table('event_user')
41+
# ### end Alembic commands ###

0 commit comments

Comments
 (0)