Skip to content

Commit ffd011f

Browse files
HenrikEngenHenrikEngen
committed
Changed from event_type EventType to event_brand EventBrand as planned
1 parent c7e2f78 commit ffd011f

File tree

11 files changed

+94
-99
lines changed

11 files changed

+94
-99
lines changed

‎alembic/versions/0eee850a7ace_multitenant_test.py‎

Lines changed: 0 additions & 67 deletions
This file was deleted.

‎alembic/versions/45b6be09b41d_multitenant_test_2.py‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
"""multitenant test 2
2+
3+
Revision ID: 45b6be09b41d
4+
Revises: b648caf8d8fb
5+
Create Date: 2025-09-20 09:06:00.040599
6+
7+
"""
8+
from alembic import op
9+
import sqlalchemy as sa
10+
11+
12+
# revision identifiers, used by Alembic.
13+
revision = '45b6be09b41d'
14+
down_revision = 'b648caf8d8fb'
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_brand',
22+
sa.Column('uuid', sa.UUID(), nullable=False),
23+
sa.Column('name', sa.Text(), nullable=False),
24+
sa.PrimaryKeyConstraint('uuid', name=op.f('pk_event_brand')),
25+
sa.UniqueConstraint('uuid', name=op.f('uq_event_brand_uuid'))
26+
)
27+
op.add_column('crew', sa.Column('event_brand', sa.UUID(), nullable=True))
28+
op.create_foreign_key(op.f('fk_crew_event_brand_event_brand'), 'crew', 'event_brand', ['event_brand'], ['uuid'])
29+
op.add_column('event', sa.Column('event_brand_uuid', sa.UUID(), nullable=True))
30+
op.create_foreign_key(op.f('fk_event_event_brand_uuid_event_brand'), 'event', 'event_brand', ['event_brand_uuid'], ['uuid'])
31+
op.add_column('location', sa.Column('event_brand_uuid', sa.UUID(), nullable=True))
32+
op.create_foreign_key(op.f('fk_location_event_brand_uuid_event_brand'), 'location', 'event_brand', ['event_brand_uuid'], ['uuid'])
33+
op.add_column('position', sa.Column('event_brand_uuid', sa.UUID(), nullable=True))
34+
op.create_foreign_key(op.f('fk_position_event_brand_uuid_event_brand'), 'position', 'event_brand', ['event_brand_uuid'], ['uuid'])
35+
op.add_column('seatmap', sa.Column('event_brand_uuid', sa.UUID(), nullable=True))
36+
op.create_foreign_key(op.f('fk_seatmap_event_brand_uuid_event_brand'), 'seatmap', 'event_brand', ['event_brand_uuid'], ['uuid'])
37+
op.add_column('seatmap_background', sa.Column('event_brand_uuid', sa.UUID(), nullable=True))
38+
op.create_foreign_key(op.f('fk_seatmap_background_event_brand_uuid_event_brand'), 'seatmap_background', 'event_brand', ['event_brand_uuid'], ['uuid'])
39+
op.add_column('ticket_type', sa.Column('event_brand_uuid', sa.UUID(), nullable=True))
40+
op.create_foreign_key(op.f('fk_ticket_type_event_brand_uuid_event_brand'), 'ticket_type', 'event_brand', ['event_brand_uuid'], ['uuid'])
41+
op.add_column('user_positions', sa.Column('event_brand_uuid', sa.UUID(), nullable=True))
42+
op.create_foreign_key(op.f('fk_user_positions_event_brand_uuid_event_brand'), 'user_positions', 'event_brand', ['event_brand_uuid'], ['uuid'])
43+
# ### end Alembic commands ###
44+
45+
46+
def downgrade():
47+
# ### commands auto generated by Alembic - please adjust! ###
48+
op.drop_constraint(op.f('fk_user_positions_event_brand_uuid_event_brand'), 'user_positions', type_='foreignkey')
49+
op.drop_column('user_positions', 'event_brand_uuid')
50+
op.drop_constraint(op.f('fk_ticket_type_event_brand_uuid_event_brand'), 'ticket_type', type_='foreignkey')
51+
op.drop_column('ticket_type', 'event_brand_uuid')
52+
op.drop_constraint(op.f('fk_seatmap_background_event_brand_uuid_event_brand'), 'seatmap_background', type_='foreignkey')
53+
op.drop_column('seatmap_background', 'event_brand_uuid')
54+
op.drop_constraint(op.f('fk_seatmap_event_brand_uuid_event_brand'), 'seatmap', type_='foreignkey')
55+
op.drop_column('seatmap', 'event_brand_uuid')
56+
op.drop_constraint(op.f('fk_position_event_brand_uuid_event_brand'), 'position', type_='foreignkey')
57+
op.drop_column('position', 'event_brand_uuid')
58+
op.drop_constraint(op.f('fk_location_event_brand_uuid_event_brand'), 'location', type_='foreignkey')
59+
op.drop_column('location', 'event_brand_uuid')
60+
op.drop_constraint(op.f('fk_event_event_brand_uuid_event_brand'), 'event', type_='foreignkey')
61+
op.drop_column('event', 'event_brand_uuid')
62+
op.drop_constraint(op.f('fk_crew_event_brand_event_brand'), 'crew', type_='foreignkey')
63+
op.drop_column('crew', 'event_brand')
64+
op.drop_table('event_brand')
65+
# ### end Alembic commands ###

