Skip to content

Commit 397c116

Browse files
committed
EventUser table with right format
1 parent 35ad55b commit 397c116

40 files changed

Lines changed: 33 additions & 69 deletions

calendar_backend/__init__.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
import os
22

3-
43
__version__ = os.getenv('APP_VERSION', 'dev')

calendar_backend/__main__.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
from calendar_backend.routes import app
66

7-
87
logging.basicConfig(
98
filename=f'logger_{__name__}.log',
109
level=logging.DEBUG,
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
from . import utils
22

3-
43
__all__ = ("utils",)

calendar_backend/methods/image.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
from calendar_backend.models.db import ApproveStatuses, Lecturer, Photo
1515
from calendar_backend.settings import get_settings
1616

17-
1817
settings = get_settings()
1918

2019

calendar_backend/methods/list_calendar.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
from . import utils
1818

19-
2019
settings = get_settings()
2120
logger = logging.getLogger(__name__)
2221

calendar_backend/methods/utils.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
from calendar_backend.models.db import Event, Group, Lecturer, Room
44
from calendar_backend.settings import get_settings
55

6-
76
settings = get_settings()
87

98

calendar_backend/models/__init__.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
Room,
1414
)
1515

16-
1716
__all__ = [
1817
"Credentials",
1918
"Group",

calendar_backend/models/db.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,11 @@
1515

1616

1717
class EventUserStatus(str, Enum):
18-
NO_STATUS: str = "no_status"
19-
GOING: str = "going"
20-
NOT_GOING: str = "not_going"
21-
ATTENDED: str = "attended"
18+
NO_STATUS: str = "no_status"
19+
GOING: str = "going"
20+
NOT_GOING: str = "not_going"
21+
ATTENDED: str = "attended"
22+
2223

2324
class Credentials(BaseDbModel):
2425
"""User credentials"""
@@ -224,21 +225,20 @@ class CommentEvent(BaseDbModel):
224225
primaryjoin="and_(Event.id==CommentEvent.event_id, not_(Event.is_deleted))",
225226
)
226227

228+
227229
class EventUser(BaseDbModel):
228230
id: Mapped[int] = mapped_column(Integer, primary_key=True)
229231
event_id: Mapped[int] = mapped_column(Integer, ForeignKey("event.id"), nullable=False)
230232
user_id: Mapped[int] = mapped_column(Integer, nullable=False)
231-
status: Mapped[EventUserStatus] = mapped_column(
232-
DbEnum(EventUserStatus, native_enum=False), nullable=False
233-
)
233+
status: Mapped[EventUserStatus] = mapped_column(DbEnum(EventUserStatus, native_enum=False), nullable=False)
234234
updated_at: Mapped[datetime] = mapped_column(
235235
DateTime, nullable=False, default=datetime.utcnow, onupdate=datetime.utcnow
236236
)
237237
is_deleted: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False)
238238

239239
event: Mapped[Event] = relationship(
240240
"Event",
241-
foreign_keys="EventUser.event_id",
241+
foreign_keys="EventUser.event_id",
242242
back_populates="user_event",
243243
primaryjoin="and_(EventUser.event_id==Event.id, not_(Event.is_deleted))",
244-
)
244+
)
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
from .base import app
22

3-
43
__all__ = ["app"]

calendar_backend/routes/base.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,11 @@
2828
from .lecturer.photo_review import router as lecturer_photo_review_router
2929
from .room.room import router as room_router
3030

31-
3231
settings = get_settings()
3332
logger = logging.getLogger(__name__)
3433
app = FastAPI(
3534
title='Сервис расписания',
36-
description=dedent(
37-
"""
35+
description=dedent("""
3836
API для работы с календарем физфака.
3937
4038
Пример работы на питоне(Создание Room):
@@ -49,8 +47,7 @@
4947
headers={"Authorization": f"ТокенАвторизацииТвойФФ"}
5048
)
5149
```
52-
"""
53-
),
50+
"""),
5451
version=__version__,
5552
# Настраиваем интернет документацию
5653
root_path=settings.ROOT_PATH if __version__ != 'dev' else '',

0 commit comments

Comments
 (0)