Merge branch 'EventUser_table' of https://github.com/profcomff/timetable-api into EventUser_table

Georgon · Georgon · commit 9513e1ff4f1a · 2026-04-20T17:33:21.000+03:00
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
@@ -69,7 +69,7 @@ jobs:
       - uses: isort/isort-action@master
         with:
           requirementsFiles: "requirements.txt requirements.dev.txt"
-      - uses: psf/black@stable
+      - uses: psf/black@23.11.0
       - name: Comment if linting failed
         if: failure()
         uses: thollander/actions-comment-pull-request@v2
diff --git a/calendar_backend/__init__.py b/calendar_backend/__init__.py
@@ -1,3 +1,4 @@
 import os
 
+
 __version__ = os.getenv('APP_VERSION', 'dev')
diff --git a/calendar_backend/__main__.py b/calendar_backend/__main__.py
@@ -4,6 +4,7 @@
 
 from calendar_backend.routes import app
 
+
 logging.basicConfig(
     filename=f'logger_{__name__}.log',
     level=logging.DEBUG,
diff --git a/calendar_backend/methods/__init__.py b/calendar_backend/methods/__init__.py
@@ -1,3 +1,4 @@
 from . import utils
 
+
 __all__ = ("utils",)
diff --git a/calendar_backend/methods/image.py b/calendar_backend/methods/image.py
@@ -14,6 +14,7 @@
 from calendar_backend.models.db import ApproveStatuses, Lecturer, Photo
 from calendar_backend.settings import get_settings
 
+
 settings = get_settings()
 
 
diff --git a/calendar_backend/methods/list_calendar.py b/calendar_backend/methods/list_calendar.py
@@ -16,6 +16,7 @@
 
 from . import utils
 
+
 settings = get_settings()
 logger = logging.getLogger(__name__)
 
diff --git a/calendar_backend/methods/utils.py b/calendar_backend/methods/utils.py
@@ -3,6 +3,7 @@
 from calendar_backend.models.db import Event, Group, Lecturer, Room
 from calendar_backend.settings import get_settings
 
+
 settings = get_settings()
 
 
diff --git a/calendar_backend/models/__init__.py b/calendar_backend/models/__init__.py
@@ -13,6 +13,7 @@
     Room,
 )
 