‎phoenixRest/models/core/event.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
from phoenixRest.models import Base
1919

20-
from phoenixRest.models.core.event_type import EventType
20+
from phoenixRest.models.core.event_brand import EventBrand
2121
from phoenixRest.models.core.user import User
2222
from phoenixRest.models.tickets.ticket import Ticket
2323
from phoenixRest.models.tickets.ticket_type import TicketType
@@ -42,8 +42,8 @@ class Event(Base):
4242
__tablename__ = "event"
4343
uuid = Column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4, unique=True, nullable=False)
4444

45-
event_type_uuid = Column(UUID(as_uuid=True), ForeignKey("event_type.uuid"), nullable=True)
46-
event_type = relationship("EventType")
45+
event_brand_uuid = Column(UUID(as_uuid=True), ForeignKey("event_brand.uuid"), nullable=True)
46+
event_brand = relationship("EventBrand")
4747

4848
booking_time = Column(DateTime, nullable=False)
4949

@@ -87,7 +87,7 @@ def __json__(self, request):
8787
return {
8888
'name': str(self.name),
8989
'uuid': str(self.uuid),
90-
'event_type_uuid': str(self.event_type_uuid),
90+
'event_brand_uuid': str(self.event_brand_uuid),
9191
'participant_age_limit_inclusive': self.participant_age_limit_inclusive,
9292
'crew_age_limit_inclusive': self.crew_age_limit_inclusive,
9393
'booking_time': int(self.booking_time.timestamp()),

‎phoenixRest/models/core/event_type.py‎ renamed to ‎phoenixRest/models/core/event_brand.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222

2323
import uuid
2424

25-
class EventType(Base):
26-
__tablename__ = "event_type"
25+
class EventBrand(Base):
26+
__tablename__ = "event_brand"
2727

2828
uuid = Column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4, unique=True, nullable=False)
2929

‎phoenixRest/models/core/location.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ class Location(Base):
2323
__tablename__ = "location"
2424
uuid = Column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4, unique=True, nullable=False)
2525

26-
event_type_uuid = Column(UUID(as_uuid=True), ForeignKey("event_type.uuid"), nullable=True)
27-
event_type = relationship("EventType")
26+
event_brand_uuid = Column(UUID(as_uuid=True), ForeignKey("event_brand.uuid"), nullable=True)
27+
event_brand = relationship("EventBrand")
2828

2929
name = Column(Text, nullable=False)
3030
address = Column(Text, nullable=False)
@@ -36,7 +36,7 @@ def __init__(self, name: str, address: str):
3636
def __json__(self, request):
3737
return {
3838
'uuid': str(self.uuid),
39-
'event_type_uuid': str(self.event_type_uuid),
39+
'event_brand_uuid': str(self.event_brand_uuid),
4040
'name': self.name,
4141
'address': self.address,
4242
}

‎phoenixRest/models/crew/crew.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
from phoenixRest.models import Base
1919

20-
from phoenixRest.models.core.event_type import EventType
20+
from phoenixRest.models.core.event_brand import EventBrand
2121
from phoenixRest.models.core.user import User
2222

2323
from datetime import datetime, timedelta
@@ -29,8 +29,8 @@ class Crew(Base):
2929
__tablename__ = "crew"
3030
uuid = Column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4, unique=True, nullable=False)
3131

32-
event_type = Column(UUID(as_uuid=True), ForeignKey("event_type.uuid"), nullable=True)
33-
event = relationship("EventType")
32+
event_brand = Column(UUID(as_uuid=True), ForeignKey("event_brand.uuid"), nullable=True)
33+
event = relationship("EventBrand")
3434

