Frontend

.gitignore

@@ -182,4 +182,8 @@ dist-ssr
 *.ntvs*
 *.njsproj
 *.sln
-*.sw?
+*.sw?
+*.map
+*.css
+*.css
+*.map

backend/docker-launch.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 # При запуске стоит указывать здесь номер последней миграции
 alembic revision --autogenerate
-alembic upgrade head || alembic upgrade 1d75241f340c
+alembic upgrade head || alembic upgrade ee38e6a7803e
 cd src || exit
 gunicorn main:app --workers 1 --worker-class uvicorn.workers.UvicornWorker --bind=0.0.0.0:"$BACK_APP_PORT" --timeout 300

backend/migrations/env.py

@@ -31,7 +31,7 @@
 # target_metadata = mymodel.Base.metadata
 
 from game.map import Map
-from game.modules import Module
+from game.modules import Level
 from game.levels import Level
 from game.units.tasks import TaskUnit, EmployeeTask
 from game.units.theory import TheoryUnit  # , TheoryVideo

backend/migrations/versions/2023_12_03_2139-5b1fc71a077e_удаляет_поле_username_из_user.py

@@ -0,0 +1,32 @@
+"""удаляет поле username из user
+
+Revision ID: 5b1fc71a077e
+Revises: 1d75241f340c
+Create Date: 2023-12-03 21:39:14.428463
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = '5b1fc71a077e'
+down_revision: Union[str, None] = '1d75241f340c'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_constraint('users_username_key', 'users', type_='unique')
+    op.drop_column('users', 'username')
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('users', sa.Column('username', sa.VARCHAR(), autoincrement=False, nullable=False))
+    op.create_unique_constraint('users_username_key', 'users', ['username'])
+    # ### end Alembic commands ###

backend/migrations/versions/2023_12_05_2247-c4fba311583c_добавляет_каскадное_удаление_моделей_.py

@@ -0,0 +1,48 @@
+"""добавляет каскадное удаление моделей уровней
+
+Revision ID: c4fba311583c
+Revises: 5b1fc71a077e
+Create Date: 2023-12-05 22:47:33.455372
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = 'c4fba311583c'
+down_revision: Union[str, None] = '5b1fc71a077e'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_constraint('answer_options_question_id_fkey', 'answer_options', type_='foreignkey')
+    op.create_foreign_key(None, 'answer_options', 'questions', ['question_id'], ['id'], ondelete='CASCADE')
+    op.drop_constraint('levels_module_id_fkey', 'levels', type_='foreignkey')
+    op.create_foreign_key(None, 'levels', 'modules', ['module_id'], ['id'], ondelete='CASCADE')
+    op.drop_constraint('modules_map_id_fkey', 'modules', type_='foreignkey')
+    op.create_foreign_key(None, 'modules', 'maps', ['map_id'], ['id'], ondelete='CASCADE')
+    op.drop_constraint('questions_task_id_fkey', 'questions', type_='foreignkey')
+    op.create_foreign_key(None, 'questions', 'task_units', ['task_id'], ['id'], ondelete='CASCADE')
+    op.drop_constraint('task_units_level_id_fkey', 'task_units', type_='foreignkey')
+    op.create_foreign_key(None, 'task_units', 'levels', ['level_id'], ['id'], ondelete='CASCADE')
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_constraint(None, 'task_units', type_='foreignkey')
+    op.create_foreign_key('task_units_level_id_fkey', 'task_units', 'levels', ['level_id'], ['id'])
+    op.drop_constraint(None, 'questions', type_='foreignkey')
+    op.create_foreign_key('questions_task_id_fkey', 'questions', 'task_units', ['task_id'], ['id'])
+    op.drop_constraint(None, 'modules', type_='foreignkey')
+    op.create_foreign_key('modules_map_id_fkey', 'modules', 'maps', ['map_id'], ['id'])
+    op.drop_constraint(None, 'levels', type_='foreignkey')
+    op.create_foreign_key('levels_module_id_fkey', 'levels', 'modules', ['module_id'], ['id'])
+    op.drop_constraint(None, 'answer_options', type_='foreignkey')
+    op.create_foreign_key('answer_options_question_id_fkey', 'answer_options', 'questions', ['question_id'], ['id'])
+    # ### end Alembic commands ###

backend/migrations/versions/2023_12_05_2250-2f3cf6083f65_добавляет_каскадное_удаление_блоков_.py

