From 74787e7e448dfdaf3e4a5c7c3f5553aee6962dbb Mon Sep 17 00:00:00 2001 From: Andrei Duvakin Date: Fri, 31 Jan 2025 20:11:40 +0500 Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=B4=D0=B5=D0=BB?= =?UTF-8?q?=D0=B0=D0=BB=20=D1=81=D1=82=D1=80=D1=83=D0=BA=D1=82=D1=83=D1=80?= =?UTF-8?q?=D1=83=20=D0=B0=D0=BF=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../database/models => application}/__init__.py | 0 api/app/config.py | 0 api/app/controllers/__init__.py | 0 api/app/core/config.py | 11 ----------- api/app/database/__init__.py | 0 api/app/{infrastructure => }/database/session.py | 2 +- api/app/domain/__init__.py | 0 api/app/domain/models/__init__.py | 3 +++ api/app/domain/models/lenses_types.py | 11 +++++++++++ api/app/infrastructure/__init__.py | 0 10 files changed, 15 insertions(+), 12 deletions(-) rename api/app/{infrastructure/database/models => application}/__init__.py (100%) create mode 100644 api/app/config.py create mode 100644 api/app/controllers/__init__.py delete mode 100644 api/app/core/config.py create mode 100644 api/app/database/__init__.py rename api/app/{infrastructure => }/database/session.py (90%) create mode 100644 api/app/domain/__init__.py create mode 100644 api/app/domain/models/__init__.py create mode 100644 api/app/domain/models/lenses_types.py create mode 100644 api/app/infrastructure/__init__.py diff --git a/api/app/infrastructure/database/models/__init__.py b/api/app/application/__init__.py similarity index 100% rename from api/app/infrastructure/database/models/__init__.py rename to api/app/application/__init__.py diff --git a/api/app/config.py b/api/app/config.py new file mode 100644 index 0000000..e69de29 diff --git a/api/app/controllers/__init__.py b/api/app/controllers/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/api/app/core/config.py b/api/app/core/config.py deleted file mode 100644 index 11d4a53..0000000 --- a/api/app/core/config.py +++ /dev/null @@ -1,11 +0,0 @@ -from pydantic import BaseSettings - - -class Settings(BaseSettings): - DATABASE_URL: str = "postgresql+asyncpg://user:password@localhost:5432/dbname" - - class Config: - env_file = ".env" - - -settings = Settings() diff --git a/api/app/database/__init__.py b/api/app/database/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/api/app/infrastructure/database/session.py b/api/app/database/session.py similarity index 90% rename from api/app/infrastructure/database/session.py rename to api/app/database/session.py index 57da850..0d05360 100644 --- a/api/app/infrastructure/database/session.py +++ b/api/app/database/session.py @@ -1,6 +1,6 @@ from sqlalchemy.ext.asyncio import AsyncSession, create_async_engine from sqlalchemy.orm import sessionmaker -from app.core.config import settings +from app.config import settings engine = create_async_engine(settings.DATABASE_URL, echo=True) diff --git a/api/app/domain/__init__.py b/api/app/domain/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/api/app/domain/models/__init__.py b/api/app/domain/models/__init__.py new file mode 100644 index 0000000..7c2377a --- /dev/null +++ b/api/app/domain/models/__init__.py @@ -0,0 +1,3 @@ +from sqlalchemy.ext.declarative import declarative_base + +Base = declarative_base() \ No newline at end of file diff --git a/api/app/domain/models/lenses_types.py b/api/app/domain/models/lenses_types.py new file mode 100644 index 0000000..181fec8 --- /dev/null +++ b/api/app/domain/models/lenses_types.py @@ -0,0 +1,11 @@ +from sqlalchemy import Column, Integer, VARCHAR, ForeignKey +from sqlalchemy.orm import relationship + +from app.domain.models import Base + + +class LensesType(Base): + __tablename__ = 'lenses_types' + + id = Column(Integer, primary_key=True, autoincrement=True) + title = Column(VARCHAR(150), nullable=False, unique=True) diff --git a/api/app/infrastructure/__init__.py b/api/app/infrastructure/__init__.py new file mode 100644 index 0000000..e69de29