3535
name = Column(Text, nullable=False)
3636
description = Column(Text, nullable=False)
@@ -53,7 +53,7 @@ def __init__(self, name: str, description: str):
5353
def __json__(self, request):
5454
return {
5555
'uuid': str(self.uuid),
56-
'event_type_uuid': str(self.event_type_uuid),
56+
'event_brand_uuid': str(self.event_brand_uuid),
5757
'name': self.name,
5858
'description': self.description,
5959
'active': self.active,

‎phoenixRest/models/crew/position.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ class Position(Base):
2525
__tablename__ = "position"
2626
uuid = Column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4, unique=True, nullable=False)
2727

28-
event_type_uuid = Column(UUID(as_uuid=True), ForeignKey("event_type.uuid"), nullable=True)
29-
event_type = relationship("EventType")
28+
event_brand_uuid = Column(UUID(as_uuid=True), ForeignKey("event_brand.uuid"), nullable=True)
29+
event_brand = relationship("EventBrand")
3030

3131
crew_uuid = Column(UUID(as_uuid=True), ForeignKey("crew.uuid"), nullable=True)
3232
crew = relationship("Crew")
@@ -52,7 +52,7 @@ def __init__(self, name: str, description: str):
5252
def __json__(self, request):
5353
return {
5454
'uuid': str(self.uuid),
55-
'event_type_uuid': str(self.event_type_uuid),
55+
'event_brand_uuid': str(self.event_brand_uuid),
5656
'name': self.name,
5757
'description': self.description,
5858
'is_vanity': self.is_vanity,

‎phoenixRest/models/crew/position_mapping.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ class PositionMapping(Base):
2222
__tablename__ = "user_positions"
2323
uuid = Column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4, unique=True, nullable=False)
2424

25-
event_type_uuid = Column(UUID(as_uuid=True), ForeignKey("event_type.uuid"), nullable=True)
26-
event_type = relationship("EventType")
25+
event_brand_uuid = Column(UUID(as_uuid=True), ForeignKey("event_brand.uuid"), nullable=True)
26+
event_brand = relationship("EventBrand")
2727

2828
position_uuid = Column(UUID(as_uuid=True), ForeignKey("position.uuid"), nullable=False)
2929
position = relationship("Position", back_populates="position_mappings", uselist=False)
@@ -49,7 +49,7 @@ def __init__(self, user, position, event=None):
4949
def __json__(self, request):
5050
return {
5151
'uuid': self.uuid,
52-
'event_type_uuid': str(self.event_type_uuid),
52+
'event_brand_uuid': str(self.event_brand_uuid),
5353
'position_uuid': self.position_uuid,
5454
'user_uuid': self.user_uuid,
5555
'event_uuid': self.event_uuid,

‎phoenixRest/models/tickets/seatmap.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ class Seatmap(Base):
2929
__tablename__ = "seatmap"
3030
uuid = Column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4, unique=True, nullable=False)
3131

32-
event_type_uuid = Column(UUID(as_uuid=True), ForeignKey("event_type.uuid"), nullable=True)
33-
event_type = relationship("EventType")
32+
event_brand_uuid = Column(UUID(as_uuid=True), ForeignKey("event_brand.uuid"), nullable=True)
33+
event_brand = relationship("EventBrand")
3434

3535
name = Column(Text, nullable=False)
3636
description = Column(Text, nullable=False)
@@ -53,7 +53,7 @@ def __init__(self, name: str, description: str):
5353
def __json__(self, request):
5454
return {
5555
'uuid': str(self.uuid),
56-
'event_type_uuid': str(self.event_type_uuid),
56+
'event_brand_uuid': str(self.event_brand_uuid),
5757
'name': str(self.name),
5858
'description': str(self.description),
5959
'background': map_seatmap_background_no_metadata(self.background, request) if self.background is not None else None,

‎phoenixRest/models/tickets/seatmap_background.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ class SeatmapBackground(Base):
2424
__tablename__ = "seatmap_background"
2525
uuid = Column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4, unique=True, nullable=False)
2626

27-
event_type_uuid = Column(UUID(as_uuid=True), ForeignKey("event_type.uuid"), nullable=True)
28-
event_type = relationship("EventType")
27+
event_brand_uuid = Column(UUID(as_uuid=True), ForeignKey("event_brand.uuid"), nullable=True)
28+
event_brand = relationship("EventBrand")
2929

3030
created = Column(DateTime, nullable=False, server_default='NOW()')
3131
extension = Column(Text, nullable=False)
@@ -50,7 +50,7 @@ def get_fs_location(self, request):
5050
def __json__(self, request):
5151
return {
5252
'uuid': str(self.uuid),
53-
'event_type_uuid': str(self.event_type_uuid),
53+
'event_brand_uuid': str(self.event_brand_uuid),
5454
'uploader_uuid': self.uploader_uuid,
5555
'created': int(self.created.timestamp()),
5656
'url': self.get_url(request)

0 commit comments

Comments
 (0)