@@ -0,0 +1,32 @@
+"""добавляет каскадное удаление блоков теории
+
+Revision ID: 2f3cf6083f65
+Revises: c4fba311583c
+Create Date: 2023-12-05 22:50:06.893743
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = '2f3cf6083f65'
+down_revision: Union[str, None] = 'c4fba311583c'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_constraint('theory_units_level_id_fkey', 'theory_units', type_='foreignkey')
+    op.create_foreign_key(None, 'theory_units', 'levels', ['level_id'], ['id'], ondelete='CASCADE')
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_constraint(None, 'theory_units', type_='foreignkey')
+    op.create_foreign_key('theory_units_level_id_fkey', 'theory_units', 'levels', ['level_id'], ['id'])
+    # ### end Alembic commands ###

backend/migrations/versions/2023_12_05_2310-e3d254cf74f4_добавляет_отчество_для_сотрудника.py

@@ -0,0 +1,30 @@
+"""добавляет отчество для сотрудника
+
+Revision ID: e3d254cf74f4
+Revises: 2f3cf6083f65
+Create Date: 2023-12-05 23:10:14.243329
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = 'e3d254cf74f4'
+down_revision: Union[str, None] = '2f3cf6083f65'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('employees', sa.Column('patronymic', sa.String(length=255), nullable=False))
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('employees', 'patronymic')
+    # ### end Alembic commands ###

backend/migrations/versions/2023_12_11_2040-920ca0aa0ea3_дополняет_таблицы_заданий.py

@@ -0,0 +1,40 @@
+"""дополняет таблицы заданий
+
+Revision ID: 920ca0aa0ea3
+Revises: e3d254cf74f4
+Create Date: 2023-12-11 20:40:52.871135
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = '920ca0aa0ea3'
+down_revision: Union[str, None] = 'e3d254cf74f4'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.sync_enum_values('public', 'question_types', ['SingleChoice', 'MultipleChoice', 'Open'],
+                        [('questions', 'type')],
+                        enum_values_to_rename=[])
+    op.sync_enum_values('public', 'task_types', ['Test', 'Discussion'],
+                        [('task_units', 'type')],
+                        enum_values_to_rename=[])
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.sync_enum_values('public', 'task_types', ['Test'],
+                        [('task_units', 'type')],
+                        enum_values_to_rename=[])
+    op.sync_enum_values('public', 'question_types', ['SingleChoice', 'MultipleChoice'],
+                        [('questions', 'type')],
+                        enum_values_to_rename=[])
+    # ### end Alembic commands ###

backend/migrations/versions/2023_12_16_1826-753c2ee49c0d_добавляет_монеты_сотруднику.py

@@ -0,0 +1,47 @@
+"""добавляет монеты сотруднику
+
+Revision ID: 753c2ee49c0d
+Revises: 920ca0aa0ea3
+Create Date: 2023-12-16 18:26:49.202369
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = '753c2ee49c0d'
+down_revision: Union[str, None] = '920ca0aa0ea3'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_index('ix_oauth_account_account_id', table_name='oauth_account')
+    op.drop_index('ix_oauth_account_oauth_name', table_name='oauth_account')
+    op.drop_table('oauth_account')
+    op.add_column('employees', sa.Column('coins', sa.Integer(), nullable=False))
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('employees', 'coins')
+    op.create_table('oauth_account',
+    sa.Column('user_id', sa.UUID(), autoincrement=False, nullable=False),
+    sa.Column('id', sa.UUID(), autoincrement=False, nullable=False),
+    sa.Column('oauth_name', sa.VARCHAR(length=100), autoincrement=False, nullable=False),
+    sa.Column('access_token', sa.VARCHAR(length=1024), autoincrement=False, nullable=False),
+    sa.Column('expires_at', sa.INTEGER(), autoincrement=False, nullable=True),
+    sa.Column('refresh_token', sa.VARCHAR(length=1024), autoincrement=False, nullable=True),
+    sa.Column('account_id', sa.VARCHAR(length=320), autoincrement=False, nullable=False),
+    sa.Column('account_email', sa.VARCHAR(length=320), autoincrement=False, nullable=False),
+    sa.ForeignKeyConstraint(['user_id'], ['users.id'], name='oauth_account_user_id_fkey', ondelete='CASCADE'),
+    sa.PrimaryKeyConstraint('id', name='oauth_account_pkey')
+    )
+    op.create_index('ix_oauth_account_oauth_name', 'oauth_account', ['oauth_name'], unique=False)
+    op.create_index('ix_oauth_account_account_id', 'oauth_account', ['account_id'], unique=False)
+    # ### end Alembic commands ###

backend/migrations/versions/2023_12_16_1832-ee38e6a7803e_добавляет_отчество_сотрдуникам_и_.py

