From 9187518c8b96e1b3206fb0603c518e3def3fd58b Mon Sep 17 00:00:00 2001 From: andrei Date: Sun, 27 Apr 2025 16:14:35 +0500 Subject: [PATCH] =?UTF-8?q?=D0=B4=D0=BE=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB?= =?UTF-8?q?=D0=B8=20=D1=80=D0=B5=D0=B3=D0=B8=D1=81=D1=82=D1=80=D0=B0=D1=86?= =?UTF-8?q?=D0=B8=D1=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- API/app/application/roles_repository.py | 2 +- API/app/application/teams_repository.py | 2 +- API/app/contollers/register_controller.py | 27 ++++++++++++++++++ .../d53be3a35511_0001_инициализация.py | 2 +- API/app/database/session.py | 15 ++++++++++ API/app/domain/entities/user.py | 1 + API/app/domain/models/contest_statuses.py | 2 +- API/app/domain/models/projects.py | 2 +- API/app/domain/models/teams.py | 2 +- API/app/domain/models/users.py | 4 +-- API/app/infrastructure/users_service.py | 21 +++++++++++++- API/app/main.py | 10 ++++++- API/app/settings.py | 1 + API/req.txt | Bin 0 -> 356 bytes 14 files changed, 81 insertions(+), 10 deletions(-) create mode 100644 API/app/contollers/register_controller.py create mode 100644 API/app/database/session.py diff --git a/API/app/application/roles_repository.py b/API/app/application/roles_repository.py index 718047f..8da2a20 100644 --- a/API/app/application/roles_repository.py +++ b/API/app/application/roles_repository.py @@ -1,6 +1,6 @@ -from select import select from typing import Optional +from sqlalchemy import select from sqlalchemy.ext.asyncio import AsyncSession from app.domain.models import Role diff --git a/API/app/application/teams_repository.py b/API/app/application/teams_repository.py index 4d1b14b..cc433d0 100644 --- a/API/app/application/teams_repository.py +++ b/API/app/application/teams_repository.py @@ -1,6 +1,6 @@ -from select import select from typing import Optional +from sqlalchemy import select from sqlalchemy.ext.asyncio import AsyncSession from app.domain.models import Team diff --git a/API/app/contollers/register_controller.py b/API/app/contollers/register_controller.py new file mode 100644 index 0000000..e2653f0 --- /dev/null +++ b/API/app/contollers/register_controller.py @@ -0,0 +1,27 @@ +from typing import Optional + +from fastapi import APIRouter +from fastapi.params import Depends +from sqlalchemy.ext.asyncio import AsyncSession + +from app.database.session import get_db +from app.domain.entities.register import RegisterEntity +from app.domain.entities.user import UserEntity +from app.infrastructure.users_service import UsersService + +router = APIRouter() + + +@router.post( + '/', + response_model=Optional[UserEntity], + summary='User Registration', + description='Performs user registration in the system', +) +async def register_user( + user_data: RegisterEntity, + db: AsyncSession = Depends(get_db) +): + users_service = UsersService(db) + user = await users_service.register_user(user_data) + return user diff --git a/API/app/database/migrations/versions/d53be3a35511_0001_инициализация.py b/API/app/database/migrations/versions/d53be3a35511_0001_инициализация.py index 62364e6..d29f191 100644 --- a/API/app/database/migrations/versions/d53be3a35511_0001_инициализация.py +++ b/API/app/database/migrations/versions/d53be3a35511_0001_инициализация.py @@ -139,7 +139,7 @@ def upgrade() -> None: ) op.create_table('users', sa.Column('login', sa.VARCHAR(length=150), nullable=False), - sa.Column('password', sa.VARCHAR(length=150), nullable=False), + sa.Column('password', sa.VARCHAR(), nullable=False), sa.Column('profile_id', sa.Integer(), nullable=False), sa.Column('id', sa.Integer(), autoincrement=True, nullable=False), sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=False), diff --git a/API/app/database/session.py b/API/app/database/session.py new file mode 100644 index 0000000..5b37650 --- /dev/null +++ b/API/app/database/session.py @@ -0,0 +1,15 @@ +from sqlalchemy.ext.asyncio import AsyncSession, create_async_engine +from sqlalchemy.orm import sessionmaker + +from app.settings import settings + +engine = create_async_engine(settings.DATABASE_URL, echo=False) + +async_session_maker = sessionmaker( + bind=engine, class_=AsyncSession, expire_on_commit=False +) + + +async def get_db(): + async with async_session_maker() as session: + yield session diff --git a/API/app/domain/entities/user.py b/API/app/domain/entities/user.py index 022c0eb..a8ccab3 100644 --- a/API/app/domain/entities/user.py +++ b/API/app/domain/entities/user.py @@ -6,6 +6,7 @@ from app.domain.entities.profile import ProfileEntity class UserEntity(BaseUserEntity): id: Optional[int] = None + password: Optional[str] = None profile_id: int diff --git a/API/app/domain/models/contest_statuses.py b/API/app/domain/models/contest_statuses.py index f155ec4..ac92769 100644 --- a/API/app/domain/models/contest_statuses.py +++ b/API/app/domain/models/contest_statuses.py @@ -9,4 +9,4 @@ class ContestStatus(AdvancedBaseModel): title = Column(VARCHAR(150), unique=True, nullable=False) - contest = relationship("Contest", back_populates="status") + contests = relationship("Contest", back_populates="status") diff --git a/API/app/domain/models/projects.py b/API/app/domain/models/projects.py index 577f48d..141c494 100644 --- a/API/app/domain/models/projects.py +++ b/API/app/domain/models/projects.py @@ -10,6 +10,6 @@ class Project(AdvancedBaseModel): description = Column(VARCHAR(150)) repository_url = Column(String, nullable=False) - contest = relationship("Contest", back_populates="project") + contests = relationship("Contest", back_populates="project") files = relationship("ProjectFile", back_populates="project") members = relationship("ProjectMember", back_populates="project") diff --git a/API/app/domain/models/teams.py b/API/app/domain/models/teams.py index 11d97f8..8538dad 100644 --- a/API/app/domain/models/teams.py +++ b/API/app/domain/models/teams.py @@ -12,4 +12,4 @@ class Team(AdvancedBaseModel): logo = Column(String) git_url = Column(String) - profile = relationship("Profile", back_populates="team") + profiles = relationship("Profile", back_populates="team") diff --git a/API/app/domain/models/users.py b/API/app/domain/models/users.py index 5dc4668..2e70001 100644 --- a/API/app/domain/models/users.py +++ b/API/app/domain/models/users.py @@ -1,4 +1,4 @@ -from sqlalchemy import Column, VARCHAR, ForeignKey, Integer +from sqlalchemy import Column, VARCHAR, ForeignKey, Integer, String from sqlalchemy.orm import relationship from werkzeug.security import check_password_hash, generate_password_hash @@ -9,7 +9,7 @@ class User(AdvancedBaseModel): __tablename__ = 'users' login = Column(VARCHAR(150), unique=True, nullable=False) - password = Column(VARCHAR(150), nullable=False) + password = Column(String, nullable=False) profile_id = Column(Integer, ForeignKey('profiles.id'), nullable=False) diff --git a/API/app/infrastructure/users_service.py b/API/app/infrastructure/users_service.py index 6726552..ca494b2 100644 --- a/API/app/infrastructure/users_service.py +++ b/API/app/infrastructure/users_service.py @@ -7,6 +7,7 @@ from app.application.profiles_repository import ProfilesRepository from app.application.roles_repository import RolesRepository from app.application.teams_repository import TeamsRepository from app.application.users_repository import UsersRepository +from app.domain.entities.profile import ProfileEntity from app.domain.entities.register import RegisterEntity from app.domain.entities.user import UserEntity from app.domain.models import User, Profile @@ -40,7 +41,10 @@ class UsersService: user_model.profile_id = profile_model.id user_model = await self.users_repository.create(user_model) - return UserEntity + user_entity = self.user_model_to_entity(user_model) + user_entity.profile = self.profile_model_to_entity(profile_model) + + return user_entity @staticmethod def is_strong_password(password): @@ -85,9 +89,24 @@ class UsersService: return user, pofile + @staticmethod + def profile_model_to_entity(profile_model: Profile) -> ProfileEntity: + return ProfileEntity( + id=profile_model.id, + first_name=profile_model.first_name, + last_name=profile_model.last_name, + patronymic=profile_model.patronymic, + birthday=profile_model.birthday, + email=profile_model.email, + phone=profile_model.phone, + role_id=profile_model.role_id, + team_id=profile_model.team_id, + ) + @staticmethod def user_model_to_entity(user_model: User) -> UserEntity: return UserEntity( id=user_model.id, login=user_model.login, + profile_id=user_model.profile_id, ) diff --git a/API/app/main.py b/API/app/main.py index a416972..99b5ecf 100644 --- a/API/app/main.py +++ b/API/app/main.py @@ -1,6 +1,10 @@ from fastapi import FastAPI from fastapi.middleware.cors import CORSMiddleware +from app.contollers.register_controller import router as register_router +from app.settings import settings + + def start_app(): api_app = FastAPI() @@ -12,10 +16,14 @@ def start_app(): allow_headers=["*"], ) + api_app.include_router(register_router, prefix=f'{settings.PREFIX}/register', tags=['register']) + return api_app + app = start_app() + @app.get("/") async def root(): - return {"message": "Hello API"} \ No newline at end of file + return {"message": "Hello API"} diff --git a/API/app/settings.py b/API/app/settings.py index c11c96a..97b26d4 100644 --- a/API/app/settings.py +++ b/API/app/settings.py @@ -4,6 +4,7 @@ from pydantic_settings import BaseSettings class Settings(BaseSettings): DATABASE_URL: str SECRET_KEY: str + PREFIX: str = '' class Config: env_file = '.env' diff --git a/API/req.txt b/API/req.txt index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..33e583fff47ca4b5cb1f2c6c357fe6fbc28ea533 100644 GIT binary patch literal 356 zcmZvYI}U}}`Tux7=Qi;StLt0w53wu5QM eJ#<%b=B4kg+fiH5_GDFKIV`^$CT}a*enP%>IW_kH literal 0 HcmV?d00001