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