init commit

services/bot/Dockerfile

@@ -0,0 +1,11 @@
+ARG PY_VERSION=3.12
+FROM python:${PY_VERSION}-slim
+ENV PYTHONDONTWRITEBYTECODE=1 PYTHONUNBUFFERED=1
+WORKDIR /app
+RUN apt-get update && apt-get install -y --no-install-recommends tzdata \
+    && rm -rf /var/lib/apt/lists/*
+COPY requirements.txt .
+RUN pip install --no-cache-dir -r requirements.txt
+COPY . .
+RUN chmod +x entrypoint.sh
+CMD ["./entrypoint.sh"]

services/bot/alembic.ini

@@ -0,0 +1,3 @@
+[alembic]
+script_location = alembic
+sqlalchemy.url = ${DATABASE_URL}

services/bot/alembic/env.py

@@ -0,0 +1,39 @@
+from __future__ import annotations
+import os
+from logging.config import fileConfig
+from sqlalchemy import engine_from_config, pool
+from alembic import context
+
+config = context.config
+# Подменяем URL из переменных окружения контейнера
+if os.getenv("DATABASE_URL"):
+    config.set_main_option("sqlalchemy.url", os.getenv("DATABASE_URL"))
+
+fileConfig(config.config_file_name)
+
+# Метаданные моделей
+from app.models.base import Base  # noqa: E402
+target_metadata = Base.metadata
+
+def run_migrations_offline():
+    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():
+    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()

services/bot/alembic/versions/0001_init.py

@@ -0,0 +1,59 @@
+from alembic import op
+import sqlalchemy as sa
+
+revision = '0001_init'
+down_revision = None
+branch_labels = None
+depends_on = None
+
+def upgrade():
+    op.create_table(
+        'admins',
+        sa.Column('id', sa.Integer(), primary_key=True, autoincrement=True),
+        sa.Column('telegram_id', sa.Integer(), unique=True, index=True),
+        sa.Column('full_name', sa.String(length=120), nullable=True),
+        sa.Column('created_at', sa.DateTime(), nullable=False, server_default=sa.text('CURRENT_TIMESTAMP')),
+    )
+
+    op.create_table(
+        'candidates',
+        sa.Column('id', sa.Integer(), primary_key=True, autoincrement=True),
+        sa.Column('telegram_id', sa.Integer(), unique=True, index=True),
+        sa.Column('username', sa.String(length=100), nullable=True),
+        sa.Column('full_name', sa.String(length=120), nullable=True),
+        sa.Column('gender', sa.String(length=20), nullable=True),
+        sa.Column('birth_date', sa.Date(), nullable=True),
+        sa.Column('height_cm', sa.Float(), nullable=True),
+        sa.Column('weight_kg', sa.Float(), nullable=True),
+        sa.Column('country', sa.String(length=80), nullable=True),
+        sa.Column('city', sa.String(length=120), nullable=True),
+        sa.Column('citizenship', sa.String(length=80), nullable=True),
+        sa.Column('visa_status', sa.String(length=60), nullable=True),
+        sa.Column('languages', sa.String(length=200), nullable=True),
+        sa.Column('education', sa.String(length=120), nullable=True),
+        sa.Column('occupation', sa.String(length=120), nullable=True),
+        sa.Column('income_range', sa.String(length=60), nullable=True),
+        sa.Column('religion', sa.String(length=80), nullable=True),
+        sa.Column('marital_status', sa.String(length=60), nullable=True),
+        sa.Column('has_children', sa.Boolean(), nullable=True),
+        sa.Column('children_notes', sa.String(length=200), nullable=True),
+        sa.Column('smoking', sa.String(length=20), nullable=True),
+        sa.Column('alcohol', sa.String(length=20), nullable=True),
+        sa.Column('health_notes', sa.String(length=300), nullable=True),
+        sa.Column('hobbies_tags', sa.String(length=300), nullable=True),
+        sa.Column('hobbies_free', sa.Text(), nullable=True),
+        sa.Column('goal', sa.String(length=120), nullable=True),
+        sa.Column('partner_prefs', sa.Text(), nullable=True),
+        sa.Column('avatar_file_id', sa.String(length=200), nullable=True),
+        sa.Column('gallery_file_ids', sa.Text(), nullable=True),
+        sa.Column('consent_personal', sa.Boolean(), nullable=False, server_default=sa.text('0')),
+        sa.Column('consent_policy', sa.Boolean(), nullable=False, server_default=sa.text('0')),
+        sa.Column('is_verified', sa.Boolean(), nullable=False, server_default=sa.text('0')),
+        sa.Column('is_active', sa.Boolean(), nullable=False, server_default=sa.text('1')),
+        sa.Column('created_at', sa.DateTime(), nullable=False, server_default=sa.text('CURRENT_TIMESTAMP')),
+        sa.Column('updated_at', sa.DateTime(), nullable=False, server_default=sa.text('CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP')),
+    )
+
+def downgrade():
+    op.drop_table('candidates')
+    op.drop_table('admins')

services/bot/app/core/config.py

@@ -0,0 +1,5 @@
+import os
+class Settings:
+    BOT_TOKEN = os.getenv("BOT_TOKEN", "")
+    DATABASE_URL = os.getenv("DATABASE_URL", "")
+settings = Settings()

services/bot/app/main.py

@@ -0,0 +1,14 @@
+import asyncio
+from telegram.ext import Application, CommandHandler
+from app.core.config import settings
+async def start(update, context):
+    await update.message.reply_text("Привет! Бот запущен.")
+async def main():
+    app = Application.builder().token(settings.BOT_TOKEN).build()
+    app.add_handler(CommandHandler("start", start))
+    await app.initialize()
+    await app.start()
+    await app.updater.start_polling()
+    await app.updater.wait_until_closed()
+if __name__ == "__main__":
+    asyncio.run(main())

services/bot/entrypoint.sh

@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+set -euo pipefail
+if [ -f "/app/.env" ]; then
+  set -a; source /app/.env; set +a
+fi
+echo "Waiting for DB..."
+python - <<'PY'
+import os, time, pymysql
+url = os.environ["DATABASE_URL"]
+u = url.split("://",1)[1].split("@",1)
+auth, host_db = u[0], u[1]
+host, port_db = host_db.split("/",1)[0], host_db.split("/",1)[1]
+host, port = host.split(":")[0], int(host.split(":")[1] or 3306)
+user, password = auth.split(":")[0], ":".join(auth.split(":")[1:])
+db = port_db.split("?")[0]
+for i in range(60):
+    try:
+        conn = pymysql.connect(host=host, port=port, user=user, password=password, database=db)
+        conn.close()
+        break
+    except Exception as e:
+        print("Waiting DB...", e)
+        time.sleep(2)
+PY
+alembic upgrade head
+exec python -m app.main

services/bot/requirements.txt

@@ -0,0 +1,7 @@
+python-telegram-bot==21.6
+SQLAlchemy==2.0.30
+alembic==1.13.2
+pymysql==1.1.1
+python-dotenv==1.0.1
+tenacity==9.0.0
+ruff==0.5.7