diff --git a/API/alembic.ini b/API/alembic.ini new file mode 100644 index 0000000..c208a98 --- /dev/null +++ b/API/alembic.ini @@ -0,0 +1,119 @@ +# A generic, single database configuration. + +[alembic] +# path to migration scripts +# Use forward slashes (/) also on windows to provide an os agnostic path +script_location = app/database/migrations + +# template used to generate migration file names; The default value is %%(rev)s_%%(slug)s +# Uncomment the line below if you want the files to be prepended with date and time +# see https://alembic.sqlalchemy.org/en/latest/tutorial.html#editing-the-ini-file +# for all available tokens +# file_template = %%(year)d_%%(month).2d_%%(day).2d_%%(hour).2d%%(minute).2d-%%(rev)s_%%(slug)s + +# sys.path path, will be prepended to sys.path if present. +# defaults to the current working directory. +prepend_sys_path = . + +# timezone to use when rendering the date within the migration file +# as well as the filename. +# If specified, requires the python>=3.9 or backports.zoneinfo library and tzdata library. +# Any required deps can installed by adding `alembic[tz]` to the pip requirements +# string value is passed to ZoneInfo() +# leave blank for localtime +# timezone = + +# max length of characters to apply to the "slug" field +# truncate_slug_length = 40 + +# set to 'true' to run the environment during +# the 'revision' command, regardless of autogenerate +# revision_environment = false + +# set to 'true' to allow .pyc and .pyo files without +# a source .py file to be detected as revisions in the +# versions/ directory +# sourceless = false + +# version location specification; This defaults +# to app/database/migrations/versions. When using multiple version +# directories, initial revisions must be specified with --version-path. +# The path separator used here should be the separator specified by "version_path_separator" below. +# version_locations = %(here)s/bar:%(here)s/bat:app/database/migrations/versions + +# version path separator; As mentioned above, this is the character used to split +# version_locations. The default within new alembic.ini files is "os", which uses os.pathsep. +# If this key is omitted entirely, it falls back to the legacy behavior of splitting on spaces and/or commas. +# Valid values for version_path_separator are: +# +# version_path_separator = : +# version_path_separator = ; +# version_path_separator = space +# version_path_separator = newline +# +# Use os.pathsep. Default configuration used for new projects. +version_path_separator = os + +# set to 'true' to search source files recursively +# in each "version_locations" directory +# new in Alembic version 1.10 +# recursive_version_locations = false + +# the output encoding used when revision files +# are written from script.py.mako +# output_encoding = utf-8 + +sqlalchemy.url = driver://user:pass@localhost/dbname + + +[post_write_hooks] +# post_write_hooks defines scripts or Python functions that are run +# on newly generated revision scripts. See the documentation for further +# detail and examples + +# format using "black" - use the console_scripts runner, against the "black" entrypoint +# hooks = black +# black.type = console_scripts +# black.entrypoint = black +# black.options = -l 79 REVISION_SCRIPT_FILENAME + +# lint with attempts to fix using "ruff" - use the exec runner, execute a binary +# hooks = ruff +# ruff.type = exec +# ruff.executable = %(here)s/.venv/bin/ruff +# ruff.options = check --fix REVISION_SCRIPT_FILENAME + +# Logging configuration +[loggers] +keys = root,sqlalchemy,alembic + +[handlers] +keys = console + +[formatters] +keys = generic + +[logger_root] +level = WARNING +handlers = console +qualname = + +[logger_sqlalchemy] +level = WARNING +handlers = +qualname = sqlalchemy.engine + +[logger_alembic] +level = INFO +handlers = +qualname = alembic + +[handler_console] +class = StreamHandler +args = (sys.stderr,) +level = NOTSET +formatter = generic + +[formatter_generic] +format = %(levelname)-5.5s [%(name)s] %(message)s +datefmt = %H:%M:%S diff --git a/API/app/database/migrations/README b/API/app/database/migrations/README new file mode 100644 index 0000000..98e4f9c --- /dev/null +++ b/API/app/database/migrations/README @@ -0,0 +1 @@ +Generic single-database configuration. \ No newline at end of file diff --git a/API/app/database/migrations/env.py b/API/app/database/migrations/env.py new file mode 100644 index 0000000..33fa354 --- /dev/null +++ b/API/app/database/migrations/env.py @@ -0,0 +1,53 @@ +import asyncio +from logging.config import fileConfig + +from alembic import context +from sqlalchemy import pool +from sqlalchemy.ext.asyncio import create_async_engine + +from app.domain.models import Base +from app.settings import settings + +config = context.config + +if config.config_file_name is not None: + fileConfig(config.config_file_name) + +target_metadata = Base.metadata + + +def get_url(): + return settings.DATABASE_URL + + +def run_migrations_offline() -> None: + url = config.get_main_option("sqlalchemy.url") + context.configure( + url=url, + target_metadata=target_metadata, + literal_binds=True, + dialect_opts={"paramstyle": "named"}, + ) + + with context.begin_transaction(): + context.run_migrations() + + +async def run_migrations_online() -> None: + connectable = create_async_engine(get_url(), poolclass=pool.NullPool, future=True) + + async with connectable.connect() as connection: + await connection.run_sync(do_run_migrations) + + +def do_run_migrations(connection): + context.configure(connection=connection, target_metadata=target_metadata) + with context.begin_transaction(): + context.run_migrations() + + +async def main(): + await run_migrations_online() + + +asyncio.run(main()) diff --git a/API/app/database/migrations/script.py.mako b/API/app/database/migrations/script.py.mako new file mode 100644 index 0000000..480b130 --- /dev/null +++ b/API/app/database/migrations/script.py.mako @@ -0,0 +1,28 @@ +"""${message} + +Revision ID: ${up_revision} +Revises: ${down_revision | comma,n} +Create Date: ${create_date} + +""" +from typing import Sequence, Union + +from alembic import op +import sqlalchemy as sa +${imports if imports else ""} + +# revision identifiers, used by Alembic. +revision: str = ${repr(up_revision)} +down_revision: Union[str, None] = ${repr(down_revision)} +branch_labels: Union[str, Sequence[str], None] = ${repr(branch_labels)} +depends_on: Union[str, Sequence[str], None] = ${repr(depends_on)} + + +def upgrade() -> None: + """Upgrade schema.""" + ${upgrades if upgrades else "pass"} + + +def downgrade() -> None: + """Downgrade schema.""" + ${downgrades if downgrades else "pass"} diff --git a/API/app/domain/models/contest_carousel_photos.py b/API/app/domain/models/contest_carousel_photos.py index e6e2243..e86b3cd 100644 --- a/API/app/domain/models/contest_carousel_photos.py +++ b/API/app/domain/models/contest_carousel_photos.py @@ -1,12 +1,15 @@ from sqlalchemy import String, Column, Integer, ForeignKey +from sqlalchemy.orm import relationship from app.domain.models.base import AdvancedBaseModel -class ContestCarouselPhotos(AdvancedBaseModel): +class ContestCarouselPhoto(AdvancedBaseModel): __tablename__ = 'contest_carousel_photos' file_path = Column(String, nullable=False) number = Column(Integer, nullable=False) contest_id = Column(Integer, ForeignKey('contests.id'), nullable=False) + + contest = relationship('Contest', back_populates='carousel_photos') diff --git a/API/app/domain/models/contest_files.py b/API/app/domain/models/contest_files.py index 680e3b9..e26eb58 100644 --- a/API/app/domain/models/contest_files.py +++ b/API/app/domain/models/contest_files.py @@ -1,4 +1,5 @@ from sqlalchemy import Column, String, ForeignKey, Integer +from sqlalchemy.orm import relationship from app.domain.models.base import AdvancedBaseModel @@ -9,3 +10,5 @@ class ContestFile(AdvancedBaseModel): file_path = Column(String, nullable=False) contest_id = Column(Integer, ForeignKey('contests.id'), nullable=False) + + contest = relationship("Contest", back_populates="files") diff --git a/API/app/domain/models/contest_statuses.py b/API/app/domain/models/contest_statuses.py index ad4b8bc..f155ec4 100644 --- a/API/app/domain/models/contest_statuses.py +++ b/API/app/domain/models/contest_statuses.py @@ -1,4 +1,5 @@ from sqlalchemy import VARCHAR, Column +from sqlalchemy.orm import relationship from app.domain.models.base import AdvancedBaseModel @@ -7,3 +8,5 @@ class ContestStatus(AdvancedBaseModel): __tablename__ = 'contest_statuses' title = Column(VARCHAR(150), unique=True, nullable=False) + + contest = relationship("Contest", back_populates="status") diff --git a/API/app/domain/models/contests.py b/API/app/domain/models/contests.py index 70b488f..5de4ff1 100644 --- a/API/app/domain/models/contests.py +++ b/API/app/domain/models/contests.py @@ -1,4 +1,5 @@ from sqlalchemy import VARCHAR, Column, String, ForeignKey, Integer, Boolean +from sqlalchemy.orm import relationship from app.domain.models.base import AdvancedBaseModel @@ -15,3 +16,9 @@ class Contest(AdvancedBaseModel): project_id = Column(Integer, ForeignKey('projects.id'), nullable=False) status_id = Column(Integer, ForeignKey('contest_status.id'), nullable=False) + + project = relationship('Project', back_populates='contests') + status = relationship('ContestStatus', back_populates='contests') + + carousel_photos = relationship('ContestCarouselPhoto', back_populates='contest') + files = relationship('ContestFile', back_populates='contest') diff --git a/API/app/domain/models/profiles.py b/API/app/domain/models/profiles.py index c24102d..8a4fdec 100644 --- a/API/app/domain/models/profiles.py +++ b/API/app/domain/models/profiles.py @@ -1,4 +1,5 @@ from sqlalchemy import Column, VARCHAR, Date, ForeignKey, Integer +from sqlalchemy.orm import relationship from app.domain.models.base import AdvancedBaseModel @@ -15,3 +16,8 @@ class Profile(AdvancedBaseModel): role_id = Column(Integer, ForeignKey('roles.id'), nullable=False) team_id = Column(Integer, ForeignKey('teams.id'), nullable=False) + + role = relationship('Role', back_populates='profiles') + team = relationship('Team', back_populates='profiles') + + user = relationship('User', back_populates='profile') diff --git a/API/app/domain/models/project_files.py b/API/app/domain/models/project_files.py index 50840c0..81e978c 100644 --- a/API/app/domain/models/project_files.py +++ b/API/app/domain/models/project_files.py @@ -1,4 +1,5 @@ from sqlalchemy import Column, String, Integer, ForeignKey +from sqlalchemy.orm import relationship from app.domain.models.base import AdvancedBaseModel @@ -9,3 +10,5 @@ class ProjectFile(AdvancedBaseModel): file_path = Column(String, unique=True, nullable=False) project_id = Column(Integer, ForeignKey('projects.id'), nullable=False) + + project = relationship("Project", back_populates="files") diff --git a/API/app/domain/models/projects.py b/API/app/domain/models/projects.py index f576df3..80ce895 100644 --- a/API/app/domain/models/projects.py +++ b/API/app/domain/models/projects.py @@ -1,4 +1,5 @@ from sqlalchemy import Column, VARCHAR, String +from sqlalchemy.orm import relationship from app.domain.models.base import AdvancedBaseModel @@ -8,3 +9,6 @@ class Project(AdvancedBaseModel): description = Column(VARCHAR(150)) repository_url = Column(String, nullable=False) + + contest = relationship("Contest", back_populates="project") + files = relationship("ProjectFile", back_populates="project") diff --git a/API/app/domain/models/roles.py b/API/app/domain/models/roles.py index 7622841..9891a82 100644 --- a/API/app/domain/models/roles.py +++ b/API/app/domain/models/roles.py @@ -1,5 +1,6 @@ from sqlalchemy import Column from sqlalchemy.dialects.mysql import VARCHAR +from sqlalchemy.orm import relationship from app.domain.models.base import AdvancedBaseModel @@ -8,3 +9,5 @@ class Role(AdvancedBaseModel): __tablename__ = 'roles' title = Column(VARCHAR(150), unique=True, nullable=False) + + profiles = relationship('Profile', back_populates='role') diff --git a/API/app/domain/models/teams.py b/API/app/domain/models/teams.py index 45970de..11d97f8 100644 --- a/API/app/domain/models/teams.py +++ b/API/app/domain/models/teams.py @@ -1,4 +1,5 @@ from sqlalchemy import Column, VARCHAR, String +from sqlalchemy.orm import relationship from app.domain.models.base import AdvancedBaseModel @@ -9,4 +10,6 @@ class Team(AdvancedBaseModel): title = Column(VARCHAR(150), nullable=False) description = Column(VARCHAR(150)) logo = Column(String) - git_url = Column(String) \ No newline at end of file + git_url = Column(String) + + profile = relationship("Profile", back_populates="team") diff --git a/API/app/domain/models/users.py b/API/app/domain/models/users.py index 3558db0..ec5a0b4 100644 --- a/API/app/domain/models/users.py +++ b/API/app/domain/models/users.py @@ -1,4 +1,5 @@ from sqlalchemy import Column, VARCHAR, ForeignKey, Integer +from sqlalchemy.orm import relationship from app.domain.models.base import AdvancedBaseModel @@ -10,3 +11,5 @@ class User(AdvancedBaseModel): password = Column(VARCHAR(150), nullable=False) profile_id = Column(Integer, ForeignKey('profiles.id'), nullable=False) + + profile = relationship('Profile', back_populates='user') diff --git a/API/app/settings.py b/API/app/settings.py index e69de29..0929eab 100644 --- a/API/app/settings.py +++ b/API/app/settings.py @@ -0,0 +1,24 @@ +from pydantic_settings import BaseSettings + + +class Settings(BaseSettings): + DATABASE_URL: str + LOG_LEVEL: str + LOG_FILE: str + SECRET_KEY: str + ALGORITHM: str + APP_PREFIX: str + + class Config: + env_file = '.env' + env_file_encoding = 'utf-8' + + +settings = Settings() + + +def det_auth_data(): + return { + 'secret_key': settings.SECRET_KEY, + 'algorithm': settings.ALGORITHM + }