Structural refactoring

Dockerfile

@@ -29,7 +29,8 @@ RUN apt-get update && \
     libfribidi0 \
     libharfbuzz0b \
     libpng16-16 \
-    libjpeg62-turbo && \
+    libjpeg62-turbo \
+    sqlite3 && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
@@ -43,15 +44,28 @@ RUN fc-cache -fv
 
 WORKDIR /app
 
-# Copy application source, config, and fonts
+# Copy application source, config, migrations, and fonts
 COPY app/ ./app/
 COPY fonts/ ./fonts/
+COPY alembic/ ./alembic/
+COPY alembic.ini ./
+COPY entrypoint.sh ./
+RUN chmod +x entrypoint.sh
 COPY pyproject.toml run_fastapi.py ./
 
+# entrypoint.sh handles:
+# 1. DB directory creation
+# 2. Alembic stamp for existing DBs without migration tracking
+# 3. Alembic upgrade head (run migrations)
+# 4. Start uvicorn
+
 ENV PYTHONPATH=/app \
     DB_PATH=/app/data/churchtools.db
 
 EXPOSE 5005
 VOLUME /app/data
 
-CMD ["uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "5005"]
+HEALTHCHECK --interval=30s --timeout=5s --start-period=10s --retries=3 \
+    CMD python -c "import urllib.request; urllib.request.urlopen('http://localhost:5005/health')" || exit 1
+
+ENTRYPOINT ["./entrypoint.sh"]

Makefile

@@ -1,8 +1,10 @@
-.PHONY: run test lint format build push preview
+.PHONY: run run-docker test lint format build push
 
 PYTHON := venv/bin/python
 
 run:
+	CHURCHTOOLS_BASE=$${CHURCHTOOLS_BASE:-$$(grep -s CHURCHTOOLS_BASE .env | cut -d= -f2)} \
+	$(PYTHON) -m alembic upgrade head && \
 	$(PYTHON) -m uvicorn app.main:app --reload --host 0.0.0.0 --port 5005
 
 test:
@@ -14,11 +16,15 @@ lint:
 format:
 	$(PYTHON) -m ruff check --fix . && $(PYTHON) -m ruff format .
 
+run-docker:
+	podman run --rm -p 5005:5005 -v ./data:/app/data \
+		-e CHURCHTOOLS_BASE=$${CHURCHTOOLS_BASE:-$$(grep -s CHURCHTOOLS_BASE .env | cut -d= -f2)} \
+		-e DB_PATH=/app/data/churchtools.db \
+		churchtools-local
+
 build:
 	podman build -t churchtools-local .
 
 push:
 	./build-and-push-docker-image.sh
 
-preview:
-	$(PYTHON) scripts/preview_pdf.py && open app/saved_files/*_Termine.pdf

README.md

@@ -49,6 +49,8 @@ make run
 |---|---|---|---|
 | `CHURCHTOOLS_BASE` | Yes | — | Your ChurchTools domain (e.g. `my-church.church.tools`) |
 | `DB_PATH` | No | `churchtools.db` | Path to the SQLite database file |
+| `TIMEZONE` | No | `Europe/Berlin` | Timezone for date display (any valid IANA timezone) |
+| `LOG_FORMAT` | No | `console` | Log output format: `console` (human-readable) or `json` |
 
 ## Deployment
 
@@ -99,7 +101,7 @@ Releases are managed via GitHub Actions:
 
 | Command | Description |
 |---|---|
-| `make run` | Start dev server with auto-reload |
+| `make run` | Run migrations and start dev server with auto-reload |
 | `make test` | Run test suite |
 | `make lint` | Check code style (ruff) |
 | `make format` | Auto-fix code style |

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 <script_location>/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 =
+
+
+[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

alembic/README

@@ -0,0 +1 @@
+Generic single-database configuration.

alembic/env.py

@@ -0,0 +1,41 @@
+from logging.config import fileConfig
+
+from sqlalchemy import engine_from_config, pool
+
+import app.models  # noqa: F401 — register models with Base.metadata
+from alembic import context
+from app.config import settings
+from app.database import Base
+
+config = context.config
+config.set_main_option("sqlalchemy.url", f"sqlite:///{settings.db_path}")
+
+if config.config_file_name is not None:
+    fileConfig(config.config_file_name)
+
+target_metadata = Base.metadata
+
+
+def run_migrations_offline() -> None:
+    url = config.get_main_option("sqlalchemy.url")
+    context.configure(url=url, target_metadata=target_metadata, literal_binds=True)
+    with context.begin_transaction():
+        context.run_migrations()
+
+
+def run_migrations_online() -> None:
+    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()

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"}

alembic/versions/001_initial_schema.py

@@ -0,0 +1,58 @@
+"""initial schema
+
+Revision ID: 001
+Revises:
+Create Date: 2026-03-15
+"""
+
+import sqlalchemy as sa
+
+from alembic import op
+
+revision = "001"
+down_revision = None
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    op.create_table(
+        "appointments",
+        sa.Column("id", sa.String(), nullable=False),
+        sa.Column("additional_info", sa.Text(), nullable=True),
+        sa.PrimaryKeyConstraint("id"),
+        if_not_exists=True,
+    )
+    op.create_table(
+        "color_settings",
+        sa.Column("setting_name", sa.String(), nullable=False),
+        sa.Column("background_color", sa.String(), nullable=False),
+        sa.Column("background_alpha", sa.Integer(), nullable=False),
+        sa.Column("date_color", sa.String(), nullable=False),
+        sa.Column("description_color", sa.String(), nullable=False),
+        sa.PrimaryKeyConstraint("setting_name"),
+        if_not_exists=True,
+    )
+    op.create_table(
+        "logo_settings",
+        sa.Column("setting_name", sa.String(), nullable=False),
+        sa.Column("logo_data", sa.LargeBinary(), nullable=True),
+        sa.Column("logo_filename", sa.String(), nullable=True),
+        sa.PrimaryKeyConstraint("setting_name"),
+        if_not_exists=True,
+    )
+    op.create_table(
+        "background_image_settings",
+        sa.Column("setting_name", sa.String(), nullable=False),
+        sa.Column("image_data", sa.LargeBinary(), nullable=True),
+        sa.Column("image_filename", sa.String(), nullable=True),
+        sa.PrimaryKeyConstraint("setting_name"),
+        if_not_exists=True,
+    )
+
+
+def downgrade() -> None:
+    op.drop_table("background_image_settings")
+    op.drop_table("logo_settings")
+    op.drop_table("color_settings")
+    op.drop_table("appointments")