From 1f50e8bf7b02198674ef294733c9aab6ce9ce83b Mon Sep 17 00:00:00 2001 From: Schubert Ferenc Date: Wed, 1 Jul 2026 21:24:20 +0200 Subject: [PATCH] feat: add first database migration --- backend/hermes/.env | 5 +- backend/hermes/alembic.ini | 149 ++++++++++++++++++ backend/hermes/alembic/README | 1 + .../alembic/__pycache__/env.cpython-314.pyc | Bin 0 -> 3127 bytes backend/hermes/alembic/env.py | 75 +++++++++ backend/hermes/alembic/script.py.mako | 28 ++++ .../db/__pycache__/database.cpython-314.pyc | Bin 1045 -> 1101 bytes backend/hermes/app/db/database.py | 3 +- backend/hermes/app/models/user.py | 26 +++ backend/hermes/docker-compose.yml | 37 +++-- 10 files changed, 311 insertions(+), 13 deletions(-) create mode 100644 backend/hermes/alembic.ini create mode 100644 backend/hermes/alembic/README create mode 100644 backend/hermes/alembic/__pycache__/env.cpython-314.pyc create mode 100644 backend/hermes/alembic/env.py create mode 100644 backend/hermes/alembic/script.py.mako create mode 100644 backend/hermes/app/models/user.py diff --git a/backend/hermes/.env b/backend/hermes/.env index c43a93a..f1b905d 100644 --- a/backend/hermes/.env +++ b/backend/hermes/.env @@ -1,5 +1,4 @@ -DATABASE_URL=postgresql+psycopg://olympus:FsFs03285310!!!@olympus-db:5432/olympus +DATABASE_URL=postgresql+psycopg://olympus:olympus123@postgres:5432/olympus APP_NAME=Hermes API - -APP_VERSION=0.1.0 +APP_VERSION=0.1.0 \ No newline at end of file diff --git a/backend/hermes/alembic.ini b/backend/hermes/alembic.ini new file mode 100644 index 0000000..807ded2 --- /dev/null +++ b/backend/hermes/alembic.ini @@ -0,0 +1,149 @@ +# A generic, single database configuration. + +[alembic] +# path to migration scripts. +# this is typically a path given in POSIX (e.g. forward slashes) +# format, relative to the token %(here)s which refers to the location of this +# ini file +script_location = %(here)s/alembic + +# 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 +# Or organize into date-based subdirectories (requires recursive_version_locations = true) +# file_template = %%(year)d/%%(month).2d/%%(day).2d_%%(hour).2d%%(minute).2d_%%(second).2d_%%(rev)s_%%(slug)s + +# sys.path path, will be prepended to sys.path if present. +# defaults to the current working directory. for multiple paths, the path separator +# is defined by "path_separator" below. +prepend_sys_path = . + + +# timezone to use when rendering the date within the migration file +# as well as the filename. +# If specified, requires the tzdata library which can be 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 /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 "path_separator" +# below. +# version_locations = %(here)s/bar:%(here)s/bat:%(here)s/alembic/versions + +# path_separator; This indicates what character is used to split lists of file +# paths, including version_locations and prepend_sys_path within configparser +# files such as alembic.ini. +# The default rendered in new alembic.ini files is "os", which uses os.pathsep +# to provide os-dependent path splitting. +# +# Note that in order to support legacy alembic.ini files, this default does NOT +# take place if path_separator is not present in alembic.ini. If this +# option is omitted entirely, fallback logic is as follows: +# +# 1. Parsing of the version_locations option falls back to using the legacy +# "version_path_separator" key, which if absent then falls back to the legacy +# behavior of splitting on spaces and/or commas. +# 2. Parsing of the prepend_sys_path option falls back to the legacy +# behavior of splitting on spaces, commas, or colons. +# +# Valid values for path_separator are: +# +# path_separator = : +# path_separator = ; +# path_separator = space +# path_separator = newline +# +# Use os.pathsep. Default configuration used for new projects. +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 + +# database URL. This is consumed by the user-maintained env.py script only. +# other means of configuring database URLs may be customized within the env.py +# file. +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 module runner, against the "ruff" module +# hooks = ruff +# ruff.type = module +# ruff.module = ruff +# ruff.options = check --fix REVISION_SCRIPT_FILENAME + +# Alternatively, use the exec runner to execute a binary found on your PATH +# hooks = ruff +# ruff.type = exec +# ruff.executable = ruff +# ruff.options = check --fix REVISION_SCRIPT_FILENAME + +# Logging configuration. This is also consumed by the user-maintained +# env.py script only. +[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/backend/hermes/alembic/README b/backend/hermes/alembic/README new file mode 100644 index 0000000..98e4f9c --- /dev/null +++ b/backend/hermes/alembic/README @@ -0,0 +1 @@ +Generic single-database configuration. \ No newline at end of file diff --git a/backend/hermes/alembic/__pycache__/env.cpython-314.pyc b/backend/hermes/alembic/__pycache__/env.cpython-314.pyc new file mode 100644 index 0000000000000000000000000000000000000000..849b5dc07785fb492f2f1c4f5835b02724e0cd57 GIT binary patch literal 3127 zcmbVO&2QUA79Wa~Oj2L|sO3aaWZH4;C{3+y>o%Kak)rk%Yhw#nCE7jNl54(pwS4&CGjmes7*Fcabivp;dtj(~M57rB+2M za#{phq7tX2we)I+W;mT*8(Ed9%<0UUvZ_*b8f|78rFe;?rPlQoi@W_an zPK5s%xrn2V^W`K zn+-45-|;c=>%O(!YhpsTFu|@>f799NbbEfiXEKS&w(8iuy4c+b zbB1BMu18IZ4TFq{tjk;SUGK*X|xNQVX3%r4r9`KZB; z_gK+|*ymleA;p7@OiU&1447m?j{AB_7j>yF=;@0?sp+Hg{Qksqqc-vHWx)`7sh(&& zijHHlx#M!Im&ii2WZ1VfJPYfeK^l4%#Szv9=TwlLnntG~j@id%Toz9wTd0kg=fNm? z&(%71o0!!0Twk+YZNb~xav-V}w2s%pi>mtew(V$SHNjt1IH%fel1HXW>j2>FY7U$>RZI_QqAkpZjXX8qJZ_^4%Mzn%#KfY z92}-yvx8eTDHP!fg+*$THl{`gQ?q4KGt4_S#l&=srtP-;FxRpnye(>YUFxsbM#4;F z)Ue2s?woJ_I)SQEo#Hz+Y(-?Z4gut0jQk$A5r5C)w5;%Q`*36+k| zFowP*(=f=d(w~9YMfXmi>{y^`eO0?P^P8{L7j{<;q--Ef4y4KbT=C$%fL&K@BND1qUrc6Cn&gD8~j~y}$-yfS3@@{*0jd7v&8Zhd~Sej|%fC zTp#K1zY#z{9hHq?`ar0Wj(JIYWb`TUP)Bj{(S-yi8czWNJ#`UQXQc~}(#S{j(K=2V zPXa|(*kHEcrNNy2SOJg{HrRoA(Z!3y69K>^a?ix$Nt*!7lWQK6eM*u}WC3a<_8kGI zC;GnxR&SIesQLv+lO91@`hyRjhG*_EI9qe!dIJXe7IsZydw@I=ya)jj# z!tP_3Wmw=xON8SQ1Q@n!$2`KKF_hPPj?)08Jjt^iam*krUvs78G^5zF1y;-sS7fM2 z=78t3P|$`DG5I(|aC4FKFooZxe*ggpQ9u)C59C51m-}-0-!BKJminibK5u?4U)nEL z4#rFWeD3eh-5Zf6GP{4gn?vekpj7%wB~Yq+O7+Hhjt(aW^2z7rj(#db7Q+$j6 E1LPZ@!2kdN literal 0 HcmV?d00001 diff --git a/backend/hermes/alembic/env.py b/backend/hermes/alembic/env.py new file mode 100644 index 0000000..c2a80b8 --- /dev/null +++ b/backend/hermes/alembic/env.py @@ -0,0 +1,75 @@ +from logging.config import fileConfig + +from sqlalchemy import engine_from_config +from sqlalchemy import pool + +from alembic import context + +from app.core.config import settings +from app.db.database import Base + +config = context.config + +config.set_main_option("sqlalchemy.url", settings.database_url) + +if config.config_file_name is not None: + fileConfig(config.config_file_name) + +target_metadata = Base.metadata + +# other values from the config, defined by the needs of env.py, +# can be acquired: +# my_important_option = config.get_main_option("my_important_option") +# ... etc. + + +def run_migrations_offline() -> None: + """Run migrations in 'offline' mode. + + This configures the context with just a URL + and not an Engine, though an Engine is acceptable + here as well. By skipping the Engine creation + we don't even need a DBAPI to be available. + + Calls to context.execute() here emit the given string to the + script output. + + """ + 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() + + +def run_migrations_online() -> None: + """Run migrations in 'online' mode. + + In this scenario we need to create an Engine + and associate a connection with the context. + + """ + connectable = engine_from_config( + config.get_section(config.config_ini_section, {}), + prefix="sqlalchemy.", + poolclass=pool.NullPool, + ) + + with connectable.connect() as connection: + context.configure( + connection=connection, target_metadata=target_metadata + ) + + with context.begin_transaction(): + context.run_migrations() + + +if context.is_offline_mode(): + run_migrations_offline() +else: + run_migrations_online() diff --git a/backend/hermes/alembic/script.py.mako b/backend/hermes/alembic/script.py.mako new file mode 100644 index 0000000..1101630 --- /dev/null +++ b/backend/hermes/alembic/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, Sequence[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/backend/hermes/app/db/__pycache__/database.cpython-314.pyc b/backend/hermes/app/db/__pycache__/database.cpython-314.pyc index 0d3d656df79ff23c1b2d54cc3242ec7d1223431f..f12fffcc2b9b25127078579782ced7eb85decbbe 100644 GIT binary patch delta 259 zcmbQrah8Kun~#@^0SMevU9+BVh#lOzQq%qT3no&pXZaGoS1WqH9050IQ15PVnKmkZhlH?PO)BT zacYq!(=Dcyq+85D;bM?R1%)CJAa#o^J+&l0C8)Joz|6qO4dLG5ko!|C4%F7f?a0X3$D+Y7NeswX lA!f(CkJ*uNvH^1%qx9tI%(9G%leaQQaIi7T7YPHE0|28HLAU?_ delta 208 zcmX@hF_nW?n~#@^0SNdKU9(PXfW%9N28KJFqTO;0P9K<eKGV%Zb diff --git a/backend/hermes/app/db/database.py b/backend/hermes/app/db/database.py index a747234..60e12ae 100644 --- a/backend/hermes/app/db/database.py +++ b/backend/hermes/app/db/database.py @@ -26,4 +26,5 @@ def get_db(): try: yield db finally: - db.close() \ No newline at end of file + db.close() + import app.models.user \ No newline at end of file diff --git a/backend/hermes/app/models/user.py b/backend/hermes/app/models/user.py new file mode 100644 index 0000000..fc393e9 --- /dev/null +++ b/backend/hermes/app/models/user.py @@ -0,0 +1,26 @@ +from sqlalchemy import String +from sqlalchemy.orm import Mapped +from sqlalchemy.orm import mapped_column + +from app.db.database import Base + + +class User(Base): + __tablename__ = "users" + + id: Mapped[int] = mapped_column(primary_key=True) + + username: Mapped[str] = mapped_column( + String(50), + unique=True, + index=True + ) + + email: Mapped[str] = mapped_column( + String(255), + unique=True + ) + + password_hash: Mapped[str] = mapped_column( + String(255) + ) \ No newline at end of file diff --git a/backend/hermes/docker-compose.yml b/backend/hermes/docker-compose.yml index 1086a80..81e1a84 100644 --- a/backend/hermes/docker-compose.yml +++ b/backend/hermes/docker-compose.yml @@ -1,5 +1,23 @@ services: + postgres: + image: postgres:17 + + container_name: hermes-postgres + + restart: unless-stopped + + environment: + POSTGRES_DB: olympus + POSTGRES_USER: olympus + POSTGRES_PASSWORD: olympus123 + + ports: + - "5432:5432" + + volumes: + - postgres_data:/var/lib/postgresql/data + hermes: build: . @@ -7,15 +25,16 @@ services: restart: unless-stopped + depends_on: + - postgres + + environment: + DATABASE_URL: postgresql+psycopg://olympus:olympus123@postgres:5432/olympus + APP_NAME: Hermes API + APP_VERSION: 0.1.0 + ports: - "8000:8000" - environment: - DATABASE_URL: postgresql://olympus:DEIN_PASSWORT@olympus-db:5432/olympus - - networks: - - olympus-network - -networks: - olympus-network: - external: true +volumes: + postgres_data: \ No newline at end of file