feat(app): refactor to app-factory; add application package and routes

This commit is contained in:
Albert
2025-12-21 22:22:07 +01:00
parent 86be10af8c
commit 15c629a5e7
5 changed files with 167 additions and 138 deletions

43
application/__init__.py Normal file
View File

@@ -0,0 +1,43 @@
import os
from flask import Flask
from .extensions import db, migrate
import logging
from logging.handlers import RotatingFileHandler
def create_app(config=None):
BASE_DIR = os.path.dirname(os.path.abspath(__file__))
# point templates/static to repository-level folders for compatibility
project_root = os.path.dirname(BASE_DIR)
app = Flask(__name__, template_folder=os.path.join(project_root, 'templates'), static_folder=os.path.join(project_root, 'static'), instance_relative_config=True)
# default config
DB_PATH = os.path.join(os.path.dirname(BASE_DIR), 'anmeldung.db')
app.config.setdefault('SQLALCHEMY_DATABASE_URI', f'sqlite:///{DB_PATH}')
app.config.setdefault('SQLALCHEMY_TRACK_MODIFICATIONS', False)
if config:
app.config.update(config)
# init extensions
db.init_app(app)
migrate.init_app(app, db)
# logging setup (mirror previous behavior)
LOG_DIR = os.path.join(os.path.dirname(BASE_DIR), 'logs')
os.makedirs(LOG_DIR, exist_ok=True)
log_file = os.path.join(LOG_DIR, 'app.log')
handler = RotatingFileHandler(log_file, maxBytes=5 * 1024 * 1024, backupCount=3)
formatter = logging.Formatter('%(asctime)s %(levelname)s %(name)s: %(message)s')
handler.setFormatter(formatter)
handler.setLevel(logging.INFO)
app.logger.addHandler(handler)
app.logger.setLevel(logging.INFO)
# register blueprints
from .routes import bp as public_bp
app.register_blueprint(public_bp)
# expose BASE_DIR on app for compatibility
app.BASE_DIR = os.path.dirname(BASE_DIR)
return app

View File

@@ -0,0 +1,5 @@
from flask_sqlalchemy import SQLAlchemy
from flask_migrate import Migrate
db = SQLAlchemy()
migrate = Migrate()

27
application/models.py Normal file
View File

@@ -0,0 +1,27 @@
from .extensions import db
class Adresse(db.Model):
id = db.Column(db.Integer, primary_key=True)
vorname = db.Column(db.String(100), nullable=False)
nachname = db.Column(db.String(100), nullable=False)
strasse = db.Column(db.String(200), nullable=False)
hausnummer = db.Column(db.String(50), nullable=True)
plz = db.Column(db.String(20), nullable=False)
ort = db.Column(db.String(100), nullable=False)
land = db.Column(db.String(50), default='Deutschland')
telefon_vorwahl = db.Column(db.String(20))
telefon_nummer = db.Column(db.String(50))
email = db.Column(db.String(200))
class Frage(db.Model):
id = db.Column(db.Integer, primary_key=True)
text = db.Column(db.String(500), nullable=False)
class Antwort(db.Model):
id = db.Column(db.Integer, primary_key=True)
adresse_id = db.Column(db.Integer, db.ForeignKey('adresse.id'), nullable=False)
frage_id = db.Column(db.Integer, db.ForeignKey('frage.id'), nullable=False)
text = db.Column(db.String(1000), nullable=True)

77
application/routes.py Normal file
View File

@@ -0,0 +1,77 @@
from flask import Blueprint, render_template, request, redirect, url_for, current_app
from .extensions import db
from .models import Adresse, Frage, Antwort
from utils import generate_vcard
import re
bp = Blueprint('public', __name__)
@bp.route('/', methods=['GET', 'POST'])
def index():
if request.method == 'POST':
vorname = request.form.get('vorname', '').strip()
nachname = request.form.get('nachname', '').strip()
strasse = request.form.get('strasse', '').strip()
hausnummer = request.form.get('hausnummer', '').strip()
plz = request.form.get('plz', '').strip()
ort = request.form.get('ort', '').strip()
land = request.form.get('land', 'Deutschland').strip()
telefon_vorwahl = request.form.get('telefon_vorwahl', '').strip()
telefon_nummer = request.form.get('telefon_nummer', '').strip()
email = request.form.get('email', '').strip()
errors = {}
email_re = re.compile(r"[^@]+@[^@]+\.[^@]+")
if email:
if not email_re.match(email):
errors['email'] = 'Ungültige E-Mail-Adresse'
if plz:
if not re.fullmatch(r"\d{5}", plz):
errors['plz'] = 'Postleitzahl muss genau 5 Ziffern haben'
if errors:
fragen = Frage.query.all()
form = request.form.to_dict()
return render_template('index.html', fragen=fragen, errors=errors, form=form)
adresse = Adresse(
vorname=vorname,
nachname=nachname,
strasse=strasse,
hausnummer=hausnummer,
plz=plz,
ort=ort,
land=land,
telefon_vorwahl=telefon_vorwahl,
telefon_nummer=telefon_nummer,
email=email,
)
db.session.add(adresse)
db.session.commit()
fragen = Frage.query.all()
for frage in fragen:
key = f'frage_{frage.id}'
antwort_text = request.form.get(key, '').strip()
antwort = Antwort(adresse_id=adresse.id, frage_id=frage.id, text=antwort_text)
db.session.add(antwort)
db.session.commit()
try:
base_dir = current_app.config.get('BASE_DIR') if current_app.config.get('BASE_DIR') else getattr(current_app, 'BASE_DIR', '.')
generate_vcard(adresse, base_dir)
except Exception as e:
current_app.logger.exception('Fehler beim Erzeugen der vCard for adresse id=%s: %s', adresse.id if hasattr(adresse, 'id') else 'unknown', e)
return redirect(url_for('public.danke', id=adresse.id))
fragen = Frage.query.all()
return render_template('index.html', fragen=fragen)
@bp.route('/danke')
def danke():
id = request.args.get('id')
adresse = db.session.get(Adresse, int(id)) if id else None
return render_template('danke.html', adresse=adresse)