+
 __all__ = [
     "Credentials",
     "Group",
diff --git a/calendar_backend/routes/__init__.py b/calendar_backend/routes/__init__.py
@@ -1,3 +1,4 @@
 from .base import app
 
+
 __all__ = ["app"]
diff --git a/calendar_backend/routes/base.py b/calendar_backend/routes/base.py
@@ -28,11 +28,13 @@
 from .lecturer.photo_review import router as lecturer_photo_review_router
 from .room.room import router as room_router
 
+
 settings = get_settings()
 logger = logging.getLogger(__name__)
 app = FastAPI(
     title='Сервис расписания',
-    description=dedent("""
+    description=dedent(
+        """
         API для работы с календарем физфака.
 
         Пример работы на питоне(Создание Room):
@@ -47,7 +49,8 @@
             headers={"Authorization": f"ТокенАвторизацииТвойФФ"}
         )
         ```
-    """),
+    """
+    ),
     version=__version__,
     # Настраиваем интернет документацию
     root_path=settings.ROOT_PATH if __version__ != 'dev' else '',
diff --git a/calendar_backend/routes/event/comment.py b/calendar_backend/routes/event/comment.py
@@ -8,6 +8,7 @@
 from calendar_backend.routes.models.event import CommentEventGet, EventCommentPatch, EventCommentPost, EventComments
 from calendar_backend.settings import get_settings
 
+
 settings = get_settings()
 router = APIRouter(prefix="/event/{event_id}/comment", tags=["Event: Comment"])
 
diff --git a/calendar_backend/routes/event/comment_review.py b/calendar_backend/routes/event/comment_review.py
@@ -11,6 +11,7 @@
 from calendar_backend.routes.models.event import CommentEventGet
 from calendar_backend.settings import get_settings
 
+
 settings = get_settings()
 router = APIRouter(prefix="/event/{event_id}/comment", tags=["Event: Comment Review"])
 
diff --git a/calendar_backend/routes/event/event.py b/calendar_backend/routes/event/event.py
@@ -22,6 +22,7 @@
 )
 from calendar_backend.settings import get_settings
 
+
 settings = get_settings()
 logger = logging.getLogger(__name__)
 router = APIRouter(prefix="/event", tags=["Event"])
diff --git a/calendar_backend/routes/group/group.py b/calendar_backend/routes/group/group.py
@@ -8,6 +8,7 @@
 from calendar_backend.routes.models import GetListGroup, GroupGet, GroupPatch, GroupPost
 from calendar_backend.settings import get_settings
 
+
 settings = get_settings()
 logger = logging.getLogger(__name__)
 router = APIRouter(prefix="/group", tags=["Group"])
diff --git a/calendar_backend/routes/lecturer/comment.py b/calendar_backend/routes/lecturer/comment.py
@@ -8,6 +8,7 @@
 from calendar_backend.routes.models import CommentLecturer, LecturerCommentPatch, LecturerCommentPost, LecturerComments
 from calendar_backend.settings import get_settings
 
+
 settings = get_settings()
 router = APIRouter(prefix="/lecturer/{lecturer_id}", tags=["Lecturer: Comment"], deprecated=True)
 
diff --git a/calendar_backend/routes/lecturer/comment_review.py b/calendar_backend/routes/lecturer/comment_review.py
@@ -10,6 +10,7 @@
 from calendar_backend.models.db import CommentLecturer as DbCommentLecturer
 from calendar_backend.routes.models import CommentLecturer
 
+
 router = APIRouter(prefix="/lecturer/{lecturer_id}/comment", tags=["Lecturer: Comment Review"], deprecated=True)
 
 
diff --git a/calendar_backend/routes/lecturer/lecturer.py b/calendar_backend/routes/lecturer/lecturer.py
@@ -13,6 +13,7 @@
 from calendar_backend.routes.models import GetListLecturer, LecturerGet, LecturerPatch, LecturerPost
 from calendar_backend.settings import get_settings
 
+
 settings = get_settings()
 logger = logging.getLogger(__name__)
 router = APIRouter(prefix="/lecturer", tags=["Lecturer"])
diff --git a/calendar_backend/routes/lecturer/photo.py b/calendar_backend/routes/lecturer/photo.py
@@ -9,6 +9,7 @@
 from calendar_backend.routes.models import LecturerPhotos, Photo
 from calendar_backend.settings import get_settings
 
+
 settings = get_settings()
 router = APIRouter(prefix="/lecturer/{lecturer_id}", tags=["Lecturer: Photo"])
 
diff --git a/calendar_backend/routes/lecturer/photo_review.py b/calendar_backend/routes/lecturer/photo_review.py
@@ -11,6 +11,7 @@
 from calendar_backend.routes.models import Action, Photo
 from calendar_backend.routes.models.base import Base as BaseSchema
 
+
 router = APIRouter(prefix="/lecturer/photo/review", tags=["Lecturer: Photo Review"])
 
 
diff --git a/calendar_backend/routes/models/__init__.py b/calendar_backend/routes/models/__init__.py
@@ -15,6 +15,7 @@
 )
 from .room import GetListRoom, RoomEvents, RoomPatch, RoomPost
 
+
 __all__ = (
     "CommentEventGet",
     "CommentLecturer",
diff --git a/calendar_backend/routes/room/room.py b/calendar_backend/routes/room/room.py
@@ -8,6 +8,7 @@
 from calendar_backend.routes.models import GetListRoom, RoomGet, RoomPatch, RoomPost
 from calendar_backend.settings import get_settings
 
+
 settings = get_settings()
 logger = logging.getLogger(__name__)
 router = APIRouter(prefix="/room", tags=["Room"])
diff --git a/migrations/env.py b/migrations/env.py
@@ -6,6 +6,7 @@
 from calendar_backend.models.base import DeclarativeBase
 from calendar_backend.settings import get_settings
 
+
 # this is the Alembic Config object, which provides
 # access to the values within the .ini file in use.
 config = context.config
diff --git a/migrations/versions/0929a0a9586e_del_link.py b/migrations/versions/0929a0a9586e_del_link.py
@@ -9,6 +9,7 @@
 import sqlalchemy as sa
 from alembic import op
 
+
 # revision identifiers, used by Alembic.
 revision = '0929a0a9586e'
 down_revision = 'c66359fe2d1e'
diff --git a/migrations/versions/3948c45f9977_building_url.py b/migrations/versions/3948c45f9977_building_url.py
@@ -9,6 +9,7 @@
 import sqlalchemy as sa
 from alembic import op
 
+
 # revision identifiers, used by Alembic.
 revision = '3948c45f9977'
 down_revision = '63263ee9e08e'
diff --git a/migrations/versions/55a049fde8f4_many_to_many_events_to_groups.py b/migrations/versions/55a049fde8f4_many_to_many_events_to_groups.py
@@ -9,6 +9,7 @@
 import sqlalchemy as sa
 from alembic import op
 
+
 # revision identifiers, used by Alembic.
 revision = '55a049fde8f4'
 down_revision = 'fe04c8baa5ab'
@@ -44,7 +45,9 @@ def upgrade():
         ),
         sa.PrimaryKeyConstraint('id'),
     )
-    res = e.execute(sa.text("""
+    res = e.execute(
+        sa.text(
+            """
         with inner_q as (
             select 
                 name, 
@@ -59,7 +62,9 @@ def upgrade():
         )
         select old_ids, group_ids
         from inner_q
-    """)).all()
+    """
+        )
+    ).all()
 
     to_delete, pairs = merge_groups(res)
     delete_old_events_query = (
diff --git a/migrations/versions/63263ee9e08e_fix_photo_paths.py b/migrations/versions/63263ee9e08e_fix_photo_paths.py
@@ -8,6 +8,7 @@
 
 from alembic import op
 
+
 # revision identifiers, used by Alembic.
 revision = '63263ee9e08e'
 down_revision = '6d57978a236e'
diff --git a/migrations/versions/6d57978a236e_room_building.py b/migrations/versions/6d57978a236e_room_building.py
@@ -9,6 +9,7 @@
 import sqlalchemy as sa
 from alembic import op
 
+
 # revision identifiers, used by Alembic.
 revision = '6d57978a236e'
 down_revision = 'b0d96bbca3cd'
diff --git a/migrations/versions/8006ac22acc4_add_eventuser_table.py b/migrations/versions/8006ac22acc4_add_eventuser_table.py
@@ -9,6 +9,7 @@
 import sqlalchemy as sa
 from alembic import op
 
+
 # revision identifiers, used by Alembic.
 revision = '8006ac22acc4'
 down_revision = '55a049fde8f4'
diff --git a/migrations/versions/8bae03e22feb_many_to_many.py b/migrations/versions/8bae03e22feb_many_to_many.py
@@ -9,6 +9,7 @@
 import sqlalchemy as sa
 from alembic import op
 
+
 # revision identifiers, used by Alembic.
 revision = '8bae03e22feb'
 down_revision = '93612883178c'
diff --git a/migrations/versions/93612883178c_init.py b/migrations/versions/93612883178c_init.py
@@ -9,6 +9,7 @@
 import sqlalchemy as sa
 from alembic import op
 
+
 # revision identifiers, used by Alembic.
 revision = '93612883178c'
 down_revision = None
diff --git a/migrations/versions/b0d96bbca3cd_add_review.py b/migrations/versions/b0d96bbca3cd_add_review.py
@@ -1,6 +1,7 @@
 import sqlalchemy as sa
 from alembic import op
 
+
 revision = 'b0d96bbca3cd'
 down_revision = 'e111af54f4bb'
 branch_labels = None
diff --git a/migrations/versions/c66359fe2d1e_photo_comment_is_deleted_flag.py b/migrations/versions/c66359fe2d1e_photo_comment_is_deleted_flag.py
@@ -9,6 +9,7 @@
 import sqlalchemy as sa
 from alembic import op
 
+
 # revision identifiers, used by Alembic.
 revision = 'c66359fe2d1e'
 down_revision = 'd6f98271bc6b'
diff --git a/migrations/versions/d6f98271bc6b_no_datatype_directions.py b/migrations/versions/d6f98271bc6b_no_datatype_directions.py
@@ -9,6 +9,7 @@
 import sqlalchemy as sa
 from alembic import op
 
+
 # revision identifiers, used by Alembic.
 revision = 'd6f98271bc6b'
 down_revision = '8bae03e22feb'
diff --git a/migrations/versions/e111af54f4bb_refactoring.py b/migrations/versions/e111af54f4bb_refactoring.py
@@ -8,6 +8,7 @@
 
 from alembic import op
 
+
 # revision identifiers, used by Alembic.
 revision = 'e111af54f4bb'
 down_revision = '0929a0a9586e'
diff --git a/migrations/versions/fe04c8baa5ab_fix_sa20.py b/migrations/versions/fe04c8baa5ab_fix_sa20.py
@@ -10,6 +10,7 @@
 from alembic import op
 from sqlalchemy.dialects import postgresql
 
+
 # revision identifiers, used by Alembic.
 revision = 'fe04c8baa5ab'
 down_revision = '3948c45f9977'
diff --git a/requirements.dev.txt b/requirements.dev.txt
@@ -2,6 +2,6 @@ pytest
 pytest-cov
 requests
 pytest-mock
-black
+black==23.11.0
 isort
 autoflake
diff --git a/tests/event/event.py b/tests/event/event.py
@@ -7,6 +7,7 @@
 
 from calendar_backend.models import Event, Group, Lecturer, Room
 
+
 RESOURCE = "/event/"
 
 
diff --git a/tests/group/group.py b/tests/group/group.py
@@ -7,6 +7,7 @@
 
 from calendar_backend.models import Group
 
+
 RESOURCE = "/group/"
 
 
diff --git a/tests/lecturer/lecturer.py b/tests/lecturer/lecturer.py
@@ -6,6 +6,7 @@
 
 from calendar_backend.models.db import Lecturer
 
+
 RESOURCE = "/lecturer/"
 
 
diff --git a/tests/lecturer/photos.py b/tests/lecturer/photos.py
@@ -8,6 +8,7 @@
 from calendar_backend.models.db import Photo
 from calendar_backend.settings import get_settings
 
+
 settings = get_settings()
 settings.STATIC_PATH = './static'
 
diff --git a/tests/room/room.py b/tests/room/room.py
@@ -7,6 +7,7 @@
 
 from calendar_backend.models import Room
 
+
 RESOURCE = "/room/"
 
 

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
`1`	`1`	`import os`
`2`	`2`
	`3`	`+`
`3`	`4`	`__version__ = os.getenv('APP_VERSION', 'dev')`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
`1`	`1`	`from . import utils`
`2`	`2`
	`3`	`+`
`3`	`4`	`__all__ = ("utils",)`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`	`Room,`
`14`	`14`	`)`
`15`	`15`
	`16`	`+`
`16`	`17`	`__all__ = [`
`17`	`18`	`"Credentials",`
`18`	`19`	`"Group",`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
`1`	`1`	`from .base import app`
`2`	`2`
	`3`	`+`
`3`	`4`	`__all__ = ["app"]`