@@ -0,0 +1,30 @@
+"""добавляет отчество сотрдуникам и куратору
+
+Revision ID: ee38e6a7803e
+Revises: 753c2ee49c0d
+Create Date: 2023-12-16 18:32:42.403504
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = 'ee38e6a7803e'
+down_revision: Union[str, None] = '753c2ee49c0d'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('tutors', sa.Column('patronymic', sa.String(length=255), nullable=False))
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('tutors', 'patronymic')
+    # ### end Alembic commands ###

backend/src/auth/base_config.py

@@ -13,7 +13,7 @@ def get_jwt_strategy() -> JWTStrategy:
     return JWTStrategy(secret=Settings.secret_jwt, lifetime_seconds=60 * 60)
 
 
-cookie_transport = CookieTransport(cookie_name="adaptify", cookie_max_age=60 * 60)
+cookie_transport = CookieTransport(cookie_name="adaptify", cookie_max_age=60 * 60, cookie_secure=False)
 
 auth_backend = AuthenticationBackend(
     name="jwt",

backend/src/game/dependencies.py

@@ -1,15 +1,19 @@
-from repository.level_repository import LevelRepository
-from repository.map_repository import MapRepository
-from repository.module_repository import ModuleRepository
-from repository.question_repository import QuestionRepository
-from repository.task_unit_repository import TaskUnitRepository
-from repository.theory_unit_repository import TheoryUnitRepository
-from services.level_service import LevelService
-from services.map_service import MapService
-from services.module_service import ModuleService
-from services.question_service import QuestionService
-from services.task_unit_service import TaskUnitService
-from services.theory_unit_service import TheoryUnitService
+from repository.game.level_repository import LevelRepository
+from repository.game.map_repository import MapRepository
+from repository.game.module_repository import ModuleRepository
+from repository.game.units.answer_option_repository import AnswerOptionRepository
+from repository.game.units.employee_task_repository import EmployeeTaskRepository
+from repository.game.units.question_repository import QuestionRepository
+from repository.game.units.task_unit_repository import TaskUnitRepository
+from repository.game.units.theory_unit_repository import TheoryUnitRepository
+from services.game.level_service import LevelService
+from services.game.map_service import MapService
+from services.game.module_service import ModuleService
+from services.game.units.answer_option_service import AnswerOptionService
+from services.game.units.employee_task_service import EmployeeTaskService
+from services.game.units.question_service import QuestionService
+from services.game.units.task_unit_service import TaskUnitService
+from services.game.units.theory_unit_service import TheoryUnitService
 
 
 def map_service() -> MapService:
@@ -28,9 +32,17 @@ def task_unit_service() -> TaskUnitService:
     return TaskUnitService(TaskUnitRepository)
 
 
+def employee_task_service() -> EmployeeTaskService:
+    return EmployeeTaskService(EmployeeTaskRepository)
+
+
 def theory_unit_service() -> TheoryUnitService:
     return TheoryUnitService(TheoryUnitRepository)
 
 
 def question_service() -> QuestionService:
     return QuestionService(QuestionRepository)
+
+
+def answer_option_service() -> AnswerOptionService:
+    return AnswerOptionService(AnswerOptionRepository)

backend/src/game/levels/models.py

@@ -11,7 +11,7 @@
 from game.units import TaskUnit, TheoryUnit
 
 if typing.TYPE_CHECKING:
-    from game.modules.models import Module
+    from game.modules.models import Level
     from game.units.tasks.models import TaskUnit
     from game.units.theory.models import TheoryUnit
 
@@ -20,14 +20,16 @@ class Level(BaseModel):
     __tablename__ = 'levels'
 
     id: Mapped[uuid.UUID] = mapped_column(UUID, primary_key=True, default=uuid.uuid4)
-    module_id: Mapped[uuid.UUID] = mapped_column(UUID, ForeignKey('modules.id'))
+    module_id: Mapped[uuid.UUID] = mapped_column(UUID, ForeignKey('modules.id', ondelete="CASCADE"))
     title: Mapped[str] = mapped_column(String(length=255), nullable=False)
 
-    module: Mapped["Module"] = relationship(back_populates='levels')
+    module: Mapped["Level"] = relationship(back_populates='levels')
 
-    theory_units: Mapped[list["TheoryUnit"]] = relationship(back_populates='level', lazy='selectin')
+    theory_units: Mapped[list["TheoryUnit"]] = relationship(
+        back_populates='level', lazy='selectin', cascade='all, delete-orphan')
 
-    task_units: Mapped[list["TaskUnit"]] = relationship(back_populates='level', lazy='selectin')
+    task_units: Mapped[list["TaskUnit"]] = relationship(
+        back_populates='level', lazy='selectin', cascade='all, delete-orphan')
 
     def to_read_schema(self) -> LevelRead:
         return LevelRead(id=self.id,

backend/src/game/levels/router.py

@@ -33,7 +33,7 @@ async def post_level_to_module(map_id: UUID,
                                module_id: UUID,
                                level_create: LevelCreate,
                                level_service: LevelServiceType) -> LevelRead:
-    return await level_service.create_one(level_create)
+    return await level_service.create_one(module_id, level_create)
 
 
 @router.delete("/maps/{map_id}/modules/{module_id}/levels/{level_id}/")