implementierung der ersten schritte eine komplett-suite

- Added controllers for handling friendly match invitations and shared matches.
- Created migration scripts for `friendly_match_invitation` and `friendly_match_shared` tables.
- Developed models for `FriendlyMatchInvitation` and `FriendlyMatchShared`.
- Established routes for managing invitations and shared matches.
- Implemented services for business logic related to invitations and shared matches.
- Documented the concept plan for the new feature including API endpoints and data models.

.gitea/workflows/deploy.yml

@@ -0,0 +1,53 @@
+name: Deploy tt-tagebuch
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+
+    env:
+      SSH_HOST: ${{ vars.PROD_HOST }}
+      SSH_PORT: ${{ vars.PROD_PORT }}
+      SSH_USER: ${{ vars.PROD_USER }}
+
+    steps:
+      - name: Show resolved non-secret config
+        run: |
+          echo "SSH_HOST=$SSH_HOST"
+          echo "SSH_PORT=$SSH_PORT"
+          echo "SSH_USER=$SSH_USER"
+
+      - name: Prepare SSH
+        run: |
+          set -e
+          mkdir -p ~/.ssh
+          printf '%s' "${{ secrets.PROD_SSH_KEY_B64 }}" | base64 -d > ~/.ssh/id_deploy
+          chmod 600 ~/.ssh/id_deploy
+          ssh-keygen -l -f ~/.ssh/id_deploy
+          ssh-keyscan -p "$SSH_PORT" "$SSH_HOST" >> ~/.ssh/known_hosts
+
+      - name: Test SSH connection
+        run: |
+          set -e
+          ssh -i ~/.ssh/id_deploy \
+            -o StrictHostKeyChecking=no \
+            -o BatchMode=yes \
+            -o ConnectTimeout=10 \
+            -p "$SSH_PORT" \
+            "$SSH_USER@$SSH_HOST" \
+            "echo SSH OK"
+
+      - name: Run deployment script
+        run: |
+          set -e
+          ssh -i ~/.ssh/id_deploy \
+            -o StrictHostKeyChecking=no \
+            -o BatchMode=yes \
+            -o ConnectTimeout=10 \
+            -p "$SSH_PORT" \
+            "$SSH_USER@$SSH_HOST" \
+            "/usr/local/bin/actualize-tagebuch.sh"

.gitignore

@@ -7,4 +7,14 @@ backend/.env
 
 backend/images/*
 backend/backend-debug.log
-backend/*.log
+backend/*.log
+backend/.env.local
+
+mobile-app/.gradle/
+mobile-app/.idea/
+mobile-app/.kotlin/
+mobile-app/build/
+mobile-app/composeApp/build/
+mobile-app/shared/build/
+mobile-app/local.properties
+mobile-app/signing.properties

backend/CLICKTT_HTTV_README.md

@@ -0,0 +1,122 @@
+# HTTV / click-TT HTTP-Seiten – Integration & Logging
+
+Dieses Modul ermöglicht das Testen und Logging von HTTP-Aufrufen an die click-TT-Seiten verschiedener Tischtennis-Verbände (HTTV, RTTV, WTTV etc.).
+
+## Zweck
+
+- **Logging**: Jeder Aufruf wird in `http_page_fetch_log` protokolliert (URL, HTTP-Status, Response-Snippet, Fehler).
+- **Strukturanalyse**: Die Logs helfen zu verstehen, wie die Seiten je nach Verband und Saison aufgebaut sind.
+- **URL-Varianten**: Links können je nach Verein, Saison und Verband unterschiedlich sein.
+
+## Verband → Domain
+
+| Verband | Domain |
+|---------|--------|
+| HeTTV / HTTV | httv.click-tt.de |
+| RTTV | rttv.click-tt.de |
+| WTTV | wttv.click-tt.de |
+| TTVNw | ttvnw.click-tt.de |
+| BTTV | battv.click-tt.de |
+
+## URL-Struktur (httv.click-tt.de)
+
+### leaguePage – Ligenübersicht
+
+```
+https://httv.click-tt.de/cgi-bin/WebObjects/nuLigaTTDE.woa/wa/leaguePage?championship=HTTV+25%2F26
+```
+
+- `championship`: Saison/Championship, z.B.:
+  - `HTTV 25/26` – Haupt-HTTV-Saison
+  - `K43 25/26` – Bezirk Frankfurt
+  - `K16 25/26` – Bezirk Werra-Meißner
+  - `RL-OL West 25/26` – Regional-/Oberligen West
+
+### regionMeetingFilter – Regionsspielplan
+
+```
+https://httv.click-tt.de/cgi-bin/WebObjects/nuLigaTTDE.woa/wa/regionMeetingFilter?championship=HTTV+25%2F26
+```
+
+### clubInfoDisplay – Vereinsinfo
+
+```
+https://httv.click-tt.de/cgi-bin/WebObjects/nuLigaTTDE.woa/wa/clubInfoDisplay?club=1060
+```
+
+- `club`: Vereins-ID in der click-TT-Datenbank
+
+## UI-Seite
+
+Unter **/clicktt** (nur für Admins) gibt es eine Vue-Seite, mit der du:
+
+- Seitentyp wählen (Ligenübersicht, Vereinsinfo, Regionsspielplan oder direkte URL)
+- Verband, Championship/Saison und ggf. Vereins-ID eingeben
+- Die Seite im iframe laden und direkt bedienen (klicken, navigieren)
+
+Alle Aufrufe werden in `http_page_fetch_log` protokolliert.
+
+## API-Endpunkte
+
+Die meisten Endpunkte erfordern Authentifizierung (Token). Der **Proxy** (`/api/clicktt/proxy`) ist ohne Auth nutzbar (für iframe-Einbettung).
+
+### Ligenübersicht abrufen
+
+```
+GET /api/clicktt/league-page?association=HeTTV&championship=HTTV+25%2F26
+```
+
+### Vereinsinfo abrufen
+
+```
+GET /api/clicktt/club-info?association=HeTTV&clubId=1060
+```
+
+### Regionsspielplan abrufen
+
+```
+GET /api/clicktt/region-meetings?association=HeTTV&championship=HTTV+25%2F26
+```
+
+### Beliebige URL abrufen (nur click-tt.de / httv.de)
+
+```
+GET /api/clicktt/fetch?url=https%3A%2F%2Fhttv.click-tt.de%2Fcgi-bin%2F...
+```
+
+### Logs abrufen
+
+```
+GET /api/clicktt/logs?limit=50&fetchType=leaguePage&association=HeTTV
+```
+
+### URL-Info (Beispiele, Verband→Domain)
+
+```
+GET /api/clicktt/url-info
+```
+
+## Konfiguration (.env)
+
+Für das Link-Rewriting (Folge-Klicks im iframe) wird die Backend-URL benötigt:
+
+- **BACKEND_BASE_URL** – URL, unter der die API erreichbar ist (z.B. `https://tt-tagebuch.de`)
+- **BASE_URL** – Fallback, falls BACKEND_BASE_URL nicht gesetzt ist
+
+In Produktion mit Reverse-Proxy (Apache) reicht meist `BASE_URL=https://tt-tagebuch.de`. In der Entwicklung kann `BACKEND_BASE_URL=http://localhost:3005` nötig sein, wenn die API auf einem anderen Port als das Frontend läuft.
+
+## Datenbank-Migration
+
+```bash
+mysql -u USER -p DATABASE < backend/migrations/create_http_page_fetch_log.sql
+```
+
+## Hinweis: mytischtennis.de vs. click-TT
+
+Die **leaguePage** auf httv.click-tt.de zeigt eine Übersicht mit Links. Die eigentlichen **Tabellen und Spielpläne** verweisen auf **mytischtennis.de**:
+
+```
+https://www.mytischtennis.de/click-tt/HeTTV/25--26/ligen/Hessenliga_Gr._Süd-West/gruppe/496273/tabelle/gesamt
+```
+
+Diese mytischtennis.de-URLs werden bereits über den bestehenden MyTischtennis-URL-Parser und Auto-Fetch unterstützt. Die httv.click-tt.de-Seiten dienen vor allem der Navigation und der Ermittlung von Gruppen-IDs für verschiedene Bezirke/Saisonen.

backend/MYTISCHTENNIS_AUTO_FETCH_README.md

@@ -9,12 +9,12 @@ Dieses System ermöglicht den automatischen Abruf von Spielergebnissen und Stati
 ### 6:00 Uhr - Rating Updates
 - **Service:** `autoUpdateRatingsService.js`
 - **Funktion:** Aktualisiert TTR/QTTR-Werte für Spieler
-- **TODO:** Implementierung der eigentlichen Rating-Update-Logik
+- **Status:** ✅ Aktiv. Nutzt `memberService.updateRatingsFromMyTischtennisByUserId(...)` pro Verein ueber einen freigeschalteten Benutzer mit gespeichertem myTischtennis-Login.
 
 ### 6:30 Uhr - Spielergebnisse
 - **Service:** `autoFetchMatchResultsService.js`
-- **Funktion:** Ruft Spielerbilanzen für konfigurierte Teams ab
-- **Status:** ✅ Grundlegende Implementierung fertig
+- **Funktion:** Ruft Team-Spielplaene, Liga-Spielplaene, Spielerbilanzen und Ligatabellen fuer konfigurierte Teams ab
+- **Status:** ✅ Aktiv. Importiert neue Spiele, aktualisiert Ergebnis- und Termin-Aenderungen und synchronisiert Ligatabellen.
 
 ## Benötigte Konfiguration
 
@@ -107,6 +107,7 @@ Von der myTischtennis API werden folgende Daten abgerufen:
 - Player IDs, Namen der beiden Spieler
 - Gewonnene/Verlorene Punkte
 - Anzahl Spiele
+- Zuordnung der beteiligten Mitglieder ueber Player-ID oder Namensabgleich
 
 ### Team-Informationen
 - Teamname, Liga, Saison
@@ -134,7 +135,8 @@ Von der myTischtennis API werden folgende Daten abgerufen:
    - Parst JSON-Response
    - Matched Spieler anhand von ID oder Name
    - Speichert myTischtennis Player-ID bei Mitgliedern
-   - Loggt Statistiken
+   - verarbeitet auch Doppelpartner-Zuordnungen
+   - speichert/aktualisiert Spiele und Ligatabellen
 
 ### Player-Matching-Algorithmus
 
@@ -148,25 +150,21 @@ Von der myTischtennis API werden folgende Daten abgerufen:
 
 ## TODO / Offene Punkte
 
-### Noch zu implementieren:
+### Noch offen:
 
-1. **TTR/QTTR Updates** (6:00 Uhr Job):
-   - Endpoint für TTR/QTTR-Daten identifizieren
-   - Daten abrufen und in Member-Tabelle speichern
-
-2. **Spielergebnis-Details**:
+1. **Spielergebnis-Details**:
    - Einzelne Matches mit Satzständen speichern
    - Tabelle für Match-Historie erstellen
 
-3. **History-Tabelle für Spielergebnis-Abrufe** (optional):
+2. **History-Tabelle für Spielergebnis-Abrufe** (optional):
    - Ähnlich zu `my_tischtennis_update_history`
    - Speichert Erfolg/Fehler der Abrufe
 
-4. **Benachrichtigungen** (optional):
+3. **Benachrichtigungen** (optional):
    - Email/Push bei neuen Ergebnissen
    - Highlights für besondere Siege
 
-5. **Performance-Optimierung**:
+4. **Performance-Optimierung**:
    - Caching für Player-Matches
    - Incremental Updates (nur neue Daten)
 
@@ -183,6 +181,14 @@ await schedulerService.triggerRatingUpdates();
 await schedulerService.triggerMatchResultsFetch();
 ```
 
+### Manuelle HTTP-Trigger
+
+```text
+POST /api/scheduler/rating_updates
+POST /api/scheduler/match_results
+GET  /api/scheduler/status
+```
+
 ## API-Dokumentation
 
 ### MyTischtennis Spielerbilanzen-Endpoint
@@ -209,4 +215,3 @@ https://www.mytischtennis.de/click-tt/{association}/{season}/ligen/{groupname}/g
 - ✅ Passwörter verschlüsselt gespeichert
 - ✅ Fehlerbehandlung und Logging
 - ✅ Graceful Degradation (einzelne Team-Fehler stoppen nicht den gesamten Prozess)
-

backend/clients/myTischtennisClient.js

@@ -1,4 +1,5 @@
 import axios from 'axios';
+import { chromium } from 'playwright';
 
 const BASE_URL = 'https://www.mytischtennis.de';
 
@@ -24,36 +25,136 @@ class MyTischtennisClient {
   async getLoginPage() {
     try {
       const response = await this.client.get('/login?next=%2F');
-      const html = response.data;
+      const html = typeof response.data === 'string' ? response.data : String(response.data || '');
+
+      const extractFirst = (patterns) => {
+        for (const pattern of patterns) {
+          const match = html.match(pattern);
+          if (match && (match[1] || match[2] || match[3])) {
+            return match[1] || match[2] || match[3];
+          }
+        }
+        return null;
+      };
+
+      // Parse form action and input fields for frontend login-form endpoint
+      const formMatch = html.match(/<form[^>]*action=(?:"([^"]+)"|'([^']+)')[^>]*>([\s\S]*?)<\/form>/i);
+      const loginAction = formMatch ? (formMatch[1] || formMatch[2] || '/login') : '/login';
+      const formHtml = formMatch ? formMatch[3] : html;
+      const fields = [];
+
+      const inputRegex = /<input\b([\s\S]*?)>/gi;
+      let inputMatch = null;
+      while ((inputMatch = inputRegex.exec(formHtml)) !== null) {
+        const rawAttributes = inputMatch[1] || '';
+        const attributes = {};
+
+        // Parses key="value", key='value', key=value and boolean attributes.
+        const attributeRegex = /([a-zA-Z_:][-a-zA-Z0-9_:.]*)(?:=(?:"([^"]*)"|'([^']*)'|([^\s"'=<>`]+)))?/g;
+        let attributeMatch = null;
+        while ((attributeMatch = attributeRegex.exec(rawAttributes)) !== null) {
+          const key = attributeMatch[1];
+          const value = attributeMatch[2] ?? attributeMatch[3] ?? attributeMatch[4] ?? true;
+          attributes[key] = value;
+        }
+
+        fields.push({
+          name: typeof attributes.name === 'string' ? attributes.name : null,
+          id: typeof attributes.id === 'string' ? attributes.id : null,
+          type: typeof attributes.type === 'string' ? attributes.type : 'text',
+          placeholder: typeof attributes.placeholder === 'string' ? attributes.placeholder : null,
+          autocomplete: typeof attributes.autocomplete === 'string' ? attributes.autocomplete : null,
+          minlength: typeof attributes.minlength === 'string' ? attributes.minlength : null,
+          required: attributes.required === true || attributes.required === 'required',
+          value: typeof attributes.value === 'string' ? attributes.value : null
+        });
+      }
+
+      // Fallback: if page is JS-rendered and no input tags are server-rendered, provide usable defaults.
+      const hasEmailField = fields.some((f) => f?.name === 'email' || f?.type === 'email');
+      const hasPasswordField = fields.some((f) => f?.name === 'password' || f?.type === 'password');
+      if (!hasEmailField) {
+        fields.push({
+          name: 'email',
+          id: null,
+          type: 'email',
+          placeholder: null,
+          autocomplete: 'email',
+          minlength: null,
+          required: true,
+          value: null
+        });
+      }
+      if (!hasPasswordField) {
+        fields.push({
+          name: 'password',
+          id: null,
+          type: 'password',
+          placeholder: null,
+          autocomplete: 'current-password',
+          minlength: null,
+          required: true,
+          value: null
+        });
+      }
       
       // Extract XSRF token from hidden input
-      const xsrfMatch = html.match(/<input[^>]*name="xsrf"[^>]*value="([^"]+)"/);
-      const xsrfToken = xsrfMatch ? xsrfMatch[1] : null;
+      const xsrfToken = extractFirst([
+        /<input[^>]*name=(?:"xsrf"|'xsrf')[^>]*value=(?:"([^"]+)"|'([^']+)')/i,
+        /(?:^|[,{])\s*"xsrf"\s*:\s*"([^"]+)"/i
+      ]);
       
       // Extract CAPTCHA token from hidden input (if present)
-      const captchaMatch = html.match(/<input[^>]*name="captcha"[^>]*value="([^"]+)"/);
-      const captchaToken = captchaMatch ? captchaMatch[1] : null;
+      const captchaToken = extractFirst([
+        /<input[^>]*name=(?:"captcha"|'captcha')[^>]*value=(?:"([^"]+)"|'([^']+)')/i,
+        /(?:^|[,{])\s*"captcha"\s*:\s*"([^"]+)"/i
+      ]);
       
       // Check if captcha_clicked is true or false
-      const captchaClickedMatch = html.match(/<input[^>]*name="captcha_clicked"[^>]*value="([^"]+)"/);
-      const captchaClicked = captchaClickedMatch ? captchaClickedMatch[1] === 'true' : false;
+      const captchaClickedRaw = extractFirst([
+        /<input[^>]*name=(?:"captcha_clicked"|'captcha_clicked')[^>]*value=(?:"([^"]+)"|'([^']+)')/i,
+        /(?:^|[,{])\s*"captcha_clicked"\s*:\s*"([^"]+)"/i
+      ]);
+      const captchaClicked = String(captchaClickedRaw || '').toLowerCase() === 'true';
       
       // Check if CAPTCHA is required (look for private-captcha element or captcha input)
-      const requiresCaptcha = html.includes('private-captcha') || html.includes('name="captcha"');
+      const requiresCaptcha = html.includes('private-captcha')
+        || html.includes('name="captcha"')
+        || html.includes("name='captcha'")
+        || /captcha/i.test(html);
+
+      // Extract CAPTCHA metadata used by frontend
+      const captchaSiteKey = extractFirst([
+        /data-sitekey=(?:"([^"]+)"|'([^']+)'|([^\s>]+))/i,
+        /(?:^|[,{])\s*"sitekey"\s*:\s*"([^"]+)"/i,
+        /(?:^|[,{])\s*"captchaSiteKey"\s*:\s*"([^"]+)"/i
+      ]);
+      const captchaPuzzleEndpoint = extractFirst([
+        /data-puzzle-endpoint=(?:"([^"]+)"|'([^']+)'|([^\s>]+))/i,
+        /(?:^|[,{])\s*"puzzle_endpoint"\s*:\s*"([^"]+)"/i,
+        /(?:^|[,{])\s*"captchaPuzzleEndpoint"\s*:\s*"([^"]+)"/i
+      ]);
       
       console.log('[myTischtennisClient.getLoginPage]', {
         hasXsrfToken: !!xsrfToken,
         hasCaptchaToken: !!captchaToken,
         captchaClicked,
-        requiresCaptcha
+        requiresCaptcha,
+        fieldsCount: fields.length,
+        hasCaptchaSiteKey: !!captchaSiteKey,
+        hasCaptchaPuzzleEndpoint: !!captchaPuzzleEndpoint
       });
       
       return {
         success: true,
+        loginAction,
+        fields,
         xsrfToken,
         captchaToken,
         captchaClicked,
-        requiresCaptcha
+        requiresCaptcha,
+        captchaSiteKey,
+        captchaPuzzleEndpoint
       };
     } catch (error) {
       console.error('Error fetching login page:', error.message);
@@ -247,6 +348,443 @@ class MyTischtennisClient {
     }
   }
 
+  /**
+   * Browser-based fallback login for CAPTCHA flows.
+   * @param {string} email
+   * @param {string} password
+   * @param {Object} [options]
+   * @param {Object} [options.savedStorageState] - Playwright storage state from a previous session.
+   *   If provided and the stored auth cookie is still valid, returns immediately without a new login.
+   * @returns {Promise<Object>} Login response with token, session data, and `storageState` for persistence.
+   */
+  async loginWithBrowserAutomation(email, password, options = {}) {
+    const { savedStorageState } = options;
+    let browser = null;
+    let context = null;
+
+    // --- Fast path: restore a saved Playwright session ---
+    if (savedStorageState) {
+      try {
+        browser = await chromium.launch({ headless: true, args: ['--no-sandbox', '--disable-dev-shm-usage'] });
+        context = await browser.newContext({ storageState: savedStorageState });
+        const cookies = await context.cookies('https://www.mytischtennis.de');
+        const authCookie = cookies.find((c) => c.name === 'sb-10-auth-token' || /^sb-\d+-auth-token$/.test(c.name));
+        if (authCookie?.value) {
+          const tokenMatch = String(authCookie.value).match(/^base64-(.+)$/);
+          if (tokenMatch) {
+            const tokenData = JSON.parse(Buffer.from(tokenMatch[1], 'base64').toString('utf-8'));
+            const nowSec = Math.floor(Date.now() / 1000);
+            // Accept if not expired (with 5-minute safety buffer)
+            if (tokenData.expires_at && tokenData.expires_at > nowSec + 300) {
+              console.log('[myTischtennisClient.playwright] Restored session from saved state (no CAPTCHA needed)');
+              const storageState = await context.storageState();
+              await context.close();
+              await browser.close();
+              browser = null; context = null;
+              return {
+                success: true,
+                accessToken: tokenData.access_token,
+                refreshToken: tokenData.refresh_token,
+                expiresAt: tokenData.expires_at,
+                expiresIn: tokenData.expires_in,
+                user: tokenData.user,
+                cookie: `sb-10-auth-token=${authCookie.value}`,
+                storageState,
+                restoredFromCache: true
+              };
+            }
+          }
+        }
+        // Cookie absent or expired → close and fall through to full login
+        console.log('[myTischtennisClient.playwright] Saved session expired or invalid, starting full login');
+        await context.close();
+        await browser.close();
+        browser = null; context = null;
+      } catch (restoreErr) {
+        console.warn('[myTischtennisClient.playwright] Session restore failed, starting full login:', restoreErr.message);
+        try { if (context) await context.close(); } catch (_e) { /* ignore */ }
+        try { if (browser) await browser.close(); } catch (_e) { /* ignore */ }
+        browser = null; context = null;
+      }
+    }
+
+    try {
+      console.log('[myTischtennisClient.playwright] Start browser login flow');
+      browser = await chromium.launch({
+        headless: true,
+        args: ['--no-sandbox', '--disable-dev-shm-usage']
+      });
+      context = await browser.newContext();
+      const page = await context.newPage();
+
+      // Helper: click the CMP/consent "Akzeptieren" button if visible.
+      // Tries multiple selectors to cover different CMP implementations.
+      const acceptConsentDialog = async (waitMs = 0) => {
+        if (waitMs > 0) await page.waitForTimeout(waitMs);
+        const consentSelectors = [
+          '#onetrust-accept-btn-handler',
+          'button:has-text("Alle akzeptieren")',
+          'button:has-text("Akzeptieren")',
+          'button:has-text("Einverstanden")',
+          'button:has-text("Zustimmen")',
+          '[data-testid="accept-button"]',
+          '.cmp-accept-all',
+          '.accept-all-btn'
+        ];
+        for (const selector of consentSelectors) {
+          try {
+            const button = page.locator(selector).first();
+            if (await button.count()) {
+              await button.click({ timeout: 2500 });
+              console.log('[myTischtennisClient.playwright] Consent dialog accepted via:', selector);
+              await page.waitForTimeout(800);
+              return true;
+            }
+          } catch (_e) {
+            // try next selector
+          }
+        }
+        return false;
+      };
+
+      // Visit the homepage first so the browser receives and stores the correct CMP
+      // consent cookies (the TCF v2 format cannot be guessed and set manually).
+      // After accepting consent here, the login page will not show the banner again.
+      try {
+        await page.goto(this.baseURL, { waitUntil: 'domcontentloaded', timeout: 30000 });
+        const acceptedOnHome = await acceptConsentDialog(0);
+        if (!acceptedOnHome) await acceptConsentDialog(2500);
+        console.log('[myTischtennisClient.playwright] Homepage visited, consent handled');
+      } catch (_homeErr) {
+        console.log('[myTischtennisClient.playwright] Homepage pre-visit failed (continuing):', _homeErr.message);
+      }
+
+      await page.goto(`${this.baseURL}/login?next=%2F`, { waitUntil: 'domcontentloaded', timeout: 45000 });
+      console.log('[myTischtennisClient.playwright] Login page loaded');
+
+      // Second consent attempt in case it re-appears on the login page.
+      const consentOnLogin = await acceptConsentDialog(0);
+      if (!consentOnLogin) await acceptConsentDialog(1500);
+
+      // Fill credentials
+      await page.locator('input[name="email"]').first().fill(email, { timeout: 10000 });
+      await page.locator('input[name="password"]').first().fill(password, { timeout: 10000 });
+      console.log('[myTischtennisClient.playwright] Credentials filled');
+
+      // Try to interact with private-captcha if present (it may render with delay).
+      try {
+        await page.waitForSelector('private-captcha', { timeout: 8000 });
+      } catch (_e) {
+        // ignore: captcha host might not be present in all flows
+      }
+      const captchaHost = page.locator('private-captcha').first();
+      const hasCaptchaHost = (await captchaHost.count()) > 0;
+      let captchaReadyDetected = !hasCaptchaHost;
+      if (hasCaptchaHost) {
+        try {
+          await page.waitForTimeout(1200);
+          const captchaVisualStateBefore = await page.evaluate(() => {
+            const host = document.querySelector('private-captcha');
+            const checkbox = host?.shadowRoot?.querySelector('#pc-checkbox');
+            return {
+              hostClass: host?.className || null,
+              hostDataState: host?.getAttribute?.('data-state') || null,
+              checkboxClass: checkbox?.className || null,
+              checkboxChecked: !!checkbox?.checked,
+              checkboxAriaChecked: checkbox?.getAttribute?.('aria-checked') || null
+            };
+          });
+          const interaction = await page.evaluate(() => {
+            const host = document.querySelector('private-captcha');
+            const checkbox = host?.shadowRoot?.querySelector('#pc-checkbox');
+            if (!checkbox) {
+              return { clicked: false, reason: 'checkbox-missing' };
+            }
+            checkbox.click();
+            checkbox.dispatchEvent(new Event('input', { bubbles: true }));
+            checkbox.dispatchEvent(new Event('change', { bubbles: true }));
+            return {
+              clicked: true,
+              viaShadowRoot: true,
+              className: checkbox.className || null,
+              checked: !!checkbox.checked
+            };
+          });
+          console.log('[myTischtennisClient.playwright] evaluate interaction result:', interaction);
+
+          // Wait until hidden captcha fields are populated by site scripts.
+          try {
+            await page.waitForFunction(() => {
+              const captchaField = document.querySelector('input[name="captcha"]');
+              const clickedField = document.querySelector('input[name="captcha_clicked"]');
+              const captchaValue = (captchaField && captchaField.value ? captchaField.value.trim() : '');
+              const clickedValue = (clickedField && clickedField.value ? clickedField.value.toLowerCase() : '');
+              return captchaValue.length > 80 && (clickedValue === 'true' || clickedValue === '1');
+            }, { timeout: 20000 });
+            const captchaState = await page.evaluate(() => {
+              const captchaField = document.querySelector('input[name="captcha"]');
+              const clickedField = document.querySelector('input[name="captcha_clicked"]');
+              return {
+                captchaLen: captchaField?.value?.length || 0,
+                captchaClicked: clickedField?.value || null
+              };
+            });
+            console.log('[myTischtennisClient.playwright] Captcha value ready:', captchaState);
+            captchaReadyDetected = true;
+          } catch (_waitErr) {
+            // Keep going; some flows still succeed without explicit hidden field update.
+            console.warn('[myTischtennisClient.playwright] Captcha value not ready in time');
+          }
+
+          // Optional diagnostic only: visual state change should never block submit.
+          try {
+            await page.waitForFunction((beforeState) => {
+              const host = document.querySelector('private-captcha');
+              const checkbox = host?.shadowRoot?.querySelector('#pc-checkbox');
+              if (!host || !checkbox) return false;
+
+              const current = {
+                hostClass: host.className || '',
+                hostDataState: host.getAttribute?.('data-state') || '',
+                checkboxClass: checkbox.className || '',
+                checkboxChecked: !!checkbox.checked,
+                checkboxAriaChecked: checkbox.getAttribute?.('aria-checked') || ''
+              };
+
+              const visualChanged =
+                current.hostClass !== (beforeState?.hostClass || '')
+                || current.hostDataState !== (beforeState?.hostDataState || '')
+                || current.checkboxClass !== (beforeState?.checkboxClass || '')
+                || current.checkboxChecked !== !!beforeState?.checkboxChecked
+                || current.checkboxAriaChecked !== (beforeState?.checkboxAriaChecked || '');
+
+              return visualChanged;
+            }, captchaVisualStateBefore, { timeout: 1500 });
+            console.log('[myTischtennisClient.playwright] Captcha visual state changed');
+          } catch (_visualWaitErr) {
+            // no-op: widget often keeps "ready" class despite solved token
+          }
+        } catch (captchaError) {
+          console.warn('[myTischtennisClient.playwright] Captcha interaction warning:', captchaError?.message || captchaError);
+        }
+      }
+
+      // Ensure captcha_clicked field is set if available.
+      await page.evaluate(() => {
+        const clickedField = document.querySelector('input[name="captcha_clicked"]');
+        if (clickedField && !clickedField.value) {
+          clickedField.value = 'true';
+        }
+      });
+
+      // Before submit, ensure CAPTCHA fields are actually ready if captcha widget exists.
+      if (hasCaptchaHost) {
+        const isCaptchaReadyNow = await page.evaluate(() => {
+          const captchaField = document.querySelector('input[name="captcha"]');
+          const clickedField = document.querySelector('input[name="captcha_clicked"]');
+          const captchaValue = (captchaField && captchaField.value ? captchaField.value.trim() : '');
+          const clickedValue = (clickedField && clickedField.value ? clickedField.value.toLowerCase() : '');
+          return captchaValue.length > 80 && (clickedValue === 'true' || clickedValue === '1');
+        });
+        captchaReadyDetected = captchaReadyDetected || isCaptchaReadyNow;
+
+        if (!isCaptchaReadyNow) {
+          try {
+            await page.waitForFunction(() => {
+              const captchaField = document.querySelector('input[name="captcha"]');
+              const clickedField = document.querySelector('input[name="captcha_clicked"]');
+              const captchaValue = (captchaField && captchaField.value ? captchaField.value.trim() : '');
+              const clickedValue = (clickedField && clickedField.value ? clickedField.value.toLowerCase() : '');
+              return captchaValue.length > 80 && (clickedValue === 'true' || clickedValue === '1');
+            }, { timeout: 12000 });
+            captchaReadyDetected = true;
+          } catch (_captchaNotReadyErr) {
+            return {
+              success: false,
+              error: 'Playwright-Login fehlgeschlagen: CAPTCHA wurde im Browser nicht als gelöst erkannt'
+            };
+          }
+        }
+      }
+
+      // Human-like pause only after captcha was actually solved (2-6s).
+      if (captchaReadyDetected) {
+        const postCaptchaDelayMs = 2000 + Math.floor(Math.random() * 4001);
+        await page.waitForTimeout(postCaptchaDelayMs);
+        console.log('[myTischtennisClient.playwright] Waited after solved captcha:', postCaptchaDelayMs);
+      }
+
+      // Ensure login intent is present and click the explicit login submit button.
+      await page.evaluate(() => {
+        const form = document.querySelector('form[action*="/login"]');
+        if (!form) return;
+        let intentField = form.querySelector('input[name="intent"]');
+        if (!intentField) {
+          intentField = document.createElement('input');
+          intentField.setAttribute('type', 'hidden');
+          intentField.setAttribute('name', 'intent');
+          form.appendChild(intentField);
+        }
+        intentField.setAttribute('value', 'login');
+      });
+
+      // Submit form
+      const loginSubmitButton = page.locator('button[type="submit"][name="intent"][value="login"]').first();
+      const genericSubmitButton = page.locator('button[type="submit"], input[type="submit"]').first();
+      if (await loginSubmitButton.count()) {
+        await loginSubmitButton.click({ timeout: 15000, noWaitAfter: true });
+      } else if (await genericSubmitButton.count()) {
+        await genericSubmitButton.click({ timeout: 15000, noWaitAfter: true });
+      } else {
+        await page.keyboard.press('Enter');
+      }
+      console.log('[myTischtennisClient.playwright] Submit clicked');
+
+      // Wait for auth cookie after submit (polling avoids timing races).
+      let authCookieObj = null;
+      let detectedSubmitError = null;
+      const pollIntervalMs = 500;
+      const maxAttempts = 40; // ~20s max wait after submit
+      for (let attempt = 0; attempt < maxAttempts; attempt++) {
+        const cookies = await context.cookies();
+        authCookieObj = cookies.find((c) => c.name === 'sb-10-auth-token')
+          || cookies.find((c) => /^sb-\d+-auth-token$/.test(c.name))
+          || cookies.find((c) => c.name.includes('auth-token'));
+        if (authCookieObj?.value) {
+          console.log('[myTischtennisClient.playwright] Auth cookie detected:', authCookieObj.name);
+          break;
+        }
+
+        // Periodically: dismiss consent banner (may reappear after submit redirect)
+        // and probe page text to fail fast on known error strings.
+        if (attempt % 4 === 0) {
+          try { await acceptConsentDialog(0); } catch (_e) { /* ignore */ }
+          try {
+            const textContent = await page.locator('body').innerText({ timeout: 600 });
+            if (textContent?.includes('Captcha-Bestätigung fehlgeschlagen')) {
+              detectedSubmitError = 'Captcha-Bestätigung fehlgeschlagen';
+              break;
+            }
+            if (textContent?.includes('Captcha-Bestätigung ist erforderlich')) {
+              detectedSubmitError = 'Captcha-Bestätigung ist erforderlich';
+              break;
+            }
+            if (textContent?.includes('Ungültige E-Mail oder Passwort')) {
+              detectedSubmitError = 'Ungültige E-Mail oder Passwort';
+              break;
+            }
+          } catch (_readBodyErr) {
+            // ignore text read errors during polling
+          }
+        }
+
+        await page.waitForTimeout(pollIntervalMs);
+      }
+      if (!authCookieObj || !authCookieObj.value) {
+        let errorText = null;
+        let failureDiagnostics = null;
+        try {
+          const textContent = await page.locator('body').innerText({ timeout: 1000 });
+          if (textContent?.includes('Captcha-Bestätigung fehlgeschlagen')) {
+            errorText = 'Captcha-Bestätigung fehlgeschlagen';
+          }
+          if (!errorText && textContent?.includes('Passwort')) {
+            errorText = 'Login vermutlich fehlgeschlagen (Passwort oder CAPTCHA)';
+          }
+
+          const currentUrl = page.url();
+          const allCookies = await context.cookies();
+          const cookieNames = allCookies.map((c) => c.name);
+          failureDiagnostics = {
+            url: currentUrl,
+            cookieNames,
+            bodyPreview: String(textContent || '').slice(0, 320)
+          };
+        } catch (_e) {
+          // ignore text read errors
+        }
+        if (!errorText && detectedSubmitError) {
+          errorText = detectedSubmitError;
+        }
+        if (failureDiagnostics) {
+          console.warn('[myTischtennisClient.playwright] Login failure diagnostics:', failureDiagnostics);
+        }
+        return {
+          success: false,
+          error: errorText
+            ? `Playwright-Login fehlgeschlagen: ${errorText}`
+            : 'Playwright-Login fehlgeschlagen: Kein sb-10-auth-token Cookie gefunden'
+        };
+      }
+
+      // Cookie value is expected as "base64-<tokenData>"
+      const tokenMatch = String(authCookieObj.value).match(/^base64-(.+)$/);
+      if (!tokenMatch) {
+        return {
+          success: false,
+          error: 'Playwright-Login fehlgeschlagen: Token-Format ungültig'
+        };
+      }
+
+      let tokenData;
+      try {
+        tokenData = JSON.parse(Buffer.from(tokenMatch[1], 'base64').toString('utf-8'));
+      } catch (decodeError) {
+        return {
+          success: false,
+          error: `Playwright-Login fehlgeschlagen: Token konnte nicht dekodiert werden (${decodeError.message})`
+        };
+      }
+
+      const cookie = `sb-10-auth-token=${authCookieObj.value}`;
+
+      // Persist the full browser storage state so future calls can skip the CAPTCHA flow.
+      let storageState = null;
+      try { storageState = await context.storageState(); } catch (_e) { /* ignore */ }
+
+      console.log('[myTischtennisClient.playwright] Browser login successful');
+      return {
+        success: true,
+        accessToken: tokenData.access_token,
+        refreshToken: tokenData.refresh_token,
+        expiresAt: tokenData.expires_at,
+        expiresIn: tokenData.expires_in,
+        user: tokenData.user,
+        cookie,
+        storageState
+      };
+    } catch (error) {
+      const rawMessage = String(error?.message || error || 'Playwright-Login fehlgeschlagen');
+      const isMissingBrowserExecutable = /Executable doesn't exist|download new browsers|playwright install/i.test(rawMessage);
+      const normalizedError = isMissingBrowserExecutable
+        ? 'Playwright-Browser ist auf dem Server nicht installiert. Bitte "npx playwright install chromium" ausführen.'
+        : rawMessage;
+      console.error('[myTischtennisClient.playwright] Browser login failed:', normalizedError);
+      return {
+        success: false,
+        error: normalizedError,
+        requiresSetup: isMissingBrowserExecutable,
+        status: isMissingBrowserExecutable ? 503 : 400
+      };
+    } finally {
+      if (context) {
+        try {
+          await context.close();
+        } catch (contextCloseError) {
+          console.warn('[myTischtennisClient.playwright] Context close warning:', contextCloseError?.message || contextCloseError);
+        }
+      }
+      if (browser) {
+        try {
+          await browser.close();
+        } catch (browserCloseError) {
+          console.warn('[myTischtennisClient.playwright] Browser close warning:', browserCloseError?.message || browserCloseError);
+        }
+        console.log('[myTischtennisClient.playwright] Browser closed');
+      }
+    }
+  }
+
   /**
    * Verify login credentials
    * @param {string} email - myTischtennis email
@@ -331,7 +869,8 @@ class MyTischtennisClient {
    * @param {string} fedNickname - Federation nickname (e.g., "HeTTV")
    * @returns {Promise<Object>} Rankings with player entries (all pages)
    */
-  async getClubRankings(cookie, clubId, fedNickname, currentRanking = 'yes') {
+  async getClubRankings(cookie, clubId, fedNickname, currentRanking = 'yes', options = {}) {
+    const { includeHistoryPlayerIds = false } = options;
     const allEntries = [];
     let currentPage = 0;
     let hasMorePages = true;
@@ -339,8 +878,6 @@ class MyTischtennisClient {
     
     while (hasMorePages) {
       const endpoint = `/rankings/andro-rangliste?all-players=on&clubnr=${clubId}&fednickname=${fedNickname}&current-ranking=${currentRanking}&results-per-page=100&page=${currentPage}&_data=routes%2F%24`;
-      
-      
       const result = await this.authenticatedRequest(endpoint, cookie, {
         method: 'GET'
       });
@@ -379,15 +916,39 @@ class MyTischtennisClient {
           error: 'Keine entries in blockLoaderData gefunden'
         };
       }
+
+      let historyPlayerIdsByName = null;
+      if (includeHistoryPlayerIds) {
+        const htmlEndpoint = `/rankings/andro-rangliste?clubnr=${clubId}&fednickname=${fedNickname}&all-players=on&continent=all&country=all&current-ranking=${currentRanking}&results-per-page=100&page=${currentPage + 1}`;
+        const htmlResult = await this.authenticatedRequest(htmlEndpoint, cookie, {
+          method: 'GET',
+          headers: {
+            Accept: 'text/html,application/xhtml+xml'
+          }
+        });
+        historyPlayerIdsByName = htmlResult.success
+          ? this.extractHistoryPlayerIdsFromAndroRankingHtml(htmlResult.data)
+          : new Map();
+      }
+
+      const enrichedEntries = entries.map((entry) => {
+        const nameKey = this._buildRankingNameKey(entry?.firstname, entry?.lastname);
+        const historyPlayerId = historyPlayerIdsByName?.get(nameKey) || null;
+        return {
+          ...entry,
+          historyPlayerId,
+          myTischtennisHistoryPlayerId: historyPlayerId
+        };
+      });
       
       
       // Füge Entries hinzu
-      allEntries.push(...entries);
+      allEntries.push(...enrichedEntries);
       
       // Prüfe ob es weitere Seiten gibt
       // Wenn die aktuelle Seite weniger Einträge hat als das Limit, sind wir am Ende
       // Oder wenn wir alle erwarteten Einträge haben
-      if (entries.length === 0) {
+      if (enrichedEntries.length === 0) {
         hasMorePages = false;
       } else if (rankingData.numberOfPages && currentPage >= rankingData.numberOfPages - 1) {
         hasMorePages = false;
@@ -408,7 +969,45 @@ class MyTischtennisClient {
       }
     };
   }
+
+  extractHistoryPlayerIdsFromAndroRankingHtml(html) {
+    const result = new Map();
+    const source = typeof html === 'string' ? html : String(html || '');
+    const anchorPattern = /href="\/community\/external-profile\?player-id=(P[A-Z0-9]+)"[^>]*>([^<]+)<\/a>/gi;
+
+    let match = null;
+    while ((match = anchorPattern.exec(source)) !== null) {
+      const playerId = match[1];
+      const fullName = this._decodeHtmlEntities(match[2] || '');
+      const key = this._buildRankingFullNameKey(fullName);
+      if (key && playerId && !result.has(key)) {
+        result.set(key, playerId);
+      }
+    }
+
+    return result;
+  }
+
+  _buildRankingNameKey(firstname, lastname) {
+    return this._buildRankingFullNameKey(`${firstname || ''} ${lastname || ''}`);
+  }
+
+  _buildRankingFullNameKey(name) {
+    return String(name || '')
+      .normalize('NFKC')
+      .replace(/\s+/g, ' ')
+      .trim()
+      .toLowerCase();
+  }
+
+  _decodeHtmlEntities(value) {
+    return String(value || '')
+      .replace(/&amp;/g, '&')
+      .replace(/&quot;/g, '"')
+      .replace(/&#39;/g, "'")
+      .replace(/&lt;/g, '<')
+      .replace(/&gt;/g, '>');
+  }
 }
 
 export default new MyTischtennisClient();
-

backend/controllers/authController.js

@@ -1,13 +1,14 @@
-import { register, activateUser, login, logout } from '../services/authService.js';
-import jwt from 'jsonwebtoken';
-import UserToken from '../models/UserToken.js';
-import User from '../models/User.js'; // ggf. Pfad anpassen
+import { register, activateUser, login, logout, deleteOwnAccount, requestPasswordReset, resetPassword } from '../services/authService.js';
 
 const registerUser = async (req, res, next) => {
   try {
     const { email, password } = req.body;
-    const user = await register(email, password);
-    res.status(201).json(user);
+    console.log('registerUser', email, password);
+    await register(email, password);
+    console.log('registerUser done');
+    // Aus Sicherheitsgründen KEINE Userdaten (Passwort-Hash, Aktivierungscode, ...) zurückgeben
+    res.status(201).json({ success: true });
+    console.log('registerUser response sent');
   } catch (error) {
     next(error);
   }
@@ -16,8 +17,9 @@ const registerUser = async (req, res, next) => {
 const activate = async (req, res, next) => {
   try {
     const { activationCode } = req.params;
-    const user = await activateUser(activationCode);
-    res.status(200).json(user);
+    await activateUser(activationCode);
+    // Auch bei Aktivierung kein komplettes User-Objekt zurückgeben
+    res.status(200).json({ success: true });
   } catch (error) {
     next(error);
   }
@@ -25,8 +27,8 @@ const activate = async (req, res, next) => {
 
 const loginUser = async (req, res, next) => {
   try {
-    const { email, password } = req.body;
-    const result = await login(email, password);
+    const { email, password, rememberMe } = req.body;
+    const result = await login(email, password, { rememberMe });
     res.status(200).json(result);
   } catch (error) {
     next(error);
@@ -35,7 +37,7 @@ const loginUser = async (req, res, next) => {
 
 const logoutUser = async (req, res, next) => {
   try {
-    const token = req.headers['authorization']?.split(' ')[1];
+    const token = req.headers['authorization']?.split(' ')[1] || req.headers.authcode;
     const result = await logout(token);
     res.status(200).json(result);
   } catch (error) {
@@ -43,4 +45,34 @@ const logoutUser = async (req, res, next) => {
   }
 };
 
-export { registerUser, activate, loginUser, logoutUser };
+const deleteAccount = async (req, res, next) => {
+  try {
+    const { password } = req.body || {};
+    const result = await deleteOwnAccount(req.user?.id, password);
+    res.status(200).json(result);
+  } catch (error) {
+    next(error);
+  }
+};
+
+const forgotPassword = async (req, res, next) => {
+  try {
+    const { email } = req.body;
+    const result = await requestPasswordReset(email);
+    res.status(200).json(result);
+  } catch (error) {
+    next(error);
+  }
+};
+
+const resetUserPassword = async (req, res, next) => {
+  try {
+    const { token, password } = req.body;
+    const result = await resetPassword(token, password);
+    res.status(200).json(result);
+  } catch (error) {
+    next(error);
+  }
+};
+
+export { registerUser, activate, loginUser, logoutUser, deleteAccount, forgotPassword, resetUserPassword };

backend/controllers/billingController.js

@@ -0,0 +1,207 @@
+import fs from 'fs';
+import multer from 'multer';
+import path from 'path';
+import { fileURLToPath } from 'url';
+import billingService from '../services/billingService.js';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const BILLING_TEMPLATE_UPLOAD_DIR = path.resolve(__dirname, '..', 'uploads', 'billing-templates');
+
+const storage = multer.diskStorage({
+  destination: (req, file, cb) => {
+    const dir = BILLING_TEMPLATE_UPLOAD_DIR;
+    fs.mkdirSync(dir, { recursive: true });
+    cb(null, dir);
+  },
+  filename: (req, file, cb) => {
+    const ext = path.extname(file.originalname) || '.pdf';
+    cb(null, `billing-template-${Date.now()}-${Math.round(Math.random() * 1e9)}${ext}`);
+  }
+});
+
+const upload = multer({
+  storage,
+  limits: { fileSize: 10 * 1024 * 1024 },
+  fileFilter: (req, file, cb) => {
+    const ext = path.extname(file.originalname || '').toLowerCase();
+    const isPdf = ext === '.pdf' || (file.mimetype || '').includes('pdf');
+    if (!isPdf) {
+      return cb(new Error('Nur PDF-Dateien sind erlaubt.'));
+    }
+    cb(null, true);
+  }
+});
+
+export const uploadBillingTemplateMiddleware = upload.single('templatePdf');
+
+export const listTemplates = async (req, res) => {
+  try {
+    const { authcode: userToken } = req.headers;
+    const { clubId } = req.params;
+    const result = await billingService.listTemplates(userToken, clubId);
+    res.status(result.status).json(result.response);
+  } catch (error) {
+    console.error('[listTemplates] Error:', error);
+    res.status(500).json({ success: false, error: 'Vorlagen konnten nicht geladen werden.' });
+  }
+};
+
+export const createTemplate = async (req, res) => {
+  try {
+    const { authcode: userToken } = req.headers;
+    const { clubId } = req.params;
+    const result = await billingService.createTemplate(userToken, clubId, req.body || {}, req.file);
+    res.status(result.status).json(result.response);
+  } catch (error) {
+    console.error('[createTemplate] Error:', error);
+    res.status(500).json({ success: false, error: 'Vorlage konnte nicht gespeichert werden.' });
+  }
+};
+
+export const deleteTemplate = async (req, res) => {
+  try {
+    const { authcode: userToken } = req.headers;
+    const { templateId } = req.params;
+    const result = await billingService.deleteTemplate(userToken, templateId);
+    res.status(result.status).json(result.response);
+  } catch (error) {
+    console.error('[deleteTemplate] Error:', error);
+    res.status(500).json({ success: false, error: 'Vorlage konnte nicht gelöscht werden.' });
+  }
+};
+
+export const updateTemplateFields = async (req, res) => {
+  try {
+    const { authcode: userToken } = req.headers;
+    const { templateId } = req.params;
+    const result = await billingService.saveTemplateFields(userToken, templateId, req.body?.fields || []);
+    res.status(result.status).json(result.response);
+  } catch (error) {
+    console.error('[updateTemplateFields] Error:', error);
+    res.status(500).json({ success: false, error: 'Felder konnten nicht gespeichert werden.' });
+  }
+};
+
+export const createRun = async (req, res) => {
+  try {
+    const { authcode: userToken } = req.headers;
+    const { clubId } = req.params;
+    const result = await billingService.createRun(userToken, clubId, req.body || {});
+    res.status(result.status).json(result.response);
+  } catch (error) {
+    console.error('[createRun] Error:', error);
+    res.status(500).json({ success: false, error: 'Abrechnungslauf konnte nicht erstellt werden.' });
+  }
+};
+
+export const listRuns = async (req, res) => {
+  try {
+    const { authcode: userToken } = req.headers;
+    const { clubId } = req.params;
+    const result = await billingService.listRuns(userToken, clubId);
+    res.status(result.status).json(result.response);
+  } catch (error) {
+    console.error('[listRuns] Error:', error);
+    res.status(500).json({ success: false, error: 'Abrechnungsläufe konnten nicht geladen werden.' });
+  }
+};
+
+export const getRunDetails = async (req, res) => {
+  try {
+    const { authcode: userToken } = req.headers;
+    const { runId } = req.params;
+    const result = await billingService.getRunDetails(userToken, runId);
+    res.status(result.status).json(result.response);
+  } catch (error) {
+    console.error('[getRunDetails] Error:', error);
+    res.status(500).json({ success: false, error: 'Abrechnungslauf konnte nicht geladen werden.' });
+  }
+};
+
+export const deleteRun = async (req, res) => {
+  try {
+    const { authcode: userToken } = req.headers;
+    const { runId } = req.params;
+    const result = await billingService.deleteRun(userToken, runId);
+    res.status(result.status).json(result.response);
+  } catch (error) {
+    console.error('[deleteRun] Error:', error);
+    res.status(500).json({ success: false, error: 'Abrechnung konnte nicht gelöscht werden.' });
+  }
+};
+
+export const getUserSettings = async (req, res) => {
+  try {
+    const { authcode: userToken } = req.headers;
+    const { clubId } = req.params;
+    const result = await billingService.getUserSettings(userToken, clubId);
+    res.status(result.status).json(result.response);
+  } catch (error) {
+    console.error('[getUserSettings] Error:', error);
+    res.status(500).json({ success: false, error: 'Einstellungen konnten nicht geladen werden.' });
+  }
+};
+
+export const calculateHoursPreview = async (req, res) => {
+  try {
+    const { authcode: userToken } = req.headers;
+    const { clubId } = req.params;
+    const { monthFrom, monthTo } = req.query;
+    const result = await billingService.calculateHoursPreview(userToken, clubId, monthFrom, monthTo);
+    res.status(result.status).json(result.response);
+  } catch (error) {
+    console.error('[calculateHoursPreview] Error:', error);
+    res.status(500).json({ success: false, error: 'Stunden konnten nicht berechnet werden.' });
+  }
+};
+
+export const generateRun = async (req, res) => {
+  try {
+    const { authcode: userToken } = req.headers;
+    const { runId } = req.params;
+    const result = await billingService.generateRun(userToken, runId, req.body || {});
+    res.status(result.status).json(result.response);
+  } catch (error) {
+    console.error('[generateRun] Error:', error);
+    const message = String(error?.message || '');
+    if (message.includes('Formularfelder') || message.includes('Feldnamen') || message.includes('Fehlend:')) {
+      return res.status(400).json({ success: false, error: message });
+    }
+    res.status(500).json({ success: false, error: 'Abrechnung konnte nicht erzeugt werden.' });
+  }
+};
+
+export const downloadTemplatePdf = async (req, res) => {
+  try {
+    const { authcode: userToken } = req.headers;
+    const { templateId } = req.params;
+    const result = await billingService.downloadTemplatePdf(userToken, templateId);
+    if (result.status !== 200) {
+      return res.status(result.status).json(result.response);
+    }
+    res.setHeader('Content-Disposition', `inline; filename="${result.file.name}"`);
+    res.setHeader('Content-Type', result.file.mimeType);
+    return res.sendFile(result.file.path);
+  } catch (error) {
+    console.error('[downloadTemplatePdf] Error:', error);
+    res.status(500).json({ success: false, error: 'PDF konnte nicht geladen werden.' });
+  }
+};
+
+export const downloadRunPdf = async (req, res) => {
+  try {
+    const { authcode: userToken } = req.headers;
+    const { runId } = req.params;
+    const result = await billingService.downloadGeneratedRunPdf(userToken, runId);
+    if (result.status !== 200) {
+      return res.status(result.status).json(result.response);
+    }
+    res.setHeader('Content-Disposition', `attachment; filename="${result.file.name}"`);
+    res.setHeader('Content-Type', result.file.mimeType);
+    return res.sendFile(result.file.path);
+  } catch (error) {
+    console.error('[downloadRunPdf] Error:', error);
+    res.status(500).json({ success: false, error: 'Abrechnungs-PDF konnte nicht geladen werden.' });
+  }
+};

backend/controllers/calendarController.js

@@ -0,0 +1,20 @@
+import calendarHolidayService from '../services/calendarHolidayService.js';
+
+export const getClubCalendarDays = async (req, res) => {
+  try {
+    const { authcode: token } = req.headers;
+    const { clubId } = req.params;
+    const { year } = req.query;
+    const result = await calendarHolidayService.getClubCalendarDays(token, clubId, year);
+    res.status(200).json(result);
+  } catch (error) {
+    if (error.message === 'clubnotfound') {
+      res.status(404).json({ error: 'clubnotfound' });
+    } else if (error.message === 'noaccess') {
+      res.status(403).json({ error: 'noaccess' });
+    } else {
+      console.error('[getClubCalendarDays] - error:', error);
+      res.status(502).json({ error: 'calendarproviderfailed' });
+    }
+  }
+};

backend/controllers/calendarEventController.js

@@ -0,0 +1,42 @@
+import calendarEventService from '../services/calendarEventService.js';
+import { getSafeErrorMessage } from '../utils/errorUtils.js';
+
+export const listClubCalendarEvents = async (req, res) => {
+  try {
+    const { authcode: userToken } = req.headers;
+    const { clubId } = req.params;
+    const { year } = req.query;
+    const events = await calendarEventService.listClubEvents(userToken, clubId, year);
+    res.status(200).json(events);
+  } catch (error) {
+    console.error('[listClubCalendarEvents] - Error:', error);
+    const msg = getSafeErrorMessage(error, 'Fehler beim Laden der Kalender-Events');
+    res.status(error.statusCode || 500).json({ error: msg });
+  }
+};
+
+export const createClubCalendarEvent = async (req, res) => {
+  try {
+    const { authcode: userToken } = req.headers;
+    const { clubId } = req.params;
+    const event = await calendarEventService.createClubEvent(userToken, clubId, req.body);
+    res.status(201).json(event);
+  } catch (error) {
+    console.error('[createClubCalendarEvent] - Error:', error);
+    const msg = getSafeErrorMessage(error, 'Fehler beim Speichern des Kalender-Events');
+    res.status(error.statusCode || 500).json({ error: msg });
+  }
+};
+
+export const deleteClubCalendarEvent = async (req, res) => {
+  try {
+    const { authcode: userToken } = req.headers;
+    const { clubId, eventId } = req.params;
+    const result = await calendarEventService.deleteClubEvent(userToken, clubId, eventId);
+    res.status(200).json(result);
+  } catch (error) {
+    console.error('[deleteClubCalendarEvent] - Error:', error);
+    const msg = getSafeErrorMessage(error, 'Fehler beim Löschen des Kalender-Events');
+    res.status(error.statusCode || 500).json({ error: msg });
+  }
+};

backend/controllers/clickTtAccountController.js

@@ -0,0 +1,72 @@
+import clickTtAccountService from '../services/clickTtAccountService.js';
+import HttpError from '../exceptions/HttpError.js';
+
+class ClickTtAccountController {
+  async getAccount(req, res, next) {
+    try {
+      const account = await clickTtAccountService.getAccount(req.user.id);
+      res.status(200).json({ account });
+    } catch (error) {
+      next(error);
+    }
+  }
+
+  async getStatus(req, res, next) {
+    try {
+      const status = await clickTtAccountService.checkAccountStatus(req.user.id);
+      res.status(200).json(status);
+    } catch (error) {
+      next(error);
+    }
+  }
+
+  async upsertAccount(req, res, next) {
+    try {
+      const { username, password, savePassword, userPassword } = req.body;
+      if (!username) {
+        throw new HttpError('Benutzername erforderlich', 400);
+      }
+      if (password && !userPassword) {
+        throw new HttpError('App-Passwort erforderlich zum Setzen des HTTV-/click-TT-Passworts', 400);
+      }
+
+      const account = await clickTtAccountService.upsertAccount(
+        req.user.id,
+        username,
+        password,
+        savePassword || false,
+        userPassword
+      );
+
+      res.status(200).json({
+        message: 'HTTV-/click-TT-Account erfolgreich gespeichert',
+        account
+      });
+    } catch (error) {
+      next(error);
+    }
+  }
+
+  async deleteAccount(req, res, next) {
+    try {
+      const deleted = await clickTtAccountService.deleteAccount(req.user.id);
+      if (!deleted) {
+        throw new HttpError('Kein HTTV-/click-TT-Account gefunden', 404);
+      }
+      res.status(200).json({ message: 'HTTV-/click-TT-Account gelöscht' });
+    } catch (error) {
+      next(error);
+    }
+  }
+
+  async verifyLogin(req, res, next) {
+    try {
+      const result = await clickTtAccountService.verifyLogin(req.user.id, req.body.password);
+      res.status(200).json({ success: true, message: 'Login erfolgreich', ...result });
+    } catch (error) {
+      next(error);
+    }
+  }
+}
+
+export default new ClickTtAccountController();

backend/controllers/clubAccountController.js

@@ -0,0 +1,60 @@
+import clubAccountService from '../services/clubAccountService.js';
+
+class ClubAccountController {
+  async listClubAccounts(req, res) {
+    try {
+      const { clubId } = req.params;
+      const accounts = await clubAccountService.listClubAccounts(Number(clubId));
+      res.json({ accounts });
+    } catch (error) {
+      console.error('[listClubAccounts] - Error:', error);
+      res.status(error?.status || 500).json({ error: error?.message || 'Konten konnten nicht geladen werden.' });
+    }
+  }
+
+  async createClubAccount(req, res) {
+    try {
+      const { clubId } = req.params;
+      const account = await clubAccountService.createClubAccount(Number(clubId), req.body || {});
+      res.status(201).json({ account });
+    } catch (error) {
+      console.error('[createClubAccount] - Error:', error);
+      res.status(error?.status || 500).json({ error: error?.message || 'Konto konnte nicht gespeichert werden.' });
+    }
+  }
+
+  async updateClubAccount(req, res) {
+    try {
+      const { clubId, accountId } = req.params;
+      const account = await clubAccountService.updateClubAccount(Number(clubId), Number(accountId), req.body || {});
+      res.json({ account });
+    } catch (error) {
+      console.error('[updateClubAccount] - Error:', error);
+      res.status(error?.status || 500).json({ error: error?.message || 'Konto konnte nicht gespeichert werden.' });
+    }
+  }
+
+  async updateClubAccountStatus(req, res) {
+    try {
+      const { clubId, accountId } = req.params;
+      const account = await clubAccountService.updateClubAccountStatus(Number(clubId), Number(accountId), String(req.body?.status || ''));
+      res.json({ account });
+    } catch (error) {
+      console.error('[updateClubAccountStatus] - Error:', error);
+      res.status(error?.status || 500).json({ error: error?.message || 'Kontostatus konnte nicht gespeichert werden.' });
+    }
+  }
+
+  async deleteClubAccount(req, res) {
+    try {
+      const { clubId, accountId } = req.params;
+      await clubAccountService.deleteClubAccount(Number(clubId), Number(accountId));
+      res.json({ success: true });
+    } catch (error) {
+      console.error('[deleteClubAccount] - Error:', error);
+      res.status(error?.status || 500).json({ error: error?.message || 'Konto konnte nicht gelöscht werden.' });
+    }
+  }
+}
+
+export default new ClubAccountController();

backend/controllers/clubArchiveController.js

@@ -0,0 +1,19 @@
+import clubArchiveService from '../services/clubArchiveService.js';
+
+class ClubArchiveController {
+  async getClubArchive(req, res) {
+    try {
+      const { clubId } = req.params;
+      const archive = await clubArchiveService.getClubArchive(clubId);
+      res.json(archive);
+    } catch (error) {
+      console.error('[getClubArchive] - Error:', error);
+      if (error?.status) {
+        return res.status(error.status).json({ error: error.message });
+      }
+      res.status(500).json({ error: 'Fehler beim Laden des Vereinsarchivs' });
+    }
+  }
+}
+
+export default new ClubArchiveController();

backend/controllers/clubDashboardController.js

@@ -0,0 +1,557 @@
+import { Op } from 'sequelize';
+import sequelize from '../database.js';
+import {
+  CalendarEvent,
+  ClubPaymentClaim,
+  ClubRequest,
+  ClubSepaMandate,
+  ClubTask,
+  Match,
+  Member,
+  TrainingGroup,
+} from '../models/index.js';
+import { getSafeErrorMessage } from '../utils/errorUtils.js';
+
+function formatRequestWorkflowStage(stage) {
+  return {
+    contact_replied: 'Kontakt beantwortet',
+    trial_training_scheduled: 'Probetraining terminiert',
+    trial_training_feedback_recorded: 'Probetraining nachbereitet',
+    membership_reviewed: 'Mitgliedsanfrage geprüft',
+    admission_prepared: 'Aufnahme vorbereitet',
+    member_record_created: 'Mitglied angelegt',
+    sepa_pending: 'SEPA ausstehend',
+    onboarding_completed: 'Onboarding abgeschlossen',
+    sponsoring_contacted: 'Sponsoring kontaktiert',
+  }[stage] || stage;
+}
+
+function formatTaskType(taskType) {
+  return {
+    request_contact_reply: 'Kontaktanfrage beantworten',
+    request_schedule_trial_training: 'Probetraining organisieren',
+    request_trial_training_follow_up: 'Probetraining nachbereiten',
+    request_membership_review: 'Mitgliedsanfrage prüfen',
+    membership_prepare_admission: 'Aufnahme vorbereiten',
+    membership_create_member_record: 'Mitglied anlegen',
+    membership_collect_sepa_mandate: 'SEPA organisieren',
+    membership_assign_fee: 'Beitrag zuordnen',
+    request_sponsoring_reply: 'Sponsoring nachfassen',
+    member_missing_email: 'E-Mail ergänzen',
+    member_missing_birthdate: 'Geburtsdatum ergänzen',
+    member_missing_sepa_mandate: 'SEPA-Mandat einholen',
+    payment_claim_due_soon: 'Fällige Zahlung vorbereiten',
+    payment_claim_overdue: 'Überfällige Zahlung nachfassen',
+    payment_claim_reminder: 'Mahnstufe prüfen',
+    calendar_event_prepare: 'Termin vorbereiten',
+    calendar_event_deadline_check: 'Terminfrist prüfen',
+  }[taskType] || taskType || 'Freie Aufgabe';
+}
+
+function formatEventDateRange(event) {
+  if (!event?.startDate) {
+    return null;
+  }
+
+  const formatter = new Intl.DateTimeFormat('de-DE', { dateStyle: 'medium' });
+  const start = formatter.format(new Date(event.startDate));
+  const end = event.endDate ? formatter.format(new Date(event.endDate)) : start;
+  return start === end ? start : `${start} bis ${end}`;
+}
+
+function formatDate(value, options = { dateStyle: 'medium' }) {
+  if (!value) {
+    return null;
+  }
+
+  return new Intl.DateTimeFormat('de-DE', options).format(new Date(value));
+}
+
+function formatTime(value) {
+  if (!value) {
+    return null;
+  }
+
+  return String(value).slice(0, 5);
+}
+
+function formatWeekday(weekday) {
+  return ['Sonntag', 'Montag', 'Dienstag', 'Mittwoch', 'Donnerstag', 'Freitag', 'Samstag'][Number(weekday)] || 'Unbekannt';
+}
+
+function formatConfiguredTrainingLabel(entry) {
+  const start = formatTime(entry.startTime);
+  const end = formatTime(entry.endTime);
+  const timeRange = start && end ? `${start} bis ${end} Uhr` : start ? `${start} Uhr` : null;
+
+  return [entry.groupName, formatWeekday(entry.weekday), timeRange].filter(Boolean).join(' · ');
+}
+
+function formatMatchLabel(match) {
+  const date = formatDate(match.date);
+  const time = formatTime(match.time);
+  const homeTeam = match.homeTeam?.name || 'Heimteam';
+  const guestTeam = match.guestTeam?.name || 'Gastteam';
+  const league = match.leagueDetails?.name || null;
+
+  return [
+    `${homeTeam} gegen ${guestTeam}`,
+    date,
+    time ? `${time} Uhr` : null,
+    league,
+  ].filter(Boolean).join(' · ');
+}
+
+function createDashboardItem(label, to, extra = {}) {
+  return { label, to, ...extra };
+}
+
+function buildMemberRoute(memberId, scope = 'active', extraQuery = {}) {
+  return {
+    path: '/members',
+    query: {
+      scope,
+      memberId: String(memberId),
+      mode: 'edit',
+      ...extraQuery,
+    },
+  };
+}
+
+function buildRequestRoute(requestId, status = '') {
+  const query = { requestId: String(requestId) };
+  if (status) {
+    query.status = status;
+  }
+  return {
+    path: '/club-requests',
+    query,
+  };
+}
+
+function buildTaskRoute(taskId, status = '') {
+  const query = { taskId: String(taskId) };
+  if (status) {
+    query.status = status;
+  }
+  return {
+    path: '/club-tasks',
+    query,
+  };
+}
+
+async function loadAvailableTables() {
+  const tables = await sequelize.getQueryInterface().showAllTables();
+  return new Set(
+    tables
+      .map((table) => (typeof table === 'string' ? table : Object.values(table || {})[0]))
+      .filter(Boolean)
+      .map((table) => String(table).toLowerCase())
+  );
+}
+
+async function loadOptionalTableData(availableTables, tableName, loader, fallbackValue = []) {
+  if (!availableTables.has(String(tableName).toLowerCase())) {
+    return fallbackValue;
+  }
+
+  return loader();
+}
+
+function countMissingMemberFields(members) {
+  const missing = {
+    email: 0,
+    birthDate: 0,
+  };
+
+  for (const member of members) {
+    if (!String(member.email || '').trim()) {
+      missing.email += 1;
+    }
+    if (!String(member.birthDate || '').trim()) {
+      missing.birthDate += 1;
+    }
+  }
+
+  return missing;
+}
+
+function toNextOccurrenceDate(weekday, startTime) {
+  const now = new Date();
+  const result = new Date(now);
+  const targetWeekday = Number(weekday);
+  const daysUntilWeekday = (targetWeekday - result.getDay() + 7) % 7;
+  result.setDate(result.getDate() + daysUntilWeekday);
+
+  const [hours = '0', minutes = '0'] = String(startTime || '00:00').split(':');
+  result.setHours(Number(hours), Number(minutes), 0, 0);
+
+  if (result < now) {
+    result.setDate(result.getDate() + 7);
+  }
+
+  return result;
+}
+
+function buildUpcomingTrainingSlots(groups, limit = 5) {
+  return groups
+    .flatMap((group) => (Array.isArray(group.trainingTimes) ? group.trainingTimes.map((time) => ({
+      id: time.id,
+      weekday: time.weekday,
+      startTime: time.startTime,
+      endTime: time.endTime,
+      sortOrder: time.sortOrder,
+      groupName: group.name,
+      nextOccurrence: toNextOccurrenceDate(time.weekday, time.startTime),
+    })) : []))
+    .sort((left, right) => {
+      const timeDiff = left.nextOccurrence.getTime() - right.nextOccurrence.getTime();
+      if (timeDiff !== 0) return timeDiff;
+      return String(left.groupName || '').localeCompare(String(right.groupName || ''));
+    })
+    .slice(0, limit);
+}
+
+export const getClubDashboard = async (req, res) => {
+  try {
+    const clubId = Number(req.params.clubId);
+    const currentUserId = Number(req.user?.id) || null;
+    const today = new Date();
+    today.setHours(0, 0, 0, 0);
+    const todayIso = today.toISOString().slice(0, 10);
+    const availableTables = await loadAvailableTables();
+
+    const [
+      requests,
+      tasks,
+      members,
+      mandates,
+      paymentClaims,
+      upcomingEvents,
+      trainingGroups,
+      upcomingMatches,
+    ] = await Promise.all([
+      loadOptionalTableData(availableTables, 'club_requests', () => ClubRequest.findAll({
+        where: {
+          clubId,
+          status: { [Op.notIn]: ['archived'] },
+        },
+        order: [['receivedAt', 'DESC']],
+      })),
+      loadOptionalTableData(availableTables, 'club_tasks', () => ClubTask.findAll({
+        where: {
+          clubId,
+          status: { [Op.notIn]: ['archived'] },
+        },
+        order: [['dueAt', 'ASC'], ['updatedAt', 'DESC']],
+      })),
+      Member.findAll({
+        where: {
+          clubId,
+          active: true,
+        },
+        order: [['createdAt', 'DESC']],
+      }),
+      loadOptionalTableData(availableTables, 'club_sepa_mandates', () => ClubSepaMandate.findAll({
+        where: {
+          clubId,
+          status: 'active',
+          revokedAt: null,
+          memberId: { [Op.ne]: null },
+        },
+        attributes: ['memberId'],
+      })),
+      loadOptionalTableData(availableTables, 'club_payment_claims', () => ClubPaymentClaim.findAll({
+        where: {
+          clubId,
+          status: { [Op.in]: ['open', 'partially_paid'] },
+          archivedAt: null,
+        },
+        order: [['dueOn', 'ASC']],
+      })),
+      loadOptionalTableData(availableTables, 'calendar_events', () => CalendarEvent.findAll({
+        where: {
+          clubId,
+          endDate: { [Op.gte]: todayIso },
+        },
+        order: [['startDate', 'ASC']],
+        limit: 5,
+      })),
+      loadOptionalTableData(availableTables, 'training_group', () => TrainingGroup.findAll({
+        where: {
+          clubId,
+        },
+        include: [
+          {
+            association: 'trainingTimes',
+            required: false,
+          },
+        ],
+        order: [['isPreset', 'DESC'], ['sortOrder', 'ASC'], ['name', 'ASC']],
+      })),
+      loadOptionalTableData(availableTables, 'match', () => Match.findAll({
+        where: {
+          clubId,
+          date: { [Op.gte]: today },
+        },
+        include: [
+          { association: 'homeTeam', attributes: ['id', 'name'] },
+          { association: 'guestTeam', attributes: ['id', 'name'] },
+          { association: 'leagueDetails', attributes: ['id', 'name'] },
+        ],
+        order: [['date', 'ASC'], ['time', 'ASC']],
+        limit: 5,
+      })),
+    ]);
+
+    const visibleDashboardTasks = tasks.filter((task) => !task.assignedUserId || Number(task.assignedUserId) === currentUserId);
+    const membersById = new Map(members.map((member) => [Number(member.id), member]));
+    const paymentClaimsById = new Map(paymentClaims.map((claim) => [Number(claim.id), claim]));
+    const missingFields = countMissingMemberFields(members);
+    const openTasks = visibleDashboardTasks.filter((task) => task.status === 'open');
+    const inProgressTasks = visibleDashboardTasks.filter((task) => task.status === 'in_progress');
+    const automatedTasks = visibleDashboardTasks.filter((task) => Boolean(task.automationKey));
+    const automatedOpenTasks = automatedTasks.filter((task) => ['open', 'in_progress', 'waiting'].includes(task.status));
+    const overdueTaskCount = visibleDashboardTasks.filter((task) => {
+      if (!task.dueAt || ['done', 'cancelled', 'archived'].includes(task.status)) {
+        return false;
+      }
+      return new Date(task.dueAt) < today;
+    }).length;
+    const memberIdsWithMandate = new Set(mandates.map((mandate) => Number(mandate.memberId)).filter(Boolean));
+    const missingMandateCount = members.filter((member) => !memberIdsWithMandate.has(Number(member.id))).length;
+    const openRequestCount = requests.filter((request) => request.status === 'open').length;
+    const inProgressRequestCount = requests.filter((request) => request.status === 'in_progress').length;
+    const trialTrainingCount = requests.filter((request) => request.requestType === 'trial_training' && request.status !== 'archived').length;
+    const workflowStageCounts = requests.reduce((accumulator, request) => {
+      if (!request.workflowStage) return accumulator;
+      accumulator[request.workflowStage] = (accumulator[request.workflowStage] || 0) + 1;
+      return accumulator;
+    }, {});
+    const onboardingCount =
+      (workflowStageCounts.membership_reviewed || 0) +
+      (workflowStageCounts.admission_prepared || 0) +
+      (workflowStageCounts.member_record_created || 0) +
+      (workflowStageCounts.sepa_pending || 0);
+    const duePaymentCount = paymentClaims.filter((claim) => claim.status === 'open').length;
+    const reminderCount = paymentClaims.filter((claim) => Number(claim.reminderLevel || 0) > 0).length;
+    const recentMembers = members.slice(0, 4);
+    const upcomingTrainings = buildUpcomingTrainingSlots(trainingGroups);
+    const paidRatio = paymentClaims.length === 0
+      ? null
+      : Math.max(
+        0,
+        Math.round(
+          ((paymentClaims.length - duePaymentCount) / paymentClaims.length) * 100
+        )
+      );
+
+    function taskDetailTarget(task) {
+      if (task.relatedEntityType === 'member' && task.relatedEntityId) {
+        return buildMemberRoute(task.relatedEntityId, 'active');
+      }
+
+      if (task.relatedEntityType === 'club_request' && task.relatedEntityId) {
+        const request = requests.find((entry) => Number(entry.id) === Number(task.relatedEntityId));
+        return buildRequestRoute(task.relatedEntityId, request?.status || '');
+      }
+
+      if (task.relatedEntityType === 'club_payment_claim' && task.relatedEntityId) {
+        const claim = paymentClaimsById.get(Number(task.relatedEntityId));
+        if (claim?.memberId) {
+          return buildMemberRoute(claim.memberId, 'active');
+        }
+      }
+
+      return buildTaskRoute(task.id, task.status || '');
+    }
+
+    function taskDashboardItem(task, label) {
+      return createDashboardItem(label, taskDetailTarget(task), {
+        isAssignedToCurrentUser: Boolean(task.assignedUserId) && Number(task.assignedUserId) === currentUserId,
+      });
+    }
+
+    const sections = [
+      {
+        id: 'action-needed',
+        title: 'Handlungsbedarf',
+        cards: [
+          {
+            title: 'Neue Anfragen',
+            value: `${openRequestCount + inProgressRequestCount}`,
+            meta: trialTrainingCount > 0 ? `${trialTrainingCount} Probetrainings` : null,
+            to: '/club-requests',
+            items: [
+              createDashboardItem(`${openRequestCount} offen`, '/club-requests'),
+              createDashboardItem(`${inProgressRequestCount} in Bearbeitung`, '/club-requests'),
+            ],
+          },
+          {
+            title: 'Anfrage-Workflows',
+            value: `${onboardingCount}`,
+            meta: onboardingCount > 0 ? 'im Aufnahme- und Onboardingprozess' : 'Keine aktiven Onboarding-Fälle',
+            to: '/club-requests',
+            items: [
+              createDashboardItem(`${workflowStageCounts.trial_training_scheduled || 0} Probetrainings terminiert`, '/club-requests'),
+              createDashboardItem(`${workflowStageCounts.membership_reviewed || 0} Mitgliedsanfragen geprüft`, '/club-requests'),
+              createDashboardItem(`${workflowStageCounts.sepa_pending || 0} Fälle mit ausstehendem SEPA`, '/club-requests'),
+            ],
+          },
+          {
+            title: 'Offene Zahlungen',
+            value: `${paymentClaims.length}`,
+            meta: reminderCount > 0 ? `${reminderCount} mit Mahnstufe` : 'Keine Mahnungen aktiv',
+            to: '/club-tasks',
+            items: paymentClaims.slice(0, 3).map((claim) => {
+              const amount = `${(Number(claim.amountCents) / 100).toFixed(2)} ${claim.currencyCode || 'EUR'}`;
+              return createDashboardItem(
+                `${amount} fällig am ${claim.dueOn}`,
+                claim.memberId ? buildMemberRoute(claim.memberId, 'active') : '/club-tasks'
+              );
+            }),
+          },
+          {
+            title: 'Fehlende Daten',
+            value: `${missingFields.email + missingFields.birthDate + missingMandateCount}`,
+            to: '/members',
+            items: [
+              createDashboardItem(`${missingFields.email} Mitglieder ohne E-Mail`, { path: '/members', query: { scope: 'dataIncomplete' } }),
+              createDashboardItem(`${missingFields.birthDate} Mitglieder ohne Geburtsdatum`, { path: '/members', query: { scope: 'dataIncomplete' } }),
+              createDashboardItem(`${missingMandateCount} Mitglieder ohne SEPA-Mandat`, { path: '/members', query: { scope: 'dataIncomplete' } }),
+            ],
+          },
+          {
+            title: 'Offene Aufgaben',
+            value: `${openTasks.length + inProgressTasks.length}`,
+            meta: overdueTaskCount > 0 ? `${overdueTaskCount} überfällig` : 'Keine überfälligen Aufgaben',
+            to: '/club-tasks',
+            items: [
+              createDashboardItem(`${automatedOpenTasks.length} automatisch erzeugte Schritte`, '/club-tasks'),
+              ...visibleDashboardTasks.slice(0, 3).map((task) => taskDashboardItem(task, task.title)),
+            ],
+          },
+        ],
+      },
+      {
+        id: 'appointments',
+        title: 'Aktuelle Termine',
+        cards: [
+          {
+            title: 'Nächste Trainings',
+            value: `${upcomingTrainings.length}`,
+            to: {
+              path: '/club-settings',
+              query: { tab: 'training-times' },
+            },
+            items: upcomingTrainings.map((training) => createDashboardItem(
+              formatConfiguredTrainingLabel(training),
+              {
+                path: '/club-settings',
+                query: { tab: 'training-times' },
+              }
+            )),
+          },
+          {
+            title: 'Nächste Spiele',
+            value: `${upcomingMatches.length}`,
+            to: '/schedule',
+            items: upcomingMatches.map((match) => createDashboardItem(formatMatchLabel(match), '/schedule')),
+          },
+          {
+            title: 'Kalendertermine',
+            value: `${upcomingEvents.length}`,
+            to: '/calendar',
+            items: upcomingEvents.map((event) => createDashboardItem(`${event.title} · ${formatEventDateRange(event)}`, '/calendar')),
+          },
+        ],
+      },
+      {
+        id: 'club-status',
+        title: 'Vereinsstatus',
+        cards: [
+          {
+            title: 'Mitglieder',
+            value: `${members.length} aktiv`,
+            meta: members.length > 0 ? `${members.filter((member) => {
+              const createdAt = new Date(member.createdAt);
+              return createdAt.getFullYear() === today.getFullYear();
+            }).length} dieses Jahr angelegt` : null,
+            to: '/members',
+            items: recentMembers.map((member) => {
+              const name = [member.firstName, member.lastName].filter(Boolean).join(' ').trim() || member.email || `Mitglied ${member.id}`;
+              return createDashboardItem(name, buildMemberRoute(member.id, 'active'));
+            }),
+          },
+          {
+            title: 'Anfragen',
+            value: `${requests.length}`,
+            meta: `${openRequestCount} offen, ${inProgressRequestCount} in Bearbeitung`,
+            to: '/club-requests',
+          },
+          {
+            title: 'Workflow-Fortschritt',
+            value: `${workflowStageCounts.onboarding_completed || 0}`,
+            meta: 'Onboardings abgeschlossen',
+            to: '/club-requests',
+            items: [
+              createDashboardItem(`${workflowStageCounts.admission_prepared || 0} Aufnahmen vorbereitet`, '/club-requests'),
+              createDashboardItem(`${workflowStageCounts.member_record_created || 0} Mitglieder angelegt`, '/club-requests'),
+              createDashboardItem(`${workflowStageCounts.sepa_pending || 0} warten auf SEPA`, '/club-requests'),
+            ],
+          },
+          {
+            title: 'Finanzen',
+            value: paidRatio === null ? 'Keine Daten' : `${paidRatio} % erledigt`,
+            meta: paymentClaims.length > 0 ? `${paymentClaims.length} offene oder teilweise offene Forderungen` : 'Noch keine Beitragsforderungen erfasst',
+            to: '/club-tasks',
+          },
+        ],
+      },
+      {
+        id: 'recent-activity',
+        title: 'Letzte Aktivitäten',
+        cards: [
+          {
+            title: 'Zuletzt eingegangen',
+            to: '/club-requests',
+            items: requests.slice(0, 4).map((request) => {
+              const name = [request.firstName, request.lastName].filter(Boolean).join(' ').trim() || request.email || 'Unbekannt';
+              const workflow = request.workflowStage ? ` · ${formatRequestWorkflowStage(request.workflowStage)}` : '';
+              return createDashboardItem(
+                `${name} · ${request.subject || request.requestType}${workflow}`,
+                buildRequestRoute(request.id, request.status || '')
+              );
+            }),
+          },
+          {
+            title: 'Aktuelle Aufgaben',
+            to: '/club-tasks',
+            items: visibleDashboardTasks.slice(0, 4).map((task) => taskDashboardItem(task, `${formatTaskType(task.taskType)} · ${task.status}`)),
+          },
+          {
+            title: 'Automatik zuletzt aktiv',
+            to: '/club-tasks',
+            items: automatedTasks.slice(0, 4).map((task) => {
+              const sourceLabel = task.automationSource === 'club_requests'
+                ? 'Anfrage'
+                : task.automationSource === 'club_payment_claims'
+                  ? 'Zahlung'
+                  : task.automationSource === 'calendar_events'
+                    ? 'Termin'
+                    : 'Workflow';
+              return taskDashboardItem(task, `${formatTaskType(task.taskType)} · ${sourceLabel}`);
+            }),
+          },
+        ],
+      },
+    ];
+
+    res.status(200).json({ sections });
+  } catch (error) {
+    console.error('[getClubDashboard] - Error:', error);
+    res.status(error.statusCode || 500).json({
+      error: getSafeErrorMessage(error, 'Dashboard konnte nicht geladen werden.'),
+    });
+  }
+};

backend/controllers/clubRequestController.js

@@ -0,0 +1,174 @@
+import { ClubRequest, ClubRequestNote } from '../models/index.js';
+import { getSafeErrorMessage } from '../utils/errorUtils.js';
+
+const TERMINAL_REQUEST_STATUSES = new Set(['converted', 'rejected', 'archived']);
+
+function isMissingRequestTableError(error) {
+  return error?.original?.code === 'ER_NO_SUCH_TABLE'
+    && /club_requests|club_request_notes/.test(String(error?.original?.sqlMessage || ''));
+}
+
+function normalizeRequestPayload(payload = {}) {
+  return {
+    requestType: payload.requestType || 'contact',
+    subject: payload.subject?.trim() || null,
+    firstName: payload.firstName?.trim() || null,
+    lastName: payload.lastName?.trim() || null,
+    email: payload.email?.trim() || null,
+    phone: payload.phone?.trim() || null,
+    message: payload.message?.trim() || null,
+  };
+}
+
+async function loadRequestOrThrow(clubId, requestId) {
+  const request = await ClubRequest.findOne({
+    where: {
+      id: requestId,
+      clubId,
+    },
+    include: [
+      {
+        model: ClubRequestNote,
+        as: 'notes',
+        required: false,
+      },
+    ],
+    order: [[{ model: ClubRequestNote, as: 'notes' }, 'createdAt', 'DESC']],
+  });
+
+  if (!request) {
+    const error = new Error('Anfrage wurde nicht gefunden.');
+    error.statusCode = 404;
+    throw error;
+  }
+
+  return request;
+}
+
+export const listClubRequests = async (req, res) => {
+  try {
+    const { clubId } = req.params;
+    let requests = [];
+    try {
+      requests = await ClubRequest.findAll({
+        where: { clubId },
+        include: [
+          {
+            model: ClubRequestNote,
+            as: 'notes',
+            required: false,
+          },
+        ],
+        order: [
+          ['receivedAt', 'DESC'],
+          [{ model: ClubRequestNote, as: 'notes' }, 'createdAt', 'DESC'],
+        ],
+      });
+    } catch (error) {
+      if (!isMissingRequestTableError(error)) {
+        throw error;
+      }
+    }
+
+    res.status(200).json({ requests });
+  } catch (error) {
+    console.error('[listClubRequests] - Error:', error);
+    res.status(error.statusCode || 500).json({
+      error: getSafeErrorMessage(error, 'Anfragen konnten nicht geladen werden.'),
+    });
+  }
+};
+
+export const createClubRequest = async (req, res) => {
+  try {
+    const { clubId } = req.params;
+    const payload = normalizeRequestPayload(req.body);
+
+    if (!payload.subject && !payload.message) {
+      return res.status(400).json({ error: 'Betreff oder Nachricht sind erforderlich.' });
+    }
+
+    const request = await ClubRequest.create({
+      clubId,
+      ...payload,
+      receivedAt: new Date(),
+    });
+
+    const created = await loadRequestOrThrow(clubId, request.id);
+    res.status(201).json({ request: created });
+  } catch (error) {
+    console.error('[createClubRequest] - Error:', error);
+    res.status(error.statusCode || 500).json({
+      error: getSafeErrorMessage(error, 'Anfrage konnte nicht gespeichert werden.'),
+    });
+  }
+};
+
+export const updateClubRequest = async (req, res) => {
+  try {
+    const { clubId, requestId } = req.params;
+    const request = await loadRequestOrThrow(clubId, requestId);
+    const payload = normalizeRequestPayload(req.body);
+
+    await request.update(payload);
+    const updated = await loadRequestOrThrow(clubId, requestId);
+    res.status(200).json({ request: updated });
+  } catch (error) {
+    console.error('[updateClubRequest] - Error:', error);
+    res.status(error.statusCode || 500).json({
+      error: getSafeErrorMessage(error, 'Anfrage konnte nicht gespeichert werden.'),
+    });
+  }
+};
+
+export const updateClubRequestStatus = async (req, res) => {
+  try {
+    const { clubId, requestId } = req.params;
+    const { status } = req.body || {};
+
+    if (!status) {
+      return res.status(400).json({ error: 'Status fehlt.' });
+    }
+
+    const request = await loadRequestOrThrow(clubId, requestId);
+    await request.update({
+      status,
+      closedAt: TERMINAL_REQUEST_STATUSES.has(status) ? new Date() : null,
+    });
+
+    const updated = await loadRequestOrThrow(clubId, requestId);
+    res.status(200).json({ request: updated });
+  } catch (error) {
+    console.error('[updateClubRequestStatus] - Error:', error);
+    res.status(error.statusCode || 500).json({
+      error: getSafeErrorMessage(error, 'Status konnte nicht gespeichert werden.'),
+    });
+  }
+};
+
+export const addClubRequestNote = async (req, res) => {
+  try {
+    const { clubId, requestId } = req.params;
+    const body = String(req.body?.body || '').trim();
+
+    if (!body) {
+      return res.status(400).json({ error: 'Notiztext fehlt.' });
+    }
+
+    await loadRequestOrThrow(clubId, requestId);
+
+    await ClubRequestNote.create({
+      clubRequestId: requestId,
+      createdByUserId: req.user?.id || null,
+      body,
+    });
+
+    const updated = await loadRequestOrThrow(clubId, requestId);
+    res.status(201).json({ request: updated });
+  } catch (error) {
+    console.error('[addClubRequestNote] - Error:', error);
+    res.status(error.statusCode || 500).json({
+      error: getSafeErrorMessage(error, 'Notiz konnte nicht gespeichert werden.'),
+    });
+  }
+};

backend/controllers/clubStatisticsController.js

@@ -0,0 +1,19 @@
+import clubStatisticsService from '../services/clubStatisticsService.js';
+
+class ClubStatisticsController {
+  async getClubStatistics(req, res) {
+    try {
+      const { clubId } = req.params;
+      const statistics = await clubStatisticsService.getClubStatistics(clubId);
+      res.json(statistics);
+    } catch (error) {
+      console.error('[getClubStatistics] - Error:', error);
+      if (error?.status) {
+        return res.status(error.status).json({ error: error.message });
+      }
+      res.status(500).json({ error: 'Fehler beim Laden der Vereinsstatistiken' });
+    }
+  }
+}
+
+export default new ClubStatisticsController();

backend/controllers/clubTaskController.js

@@ -0,0 +1,274 @@
+import { ClubTask, User, UserClub } from '../models/index.js';
+import { getSafeErrorMessage } from '../utils/errorUtils.js';
+import clubTaskAutomationService from '../services/clubTaskAutomationService.js';
+import clubWorkflowSourceService from '../services/clubWorkflowSourceService.js';
+
+const TERMINAL_TASK_STATUSES = new Set(['done', 'cancelled', 'archived']);
+
+function isMissingTaskTableError(error) {
+  return error?.original?.code === 'ER_NO_SUCH_TABLE'
+    && /club_tasks/.test(String(error?.original?.sqlMessage || ''));
+}
+
+function isMissingTaskSuppressionTableError(error) {
+  return error?.original?.code === 'ER_NO_SUCH_TABLE'
+    && /club_task_suppressions/.test(String(error?.original?.sqlMessage || ''));
+}
+
+function normalizeTaskPayload(payload = {}) {
+  return {
+    title: String(payload.title || '').trim(),
+    taskType: payload.taskType?.trim() || null,
+    description: payload.description?.trim() || null,
+    status: payload.status || 'open',
+    priority: payload.priority || 'normal',
+    dueAt: payload.dueAt || null,
+    remindAt: payload.remindAt || null,
+    assignedUserId: payload.assignedUserId ? Number(payload.assignedUserId) : null,
+    automationSource: payload.automationSource?.trim() || null,
+    automationKey: payload.automationKey?.trim() || null,
+    relatedEntityType: payload.relatedEntityType?.trim() || null,
+    relatedEntityId: payload.relatedEntityId ? Number(payload.relatedEntityId) : null,
+    sourceSnapshot: payload.sourceSnapshot || null,
+  };
+}
+
+async function loadAssignableUsers(clubId) {
+  const entries = await UserClub.findAll({
+    where: { clubId },
+    include: [{ model: User, as: 'user', attributes: ['id', 'email'] }],
+    order: [[{ model: User, as: 'user' }, 'email', 'ASC']],
+  });
+
+  return entries
+    .filter((entry) => entry.user)
+    .filter((entry) => entry.approved || entry.isOwner)
+    .map((entry) => ({
+      userId: entry.userId,
+      email: entry.user.email,
+      isOwner: Boolean(entry.isOwner),
+      approved: Boolean(entry.approved),
+    }));
+}
+
+async function validateAssignedUser(clubId, assignedUserId) {
+  if (!assignedUserId) {
+    return null;
+  }
+
+  const userClub = await UserClub.findOne({
+    where: {
+      clubId,
+      userId: assignedUserId,
+    },
+  });
+
+  if (!userClub || (!userClub.approved && !userClub.isOwner)) {
+    const error = new Error('Der zugewiesene Benutzer gehört nicht zu diesem Verein.');
+    error.statusCode = 400;
+    throw error;
+  }
+
+  return assignedUserId;
+}
+
+async function loadTaskOrThrow(clubId, taskId) {
+  const task = await ClubTask.findOne({
+    where: {
+      id: taskId,
+      clubId,
+    },
+  });
+
+  if (!task) {
+    const error = new Error('Aufgabe wurde nicht gefunden.');
+    error.statusCode = 404;
+    throw error;
+  }
+
+  return task;
+}
+
+export const listClubTasks = async (req, res) => {
+  try {
+    const { clubId } = req.params;
+    let tasks = [];
+    let automationOverview = { definitions: [], suggestions: [] };
+
+    try {
+      [tasks, automationOverview] = await Promise.all([
+        ClubTask.findAll({
+          where: { clubId },
+          include: [{ model: User, as: 'assignedUser', attributes: ['id', 'email'], required: false }],
+          order: [
+            ['status', 'ASC'],
+            ['dueAt', 'ASC'],
+            ['updatedAt', 'DESC'],
+          ],
+        }),
+        clubTaskAutomationService.buildAutomationOverview(clubId),
+      ]);
+    } catch (error) {
+      if (!isMissingTaskTableError(error)) {
+        throw error;
+      }
+    }
+
+    const assignableUsers = await loadAssignableUsers(clubId);
+
+    res.status(200).json({
+      tasks,
+      taskDefinitions: automationOverview.definitions,
+      taskSuggestions: automationOverview.suggestions,
+      assignableUsers,
+    });
+  } catch (error) {
+    console.error('[listClubTasks] - Error:', error);
+    res.status(error.statusCode || 500).json({
+      error: getSafeErrorMessage(error, 'Aufgaben konnten nicht geladen werden.'),
+    });
+  }
+};
+
+export const createClubTask = async (req, res) => {
+  try {
+    const { clubId } = req.params;
+    const payload = normalizeTaskPayload(req.body);
+
+    if (!payload.title) {
+      return res.status(400).json({ error: 'Titel ist erforderlich.' });
+    }
+
+    payload.assignedUserId = await validateAssignedUser(clubId, payload.assignedUserId);
+
+    const task = await ClubTask.create({
+      clubId,
+      ...payload,
+      createdByUserId: req.user?.id || null,
+    });
+
+    res.status(201).json({ task });
+  } catch (error) {
+    console.error('[createClubTask] - Error:', error);
+    res.status(error.statusCode || 500).json({
+      error: getSafeErrorMessage(error, 'Aufgabe konnte nicht gespeichert werden.'),
+    });
+  }
+};
+
+export const updateClubTask = async (req, res) => {
+  try {
+    const { clubId, taskId } = req.params;
+    const task = await loadTaskOrThrow(clubId, taskId);
+    const payload = normalizeTaskPayload(req.body);
+    const wasDoneBefore = task.status === 'done';
+
+    if (!payload.title) {
+      return res.status(400).json({ error: 'Titel ist erforderlich.' });
+    }
+
+    payload.assignedUserId = await validateAssignedUser(clubId, payload.assignedUserId);
+
+    await task.update({
+      ...payload,
+      completedAt: TERMINAL_TASK_STATUSES.has(payload.status) ? (task.completedAt || new Date()) : null,
+      archivedAt: payload.status === 'archived' ? (task.archivedAt || new Date()) : null,
+    });
+
+    const followUpTasks = !wasDoneBefore && payload.status === 'done'
+      ? await clubTaskAutomationService.materializeWorkflowFollowUps(task, req.user?.id || null)
+      : [];
+    const sourceUpdate = !wasDoneBefore && payload.status === 'done'
+      ? await clubWorkflowSourceService.syncSourceStateForCompletedTask(task)
+      : null;
+
+    res.status(200).json({ task, followUpTasks, sourceUpdate });
+  } catch (error) {
+    console.error('[updateClubTask] - Error:', error);
+    res.status(error.statusCode || 500).json({
+      error: getSafeErrorMessage(error, 'Aufgabe konnte nicht gespeichert werden.'),
+    });
+  }
+};
+
+export const updateClubTaskStatus = async (req, res) => {
+  try {
+    const { clubId, taskId } = req.params;
+    const { status } = req.body || {};
+    if (!status) {
+      return res.status(400).json({ error: 'Status fehlt.' });
+    }
+
+    const task = await loadTaskOrThrow(clubId, taskId);
+    const wasDoneBefore = task.status === 'done';
+    await task.update({
+      status,
+      completedAt: TERMINAL_TASK_STATUSES.has(status) ? (task.completedAt || new Date()) : null,
+      archivedAt: status === 'archived' ? (task.archivedAt || new Date()) : null,
+    });
+    const followUpTasks = !wasDoneBefore && status === 'done'
+      ? await clubTaskAutomationService.materializeWorkflowFollowUps(task, req.user?.id || null)
+      : [];
+    const sourceUpdate = !wasDoneBefore && status === 'done'
+      ? await clubWorkflowSourceService.syncSourceStateForCompletedTask(task)
+      : null;
+    res.status(200).json({ task, followUpTasks, sourceUpdate });
+  } catch (error) {
+    console.error('[updateClubTaskStatus] - Error:', error);
+    res.status(error.statusCode || 500).json({
+      error: getSafeErrorMessage(error, 'Status konnte nicht gespeichert werden.'),
+    });
+  }
+};
+
+export const materializeAutomatedClubTasks = async (req, res) => {
+  try {
+    const { clubId } = req.params;
+    const automationKeys = Array.isArray(req.body?.automationKeys) ? req.body.automationKeys : [];
+
+    if (automationKeys.length === 0) {
+      return res.status(400).json({ error: 'Es wurden keine Automatik-Schlüssel übergeben.' });
+    }
+
+    const tasks = await clubTaskAutomationService.materializeSuggestions(clubId, req.user?.id || null, automationKeys);
+    res.status(201).json({ tasks });
+  } catch (error) {
+    console.error('[materializeAutomatedClubTasks] - Error:', error);
+    res.status(error.statusCode || 500).json({
+      error: getSafeErrorMessage(error, 'Automatische Aufgaben konnten nicht erstellt werden.'),
+    });
+  }
+};
+
+export const dismissAutomatedClubTaskSuggestion = async (req, res) => {
+  try {
+    const { clubId } = req.params;
+    const payload = req.body || {};
+    const suppression = await clubTaskAutomationService.dismissSuggestion(clubId, req.user?.id || null, payload);
+    res.status(200).json({ success: true, suppression });
+  } catch (error) {
+    console.error('[dismissAutomatedClubTaskSuggestion] - Error:', error);
+    if (isMissingTaskSuppressionTableError(error)) {
+      return res.status(500).json({
+        error: 'Die Tabelle club_task_suppressions fehlt noch. Bitte die aktuelle SQL-Datei auf dem System ausführen.',
+      });
+    }
+    res.status(error.statusCode || 500).json({
+      error: getSafeErrorMessage(error, 'Vorschlag konnte nicht ausgeblendet werden.'),
+    });
+  }
+};
+
+export const deleteClubTask = async (req, res) => {
+  try {
+    const { clubId, taskId } = req.params;
+    const task = await loadTaskOrThrow(clubId, taskId);
+    await task.destroy();
+    res.status(200).json({ success: true });
+  } catch (error) {
+    console.error('[deleteClubTask] - Error:', error);
+    res.status(error.statusCode || 500).json({
+      error: getSafeErrorMessage(error, 'Aufgabe konnte nicht gelöscht werden.'),
+    });
+  }
+};

backend/controllers/clubTeamController.js

@@ -42,7 +42,7 @@ export const createClubTeam = async (req, res) => {
     try {
         const { authcode: token } = req.headers;
         const { clubid: clubId } = req.params;
-        const { name, leagueId, seasonId } = req.body;
+        const { name, leagueId, seasonId, teamGender, teamAgeGroup, plannedLeagueName } = req.body;
         
         const user = await getUserByToken(token);
         
@@ -50,11 +50,17 @@ export const createClubTeam = async (req, res) => {
             return res.status(400).json({ error: "missingname" });
         }
         
+        const planned = plannedLeagueName !== undefined && plannedLeagueName !== null
+            ? String(plannedLeagueName).trim() || null
+            : undefined;
         const clubTeamData = {
             name,
             clubId: parseInt(clubId),
             leagueId: leagueId ? parseInt(leagueId) : null,
-            seasonId: seasonId ? parseInt(seasonId) : null
+            seasonId: seasonId ? parseInt(seasonId) : null,
+            teamGender: teamGender || 'open',
+            teamAgeGroup: teamAgeGroup || 'adult',
+            ...(planned !== undefined ? { plannedLeagueName: planned } : {})
         };
         
         const newClubTeam = await ClubTeamService.createClubTeam(clubTeamData);
@@ -70,7 +76,7 @@ export const updateClubTeam = async (req, res) => {
     try {
         const { authcode: token } = req.headers;
         const { clubteamid: clubTeamId } = req.params;
-        const { name, leagueId, seasonId } = req.body;
+        const { name, leagueId, seasonId, teamGender, teamAgeGroup, plannedLeagueName } = req.body;
         
         const user = await getUserByToken(token);
         
@@ -78,6 +84,13 @@ export const updateClubTeam = async (req, res) => {
         if (name !== undefined) updateData.name = name;
         if (leagueId !== undefined) updateData.leagueId = leagueId ? parseInt(leagueId) : null;
         if (seasonId !== undefined) updateData.seasonId = seasonId ? parseInt(seasonId) : null;
+        if (teamGender !== undefined) updateData.teamGender = teamGender || 'open';
+        if (teamAgeGroup !== undefined) updateData.teamAgeGroup = teamAgeGroup || 'adult';
+        if (plannedLeagueName !== undefined) {
+            updateData.plannedLeagueName = plannedLeagueName === null || plannedLeagueName === ''
+                ? null
+                : String(plannedLeagueName).trim() || null;
+        }
         
         const success = await ClubTeamService.updateClubTeam(clubTeamId, updateData);
         if (!success) {
@@ -126,3 +139,47 @@ export const getLeagues = async (req, res) => {
         res.status(500).json({ error: "internalerror" });
     }
 };
+
+export const getClubTeamLineup = async (req, res) => {
+    try {
+        const { authcode: token } = req.headers;
+        const { clubteamid: clubTeamId } = req.params;
+        const lineupHalf = req.query.half === 'second_half' ? 'second_half' : 'first_half';
+        await getUserByToken(token);
+
+        const clubTeam = await ClubTeamService.getClubTeamById(clubTeamId);
+        if (!clubTeam) {
+            return res.status(404).json({ error: "notfound" });
+        }
+
+        const lineup = await ClubTeamService.getTeamLineup(clubTeamId, lineupHalf);
+        res.status(200).json(lineup);
+    } catch (error) {
+        console.error('[getClubTeamLineup] - Error:', error);
+        res.status(500).json({ error: "internalerror" });
+    }
+};
+
+export const updateClubTeamLineup = async (req, res) => {
+    try {
+        const { authcode: token } = req.headers;
+        const { clubteamid: clubTeamId } = req.params;
+        const { assignments, lineupHalf: requestLineupHalf } = req.body;
+        const lineupHalf = requestLineupHalf === 'second_half' || req.query.half === 'second_half' ? 'second_half' : 'first_half';
+        await getUserByToken(token);
+
+        const clubTeam = await ClubTeamService.getClubTeamById(clubTeamId);
+        if (!clubTeam) {
+            return res.status(404).json({ error: "notfound" });
+        }
+
+        const lineup = await ClubTeamService.replaceTeamLineup(clubTeamId, assignments, lineupHalf);
+        res.status(200).json(lineup);
+    } catch (error) {
+        console.error('[updateClubTeamLineup] - Error:', error);
+        if (error?.code === 'TEAM_LINEUP_TABLE_MISSING') {
+            return res.status(500).json({ error: 'teamlineuptablemissing' });
+        }
+        res.status(500).json({ error: "internalerror" });
+    }
+};

backend/controllers/clubVenueController.js

@@ -0,0 +1,52 @@
+import clubVenueService from '../services/clubVenueService.js';
+
+const handleError = (res, label, error) => {
+  if (error.message === 'noaccess') return res.status(403).json({ error: 'noaccess' });
+  if (error.statusCode || error.status) return res.status(error.statusCode || error.status).json({ error: error.message });
+  console.error(`[${label}] - error:`, error);
+  return res.status(500).json({ error: 'internalerror' });
+};
+
+export const listClubVenues = async (req, res) => {
+  try {
+    const { authcode: token } = req.headers;
+    const { clubId } = req.params;
+    const venues = await clubVenueService.list(token, clubId);
+    res.status(200).json(venues);
+  } catch (error) {
+    handleError(res, 'listClubVenues', error);
+  }
+};
+
+export const createClubVenue = async (req, res) => {
+  try {
+    const { authcode: token } = req.headers;
+    const { clubId } = req.params;
+    const venue = await clubVenueService.create(token, clubId, req.body);
+    res.status(201).json(venue);
+  } catch (error) {
+    handleError(res, 'createClubVenue', error);
+  }
+};
+
+export const updateClubVenue = async (req, res) => {
+  try {
+    const { authcode: token } = req.headers;
+    const { clubId, venueId } = req.params;
+    const venue = await clubVenueService.update(token, clubId, venueId, req.body);
+    res.status(200).json(venue);
+  } catch (error) {
+    handleError(res, 'updateClubVenue', error);
+  }
+};
+
+export const deleteClubVenue = async (req, res) => {
+  try {
+    const { authcode: token } = req.headers;
+    const { clubId, venueId } = req.params;
+    const result = await clubVenueService.delete(token, clubId, venueId);
+    res.status(200).json(result);
+  } catch (error) {
+    handleError(res, 'deleteClubVenue', error);
+  }
+};

backend/controllers/clubsController.js

@@ -60,8 +60,24 @@ export const updateClubSettings = async (req, res) => {
   try {
     const { authcode: token } = req.headers;
     const { clubid } = req.params;
-    const { greetingText, associationMemberNumber } = req.body;
-    const updated = await ClubService.updateClubSettings(token, clubid, { greetingText, associationMemberNumber });
+    const {
+      greetingText,
+      associationMemberNumber,
+      myTischtennisFedNickname,
+      autoFetchRankings,
+      countryCode,
+      stateCode,
+      memberDataQualityRequirements
+    } = req.body;
+    const updated = await ClubService.updateClubSettings(token, clubid, {
+      greetingText,
+      associationMemberNumber,
+      myTischtennisFedNickname,
+      autoFetchRankings,
+      countryCode,
+      stateCode,
+      memberDataQualityRequirements
+    });
     res.status(200).json(updated);
   } catch (error) {
     if (error.message === 'noaccess') {

backend/controllers/diaryController.js

@@ -18,14 +18,14 @@ const createDateForClub = async (req, res) => {
     try {
         const { clubId } = req.params;
         const { authcode: userToken } = req.headers;
-        const { date, trainingStart, trainingEnd } = req.body;
+        const { date, trainingStart, trainingEnd, excludeFromBilling } = req.body;
         if (!date) {
             throw new HttpError('The date field is required', 400);
         }
         if (isNaN(new Date(date).getTime())) {
             throw new HttpError('Invalid date format', 400);
         }
-        const newDate = await diaryService.createDateForClub(userToken, clubId, date, trainingStart, trainingEnd);
+        const newDate = await diaryService.createDateForClub(userToken, clubId, date, trainingStart, trainingEnd, excludeFromBilling);
         res.status(201).json(newDate);
     } catch (error) {
         console.error('[createDateForClub] - Error:', error);
@@ -37,15 +37,22 @@ const updateTrainingTimes = async (req, res) => {
     try {
         const { clubId } = req.params;
         const { authcode: userToken } = req.headers;
-        const { dateId, trainingStart, trainingEnd } = req.body;
-        if (!dateId || !trainingStart) {
-            devLog(dateId, trainingStart, trainingEnd);
+        const { dateId, trainingStart, trainingEnd, excludeFromBilling } = req.body;
+        if (!dateId) {
+            devLog(dateId, trainingStart, trainingEnd, excludeFromBilling);
             throw new HttpError('notallfieldsfilled', 400);
         }
-        const updatedDate = await diaryService.updateTrainingTimes(userToken, clubId, dateId, trainingStart, trainingEnd);
+        const updatedDate = await diaryService.updateTrainingTimes(
+            userToken,
+            clubId,
+            dateId,
+            trainingStart,
+            trainingEnd,
+            excludeFromBilling,
+        );
         
         // Emit Socket-Event
-        emitDiaryDateUpdated(clubId, dateId, { trainingStart, trainingEnd });
+        emitDiaryDateUpdated(clubId, dateId, { trainingStart, trainingEnd, excludeFromBilling });
         
         res.status(200).json(updatedDate);
     } catch (error) {

backend/controllers/diaryDateActivityController.js

@@ -1,20 +1,27 @@
+import fs from 'fs';
 import diaryDateActivityService from '../services/diaryDateActivityService.js';
 import { emitActivityChanged } from '../services/socketService.js';
 import DiaryDate from '../models/DiaryDates.js';
 
-import { devLog } from '../utils/logger.js';
+import { devLog, errorLog } from '../utils/logger.js';
 export const createDiaryDateActivity = async (req, res) => {
     try {
-        const { authcode: userToken } = req.headers;
+        let userToken = req.headers['authcode'] || req.headers['auth-code'] || null;
+        const authHeader = req.headers['authorization'] || req.headers['Authorization'];
+        if (!userToken && authHeader && typeof authHeader === 'string' && authHeader.startsWith('Bearer ')) {
+            userToken = authHeader.split(' ')[1];
+        }
         const { clubId } = req.params;
-        const { diaryDateId, activity, duration, durationText, orderId, isTimeblock } = req.body;
+        const { diaryDateId, activity, predefinedActivityId, duration, durationText, orderId, isTimeblock, groupId } = req.body;
         const activityItem = await diaryDateActivityService.createActivity(userToken, clubId, {
             diaryDateId,
             activity,
+            predefinedActivityId,
             duration,
             durationText,
             orderId,
             isTimeblock,
+            groupId,
         });
         
         // Emit Socket-Event
@@ -32,7 +39,11 @@ export const createDiaryDateActivity = async (req, res) => {
 
 export const updateDiaryDateActivity = async (req, res) => {
     try {
-        const { authcode: userToken } = req.headers;
+        let userToken = req.headers['authcode'] || req.headers['auth-code'] || null;
+        const authHeader = req.headers['authorization'] || req.headers['Authorization'];
+        if (!userToken && authHeader && typeof authHeader === 'string' && authHeader.startsWith('Bearer ')) {
+            userToken = authHeader.split(' ')[1];
+        }
         const { clubId, id } = req.params;
         const { predefinedActivityId, customActivityName, duration, durationText, orderId, groupId } = req.body; // Add groupId
         const updatedActivity = await diaryDateActivityService.updateActivity(userToken, clubId, id, {
@@ -60,7 +71,11 @@ export const updateDiaryDateActivity = async (req, res) => {
 
 export const deleteDiaryDateActivity = async (req, res) => {
     try {
-        const { authcode: userToken } = req.headers;
+        let userToken = req.headers['authcode'] || req.headers['auth-code'] || null;
+        const authHeader = req.headers['authorization'] || req.headers['Authorization'];
+        if (!userToken && authHeader && typeof authHeader === 'string' && authHeader.startsWith('Bearer ')) {
+            userToken = authHeader.split(' ')[1];
+        }
         const { clubId, id } = req.params;
         
         // Hole diaryDateId vor dem Löschen
@@ -86,7 +101,11 @@ export const deleteDiaryDateActivity = async (req, res) => {
 
 export const updateDiaryDateActivityOrder = async (req, res) => {
     try {
-        const { authcode: userToken } = req.headers;
+        let userToken = req.headers['authcode'] || req.headers['auth-code'] || null;
+        const authHeader = req.headers['authorization'] || req.headers['Authorization'];
+        if (!userToken && authHeader && typeof authHeader === 'string' && authHeader.startsWith('Bearer ')) {
+            userToken = authHeader.split(' ')[1];
+        }
         const { clubId, id } = req.params;
         const { orderId } = req.body;
         const updatedActivity = await diaryDateActivityService.updateActivityOrder(userToken, clubId, id, orderId);
@@ -108,21 +127,47 @@ export const updateDiaryDateActivityOrder = async (req, res) => {
 
 export const getDiaryDateActivities = async (req, res) => {
     try {
-        const { authcode: userToken } = req.headers;
+        let userToken = req.headers['authcode'] || req.headers['auth-code'] || null;
+        const authHeader = req.headers['authorization'] || req.headers['Authorization'];
+        if (!userToken && authHeader && typeof authHeader === 'string' && authHeader.startsWith('Bearer ')) {
+            userToken = authHeader.split(' ')[1];
+        }
         const { clubId, diaryDateId } = req.params;
         const activities = await diaryDateActivityService.getActivities(userToken, clubId, diaryDateId);
         res.status(200).json(activities);
     } catch (error) {
+        // Fallback-Logging: schreibe Stacktrace in eine Datei, falls STDOUT/STDERR nicht sichtbar ist
+        try {
+            const msg = `${new Date().toISOString()} - getDiaryDateActivities error: ${error && error.stack ? error.stack : JSON.stringify(error)}\n`;
+            fs.appendFileSync('/tmp/diary-activity-error.log', msg);
+        } catch (e) {
+            // ignore
+        }
         devLog(error);
+        errorLog(error);
         res.status(500).json({ error: 'Error getting activities' });
     }
 }
 
 export const addGroupActivity = async(req, res) => {
     try {
-        const { authcode: userToken } = req.headers;
-        const { clubId, diaryDateId, groupId, activity, predefinedActivityId, timeblockId } = req.body;
-        const activityItem = await diaryDateActivityService.addGroupActivity(userToken, clubId, diaryDateId, groupId, activity, predefinedActivityId, timeblockId);
+        let userToken = req.headers['authcode'] || req.headers['auth-code'] || null;
+        const authHeader = req.headers['authorization'] || req.headers['Authorization'];
+        if (!userToken && authHeader && typeof authHeader === 'string' && authHeader.startsWith('Bearer ')) {
+            userToken = authHeader.split(' ')[1];
+        }
+        const { clubId, diaryDateId, groupId, activity, predefinedActivityId, timeblockId, duration, durationText } = req.body;
+        const activityItem = await diaryDateActivityService.addGroupActivity(
+            userToken,
+            clubId,
+            diaryDateId,
+            groupId,
+            activity,
+            predefinedActivityId,
+            timeblockId,
+            duration,
+            durationText
+        );
         
         // Emit Socket-Event
         const diaryDate = await DiaryDate.findByPk(diaryDateId);
@@ -141,8 +186,17 @@ export const updateGroupActivity = async(req, res) => {
     try {
         const { authcode: userToken } = req.headers;
         const { clubId, groupActivityId } = req.params;
-        const { predefinedActivityId } = req.body;
-        const activityItem = await diaryDateActivityService.updateGroupActivity(userToken, clubId, groupActivityId, predefinedActivityId);
+        const { predefinedActivityId, duration, durationText, orderId, groupId } = req.body;
+        const activityItem = await diaryDateActivityService.updateGroupActivity(
+            userToken,
+            clubId,
+            groupActivityId,
+            predefinedActivityId,
+            duration,
+            durationText,
+            orderId,
+            groupId
+        );
         
         // Emit Socket-Event
         const GroupActivity = (await import('../models/GroupActivity.js')).default;
@@ -197,4 +251,4 @@ export const deleteGroupActivity = async(req, res) => {
         devLog(error);
         res.status(500).json({ error: 'Error deleting group activity' });
     }
-}
+}

backend/controllers/diaryMemberController.js

@@ -61,8 +61,12 @@ const removeMemberNote = async (req, res) => {
     try {
         const { authcode: userToken } = req.headers;
         const { clubId, noteId } = req.params;
+        const { diaryDateId, memberId } = req.query;
+        if (!diaryDateId || !memberId) {
+            return res.status(400).json({ error: 'diaryDateId and memberId query parameters are required' });
+        }
         await DiaryMemberService.removeNoteFromMember(userToken, clubId, noteId);
-        const notes = await DiaryMemberService.getNotesForMember(userToken, req.params.clubId, diaryDateId, memberId);
+        const notes = await DiaryMemberService.getNotesForMember(userToken, clubId, diaryDateId, memberId);
         res.status(200).json(notes);
     } catch (error) {
         console.error('[removeMemberNote] - Error: ', error.message);
@@ -74,7 +78,7 @@ const removeMemberTag = async (req, res) => {
     try {
         const { diaryDateId, memberId, tagId } = req.body;
         const { authcode: userToken } = req.headers;
-        await DiaryMemberService.removeTagFromMemberAndDate(userToken, req.params.clubId, diaryDateId, memberId, tagId);
+        await DiaryMemberService.removeTagFromMemberAndDate(userToken, req.params.clubId, diaryDateId, memberId, { id: tagId });
         const tags = await DiaryMemberService.getTagsForMemberAndDate(userToken, req.params.clubId, diaryDateId, memberId);
         res.status(200).json(tags);
     } catch (error) {

backend/controllers/friendlyMatchController.js

@@ -0,0 +1,70 @@
+import FriendlyMatchService from '../services/friendlyMatchService.js';
+import { emitScheduleMatchUpdated } from '../services/socketService.js';
+
+function userTokenFrom(req) {
+  return req.headers.authcode;
+}
+
+export const listFriendlyMatches = async (req, res) => {
+  try {
+    const matches = await FriendlyMatchService.list(userTokenFrom(req), req.params.clubId);
+    res.status(200).json(matches);
+  } catch (error) {
+    console.error('[listFriendlyMatches] Error:', error);
+    res.status(error.statusCode || 500).json({ error: error.message || 'Freundschaftsspiele konnten nicht geladen werden' });
+  }
+};
+
+export const createFriendlyMatch = async (req, res) => {
+  try {
+    const match = await FriendlyMatchService.create(userTokenFrom(req), req.params.clubId, req.body);
+    emitScheduleMatchUpdated(req.params.clubId, match.id, match);
+    res.status(201).json(match);
+  } catch (error) {
+    console.error('[createFriendlyMatch] Error:', error);
+    res.status(error.statusCode || 500).json({ error: error.message || 'Freundschaftsspiel konnte nicht erstellt werden' });
+  }
+};
+
+export const updateFriendlyMatch = async (req, res) => {
+  try {
+    const match = await FriendlyMatchService.update(userTokenFrom(req), req.params.clubId, req.params.matchId, req.body);
+    emitScheduleMatchUpdated(req.params.clubId, match.id, match);
+    res.status(200).json(match);
+  } catch (error) {
+    console.error('[updateFriendlyMatch] Error:', error);
+    res.status(error.statusCode || 500).json({ error: error.message || 'Freundschaftsspiel konnte nicht gespeichert werden' });
+  }
+};
+
+export const deleteFriendlyMatch = async (req, res) => {
+  try {
+    const result = await FriendlyMatchService.remove(userTokenFrom(req), req.params.clubId, req.params.matchId);
+    emitScheduleMatchUpdated(req.params.clubId, Number(req.params.matchId), null);
+    res.status(200).json(result);
+  } catch (error) {
+    console.error('[deleteFriendlyMatch] Error:', error);
+    res.status(error.statusCode || 500).json({ error: error.message || 'Freundschaftsspiel konnte nicht gelöscht werden' });
+  }
+};
+
+export const updateFriendlyMatchPlayers = async (req, res) => {
+  try {
+    const match = await FriendlyMatchService.updatePlayers(userTokenFrom(req), req.params.clubId, req.params.matchId, req.body);
+    emitScheduleMatchUpdated(req.params.clubId, match.id, match);
+    res.status(200).json({ message: 'Teilnehmer gespeichert', data: match });
+  } catch (error) {
+    console.error('[updateFriendlyMatchPlayers] Error:', error);
+    res.status(error.statusCode || 500).json({ error: error.message || 'Teilnehmer konnten nicht gespeichert werden' });
+  }
+};
+
+export const getFriendlyMatchMembers = async (req, res) => {
+  try {
+    const members = await FriendlyMatchService.members(userTokenFrom(req), req.params.clubId);
+    res.status(200).json(members);
+  } catch (error) {
+    console.error('[getFriendlyMatchMembers] Error:', error);
+    res.status(error.statusCode || 500).json({ error: error.message || 'Mitglieder konnten nicht geladen werden' });
+  }
+};

backend/controllers/friendlyMatchInvitationController.js

@@ -0,0 +1,69 @@
+import friendlyMatchSharedService from '../services/friendlyMatchSharedService.js';
+import {
+  emitFriendlyInvitationAccepted,
+  emitFriendlyInvitationCreated,
+  emitFriendlyInvitationDeclined,
+  emitFriendlySharedMatchUpdated,
+} from '../services/socketService.js';
+
+function userTokenFrom(req) {
+  const authHeader = req.headers.authorization;
+  if (authHeader && authHeader.startsWith('Bearer ')) {
+    return authHeader.slice(7);
+  }
+  return req.headers.authcode || authHeader;
+}
+
+export const createFriendlyMatchInvitation = async (req, res) => {
+  try {
+    const invitation = await friendlyMatchSharedService.createInvitation(userTokenFrom(req), req.params.clubId, req.body);
+    emitFriendlyInvitationCreated(invitation.fromClubId, invitation.toClubId, invitation);
+    res.status(201).json(invitation);
+  } catch (error) {
+    console.error('[createFriendlyMatchInvitation] Error:', error);
+    res.status(error.statusCode || 500).json({ error: error.message || 'Einladung konnte nicht erstellt werden.' });
+  }
+};
+
+export const listIncomingFriendlyMatchInvitations = async (req, res) => {
+  try {
+    const items = await friendlyMatchSharedService.listIncomingInvitations(userTokenFrom(req), req.params.clubId);
+    res.status(200).json(items);
+  } catch (error) {
+    console.error('[listIncomingFriendlyMatchInvitations] Error:', error);
+    res.status(error.statusCode || 500).json({ error: error.message || 'Eingehende Einladungen konnten nicht geladen werden.' });
+  }
+};
+
+export const listOutgoingFriendlyMatchInvitations = async (req, res) => {
+  try {
+    const items = await friendlyMatchSharedService.listOutgoingInvitations(userTokenFrom(req), req.params.clubId);
+    res.status(200).json(items);
+  } catch (error) {
+    console.error('[listOutgoingFriendlyMatchInvitations] Error:', error);
+    res.status(error.statusCode || 500).json({ error: error.message || 'Ausgehende Einladungen konnten nicht geladen werden.' });
+  }
+};
+
+export const acceptFriendlyMatchInvitation = async (req, res) => {
+  try {
+    const result = await friendlyMatchSharedService.acceptInvitation(userTokenFrom(req), req.params.clubId, req.params.invitationId);
+    emitFriendlyInvitationAccepted(result.invitation.fromClubId, result.invitation.toClubId, result.invitation);
+    emitFriendlySharedMatchUpdated(result.sharedMatch.homeClubId, result.sharedMatch.guestClubId, result.sharedMatch);
+    res.status(200).json(result);
+  } catch (error) {
+    console.error('[acceptFriendlyMatchInvitation] Error:', error);
+    res.status(error.statusCode || 500).json({ error: error.message || 'Einladung konnte nicht angenommen werden.' });
+  }
+};
+
+export const declineFriendlyMatchInvitation = async (req, res) => {
+  try {
+    const invitation = await friendlyMatchSharedService.declineInvitation(userTokenFrom(req), req.params.clubId, req.params.invitationId);
+    emitFriendlyInvitationDeclined(invitation.fromClubId, invitation.toClubId, invitation.id);
+    res.status(200).json({ success: true, id: invitation.id });
+  } catch (error) {
+    console.error('[declineFriendlyMatchInvitation] Error:', error);
+    res.status(error.statusCode || 500).json({ error: error.message || 'Einladung konnte nicht abgelehnt werden.' });
+  }
+};

backend/controllers/friendlyMatchSharedController.js

@@ -0,0 +1,101 @@
+import friendlyMatchSharedService from '../services/friendlyMatchSharedService.js';
+import {
+  emitFriendlySharedMatchDeleted,
+  emitFriendlySharedMatchUpdated,
+} from '../services/socketService.js';
+
+function userTokenFrom(req) {
+  const authHeader = req.headers.authorization;
+  if (authHeader && authHeader.startsWith('Bearer ')) {
+    return authHeader.slice(7);
+  }
+  return req.headers.authcode || authHeader;
+}
+
+export const findSharedFriendlyMatches = async (req, res) => {
+  try {
+    const { clubId, name, date, startTime } = req.query;
+    const matches = await friendlyMatchSharedService.findByNameDateStartTime(userTokenFrom(req), clubId, {
+      name,
+      date,
+      startTime,
+    });
+    res.status(200).json(matches);
+  } catch (error) {
+    console.error('[findSharedFriendlyMatches] Error:', error);
+    res.status(error.statusCode || 500).json({ error: error.message || 'Suche nach Freundschaftsspielen fehlgeschlagen.' });
+  }
+};
+
+export const listSharedFriendlyMatches = async (req, res) => {
+  try {
+    const data = await friendlyMatchSharedService.listShared(userTokenFrom(req), req.params.clubId);
+    res.status(200).json(data);
+  } catch (error) {
+    console.error('[listSharedFriendlyMatches] Error:', error);
+    res.status(error.statusCode || 500).json({ error: error.message || 'Gemeinsame Freundschaftsspiele konnten nicht geladen werden.' });
+  }
+};
+
+export const getSharedFriendlyMatchMembers = async (req, res) => {
+  try {
+    const members = await friendlyMatchSharedService.membersForSide(
+      userTokenFrom(req),
+      req.params.clubId,
+      req.params.matchId,
+      req.params.side,
+    );
+    res.status(200).json(members);
+  } catch (error) {
+    console.error('[getSharedFriendlyMatchMembers] Error:', error);
+    res.status(error.statusCode || 500).json({ error: error.message || 'Mitglieder konnten nicht geladen werden.' });
+  }
+};
+
+export const updateSharedFriendlyMatch = async (req, res) => {
+  try {
+    const match = await friendlyMatchSharedService.updateShared(
+      userTokenFrom(req),
+      req.params.clubId,
+      req.params.matchId,
+      req.body,
+    );
+    emitFriendlySharedMatchUpdated(match.homeClubId, match.guestClubId, match);
+    res.status(200).json(match);
+  } catch (error) {
+    console.error('[updateSharedFriendlyMatch] Error:', error);
+    res.status(error.statusCode || 500).json({ error: error.message || 'Gemeinsames Freundschaftsspiel konnte nicht gespeichert werden.' });
+  }
+};
+
+export const updateSharedFriendlyMatchPlayers = async (req, res) => {
+  try {
+    const match = await friendlyMatchSharedService.updateSharedPlayers(
+      userTokenFrom(req),
+      req.params.clubId,
+      req.params.matchId,
+      req.body,
+    );
+    emitFriendlySharedMatchUpdated(match.homeClubId, match.guestClubId, match);
+    res.status(200).json({ message: 'Teilnehmer gespeichert', data: match });
+  } catch (error) {
+    console.error('[updateSharedFriendlyMatchPlayers] Error:', error);
+    res.status(error.statusCode || 500).json({ error: error.message || 'Teilnehmer konnten nicht gespeichert werden.' });
+  }
+};
+
+export const deleteSharedFriendlyMatch = async (req, res) => {
+  try {
+    const match = await friendlyMatchSharedService.getSharedById(
+      userTokenFrom(req),
+      req.params.clubId,
+      req.params.matchId,
+    );
+    const result = await friendlyMatchSharedService.removeShared(userTokenFrom(req), req.params.clubId, req.params.matchId);
+    emitFriendlySharedMatchDeleted(match.homeClubId, match.guestClubId, Number(req.params.matchId));
+    res.status(200).json(result);
+  } catch (error) {
+    console.error('[deleteSharedFriendlyMatch] Error:', error);
+    res.status(error.statusCode || 500).json({ error: error.message || 'Gemeinsames Freundschaftsspiel konnte nicht geloescht werden.' });
+  }
+};

backend/controllers/matchController.js

@@ -1,6 +1,6 @@
 import MatchService from '../services/matchService.js';
 import fs from 'fs';
-
+import { emitScheduleMatchUpdated } from '../services/socketService.js';
 import { devLog } from '../utils/logger.js';
 export const uploadCSV = async (req, res) => {
     try {
@@ -51,7 +51,8 @@ export const getMatchesForLeague = async (req, res) => {
     try {
         const { authcode: userToken } = req.headers;
         const { clubId, leagueId } = req.params;
-        const matches = await MatchService.getMatchesForLeague(userToken, clubId, leagueId);
+        const { scope = 'own' } = req.query;
+        const matches = await MatchService.getMatchesForLeague(userToken, clubId, leagueId, scope);
         return res.status(200).json(matches);
     } catch (error) {
         console.error('Error retrieving matches:', error);
@@ -116,7 +117,11 @@ export const updateMatchPlayers = async (req, res) => {
             playersPlanned,
             playersPlayed
         );
-        
+
+        if (result.clubId) {
+            emitScheduleMatchUpdated(result.clubId, result.id, result.match || null);
+        }
+
         return res.status(200).json({
             message: 'Match players updated successfully',
             data: result
@@ -145,3 +150,21 @@ export const getPlayerMatchStats = async (req, res) => {
         });
     }
 };
+
+export const getMatchPlayers = async (req, res) => {
+    try {
+        const { clubId } = req.params;
+        if (!clubId) {
+            return res.status(400).json({ error: 'Club-ID fehlt' });
+        }
+        const Member = (await import('../models/Member.js')).default;
+        const members = await Member.findAll({
+            where: { clubId: clubId, active: true },
+            attributes: ['id', 'firstName', 'lastName', 'gender']
+        });
+        return res.status(200).json(members);
+    } catch (error) {
+        console.error('Error retrieving match players:', error);
+        return res.status(500).json({ error: 'Failed to retrieve match players' });
+    }
+};

backend/controllers/memberActivityController.js

@@ -171,10 +171,36 @@ export const getMemberActivities = async (req, res) => {
             }
         }
         
+        // Filter: explizite Zuordnungen sollen nur dann zählen, wenn
+        // - der Participant keine Gruppe hat UND die Aktivität KEINE Gruppenbindung hat, oder
+        // - die Aktivität keine Gruppenbindung hat, oder
+        // - es eine Gruppenbindung gibt, die zur Gruppe des Participants passt.
+        const filteredMemberActivities = memberActivities.filter((ma) => {
+            if (!ma?.participant || !ma?.activity) {
+                return false;
+            }
+
+            const participantGroupId = ma.participant.groupId;
+            const groupActivitiesForActivity = ma.activity.groupActivities || [];
+
+            // Participant ohne Gruppe -> nur Aktivitäten ohne Gruppenbindung zählen
+            if (participantGroupId === null || participantGroupId === undefined) {
+                return !groupActivitiesForActivity.length;
+            }
+
+            // Keine Gruppenbindung -> immer zählen
+            if (!groupActivitiesForActivity.length) {
+                return true;
+            }
+
+            // Gruppenbindung vorhanden -> nur zählen, wenn die Gruppe passt
+            return groupActivitiesForActivity.some((ga) => Number(ga.groupId) === Number(participantGroupId));
+        });
+
         // 3. Kombiniere beide Listen und entferne Duplikate
         // Ein Duplikat liegt vor, wenn dieselbe Aktivität für denselben Participant bereits explizit zugeordnet ist
         const explicitActivityKeys = new Set();
-        memberActivities.forEach(ma => {
+    filteredMemberActivities.forEach(ma => {
             if (ma.activity && ma.activity.id && ma.participant && ma.participant.id) {
                 // Erstelle einen eindeutigen Schlüssel: activityId-participantId
                 const key = `${ma.activity.id}-${ma.participant.id}`;
@@ -192,7 +218,7 @@ export const getMemberActivities = async (req, res) => {
         });
         
         // Kombiniere beide Listen
-        const allActivities = [...memberActivities, ...uniqueGroupActivities];
+    const allActivities = [...filteredMemberActivities, ...uniqueGroupActivities];
         
         // Group activities by name and count occurrences
         // Verwende einen Set pro Aktivität, um eindeutige Datum-Aktivität-Kombinationen zu tracken
@@ -323,6 +349,22 @@ export const getMemberLastParticipations = async (req, res) => {
             order: [[{ model: DiaryDateActivity, as: 'activity' }, { model: DiaryDates, as: 'diaryDate' }, 'date', 'DESC']],
             limit: parseInt(limit) * 10 // Get more to filter by group
         });
+
+        // Siehe getMemberActivities(): nur zählen, wenn Gruppenbindung passt (oder keine existiert)
+        const filteredMemberActivities = memberActivities.filter((ma) => {
+            if (!ma?.participant || !ma?.activity) {
+                return false;
+            }
+
+            const participantGroupId = ma.participant.groupId;
+            const groupActivitiesForActivity = ma.activity.groupActivities || [];
+
+            if (!groupActivitiesForActivity.length) {
+                return true;
+            }
+
+            return groupActivitiesForActivity.some((ga) => Number(ga.groupId) === Number(participantGroupId));
+        });
         
         // 2. Get all group activities for groups the member belongs to
         const groupActivities = [];
@@ -399,7 +441,7 @@ export const getMemberLastParticipations = async (req, res) => {
         // 3. Kombiniere beide Listen und entferne Duplikate
         // Ein Duplikat liegt vor, wenn dieselbe Aktivität für denselben Participant bereits explizit zugeordnet ist
         const explicitActivityKeys = new Set();
-        memberActivities.forEach(ma => {
+    filteredMemberActivities.forEach(ma => {
             if (ma.activity && ma.activity.id && ma.participant && ma.participant.id) {
                 // Erstelle einen eindeutigen Schlüssel: activityId-participantId
                 const key = `${ma.activity.id}-${ma.participant.id}`;
@@ -417,7 +459,7 @@ export const getMemberLastParticipations = async (req, res) => {
         });
         
         // Kombiniere beide Listen
-        const allActivities = [...memberActivities, ...uniqueGroupActivities];
+    const allActivities = [...filteredMemberActivities, ...uniqueGroupActivities];
         
         // Gruppiere nach Datum
         const participationsByDate = new Map();

backend/controllers/memberController.js

@@ -1,5 +1,6 @@
 import MemberService from "../services/memberService.js";
 import MemberTransferService from "../services/memberTransferService.js";
+import clickTtPlayerRegistrationService from "../services/clickTtPlayerRegistrationService.js";
 import { emitMemberChanged } from '../services/socketService.js';
 
 import { devLog } from '../utils/logger.js';
@@ -27,12 +28,12 @@ const getWaitingApprovals = async(req, res) => {
 
 const setClubMembers = async (req, res) => {
     try {
-    const { id: memberId, firstname: firstName, lastname: lastName, street, city, postalCode, birthdate, phone, email, active, 
-            testMembership, picsInInternetAllowed, gender, ttr, qttr, memberFormHandedOver, contacts } = req.body;
+    const { id: memberId, firstname: firstName, lastname: lastName, street, city, postalCode, birthdate, phone, email, active,
+            testMembership, picsInInternetAllowed, gender, ttr, qttr, memberFormHandedOver, adultReleaseApproved, adultReserveApproved, contacts } = req.body;
         const { id: clubId } = req.params;
         const { authcode: userToken } = req.headers;
         const addResult = await MemberService.setClubMember(userToken, clubId, memberId, firstName, lastName, street, city, postalCode, birthdate, 
-            phone, email, active, testMembership, picsInInternetAllowed, gender, ttr, qttr, memberFormHandedOver, contacts);
+            phone, email, active, testMembership, picsInInternetAllowed, gender, ttr, qttr, memberFormHandedOver, adultReleaseApproved, adultReserveApproved, contacts);
         
         // Emit Socket-Event wenn Member erfolgreich erstellt/aktualisiert wurde
         if (addResult.status === 200) {
@@ -46,6 +47,70 @@ const setClubMembers = async (req, res) => {
     }
 }
 
+const getMemberSepaMandate = async (req, res) => {
+    try {
+        const { clubId, memberId } = req.params;
+        const { authcode: userToken } = req.headers;
+        const result = await MemberService.getMemberSepaMandate(userToken, Number(clubId), Number(memberId));
+        res.status(result.status || 500).json(result.response);
+    } catch (error) {
+        console.error('[getMemberSepaMandate] - Error:', error);
+        res.status(500).json({ success: false, error: 'SEPA-Mandat konnte nicht geladen werden.' });
+    }
+};
+
+const saveMemberSepaMandate = async (req, res) => {
+    try {
+        const { clubId, memberId } = req.params;
+        const { authcode: userToken } = req.headers;
+        const result = await MemberService.saveMemberSepaMandate(userToken, Number(clubId), Number(memberId), req.body || {});
+        if (result.status === 200) {
+            emitMemberChanged(clubId);
+        }
+        res.status(result.status || 500).json(result.response);
+    } catch (error) {
+        console.error('[saveMemberSepaMandate] - Error:', error);
+        res.status(500).json({ success: false, error: 'SEPA-Mandat konnte nicht gespeichert werden.' });
+    }
+};
+
+const getMemberPlayInterests = async (req, res) => {
+    try {
+        const { clubId } = req.params;
+        const { seasonId, lineupHalf } = req.query;
+        const { authcode: userToken } = req.headers;
+        const result = await MemberService.getMemberPlayInterests(userToken, Number(clubId), Number(seasonId), String(lineupHalf || ''));
+        res.status(result.status || 500).json(result.response);
+    } catch (error) {
+        console.error('[getMemberPlayInterests] - Error:', error);
+        res.status(500).json({ error: 'Failed to load member play interests' });
+    }
+};
+
+const setMemberPlayInterest = async (req, res) => {
+    try {
+        const { clubId } = req.params;
+        const { memberId, seasonId, lineupHalf, interested = true } = req.body;
+        const { authcode: userToken } = req.headers;
+        const normalizedInterested = interested === true || interested === 'true' || interested === 1 || interested === '1';
+        const result = await MemberService.setMemberPlayInterest(
+            userToken,
+            Number(clubId),
+            Number(memberId),
+            Number(seasonId),
+            String(lineupHalf || ''),
+            normalizedInterested
+        );
+        if (result.status === 200) {
+            emitMemberChanged(clubId);
+        }
+        res.status(result.status || 500).json(result.response);
+    } catch (error) {
+        console.error('[setMemberPlayInterest] - Error:', error);
+        res.status(500).json({ error: 'Failed to save member play interest' });
+    }
+};
+
 const uploadMemberImage = async (req, res) => {
     try {
         const { clubId, memberId } = req.params;
@@ -92,6 +157,30 @@ const updateRatingsFromMyTischtennis = async (req, res) => {
     }
 };
 
+const getMemberTtrHistory = async (req, res) => {
+    try {
+        const { clubId, memberId } = req.params;
+        const { authcode: userToken } = req.headers;
+        const result = await MemberService.getMemberTtrHistory(userToken, clubId, memberId);
+        res.status(result.status).json(result.response);
+    } catch (error) {
+        console.error('[getMemberTtrHistory] - Error:', error);
+        res.status(500).json({ success: false, error: 'TTR-Historie konnte nicht geladen werden.' });
+    }
+};
+
+const refreshMemberTtrHistory = async (req, res) => {
+    try {
+        const { clubId, memberId } = req.params;
+        const { authcode: userToken } = req.headers;
+        const result = await MemberService.refreshMemberTtrHistory(userToken, clubId, memberId);
+        res.status(result.status).json(result.response);
+    } catch (error) {
+        console.error('[refreshMemberTtrHistory] - Error:', error);
+        res.status(500).json({ success: false, error: 'TTR-Historie konnte nicht aktualisiert werden.' });
+    }
+};
+
 const rotateMemberImage = async (req, res) => {
     try {
         const { clubId, memberId, imageId } = req.params;
@@ -207,6 +296,28 @@ const quickDeactivateMember = async (req, res) => {
     }
 };
 
+const requestClickTtPlayerRegistration = async (req, res) => {
+    try {
+        const { clubId, memberId } = req.params;
+        const { authcode: userToken } = req.headers;
+        const userId = req.user?.id;
+        const result = await clickTtPlayerRegistrationService.submitExistingPlayerApplication({
+            userToken,
+            userId,
+            clubId,
+            memberId
+        });
+        res.status(200).json(result);
+    } catch (error) {
+        console.error('[requestClickTtPlayerRegistration] - Error:', error);
+        res.status(error.statusCode || error.status || 500).json({
+            success: false,
+            error: error.message || 'Click-TT-Antrag konnte nicht eingereicht werden',
+            details: error.details || null
+        });
+    }
+};
+
 const transferMembers = async (req, res) => {
     try {
         const { id: clubId } = req.params;
@@ -243,15 +354,22 @@ export {
     getClubMembers,
     getWaitingApprovals,
     setClubMembers,
+    getMemberSepaMandate,
+    saveMemberSepaMandate,
+    getMemberPlayInterests,
+    setMemberPlayInterest,
     uploadMemberImage,
     getMemberImage,
     updateRatingsFromMyTischtennis,
+    getMemberTtrHistory,
+    refreshMemberTtrHistory,
     rotateMemberImage,
     transferMembers,
     quickUpdateTestMembership,
     quickUpdateMemberFormHandedOver,
     quickDeactivateMember,
+    requestClickTtPlayerRegistration,
     deleteMemberImage,
     setPrimaryMemberImage,
     generateMemberGallery
-};
+};

backend/controllers/memberGroupPhotoController.js

@@ -0,0 +1,65 @@
+import memberGroupPhotoService from '../services/memberGroupPhotoService.js';
+
+export const listMemberGroupPhotos = async (req, res) => {
+  try {
+    const { authcode: userToken } = req.headers;
+    const { clubId } = req.params;
+    const photos = await memberGroupPhotoService.list(userToken, clubId);
+    res.status(200).json({ success: true, photos });
+  } catch (error) {
+    console.error('[listMemberGroupPhotos] error:', error);
+    res.status(500).json({ success: false, error: 'Failed to list group photos' });
+  }
+};
+
+export const createMemberGroupPhoto = async (req, res) => {
+  try {
+    const { authcode: userToken } = req.headers;
+    const { clubId } = req.params;
+    const result = await memberGroupPhotoService.create(userToken, clubId, req.file, req.body);
+    res.status(result.status).json(result.response);
+  } catch (error) {
+    console.error('[createMemberGroupPhoto] error:', error);
+    res.status(500).json({ success: false, error: 'Failed to save group photo' });
+  }
+};
+
+export const updateMemberGroupPhoto = async (req, res) => {
+  try {
+    const { authcode: userToken } = req.headers;
+    const { clubId, photoId } = req.params;
+    const result = await memberGroupPhotoService.update(userToken, clubId, photoId, req.body);
+    res.status(result.status).json(result.response);
+  } catch (error) {
+    console.error('[updateMemberGroupPhoto] error:', error);
+    res.status(500).json({ success: false, error: 'Failed to update group photo' });
+  }
+};
+
+export const deleteMemberGroupPhoto = async (req, res) => {
+  try {
+    const { authcode: userToken } = req.headers;
+    const { clubId, photoId } = req.params;
+    const result = await memberGroupPhotoService.remove(userToken, clubId, photoId);
+    res.status(result.status).json(result.response);
+  } catch (error) {
+    console.error('[deleteMemberGroupPhoto] error:', error);
+    res.status(500).json({ success: false, error: 'Failed to delete group photo' });
+  }
+};
+
+export const getMemberGroupPhotoImage = async (req, res) => {
+  try {
+    const { authcode: userToken } = req.headers;
+    const { clubId, photoId } = req.params;
+    const result = await memberGroupPhotoService.getImage(userToken, clubId, photoId);
+    if (result.status === 200) {
+      res.setHeader('Content-Type', 'image/jpeg');
+      return res.sendFile(result.imagePath);
+    }
+    return res.status(result.status).json({ success: false, error: result.error });
+  } catch (error) {
+    console.error('[getMemberGroupPhotoImage] error:', error);
+    res.status(500).json({ success: false, error: 'Failed to load group photo' });
+  }
+};

backend/controllers/memberOrderController.js

@@ -0,0 +1,55 @@
+import memberOrderService from '../services/memberOrderService.js';
+
+const getMemberOrders = async (req, res) => {
+  try {
+    const { clubId, memberId } = req.params;
+    const { authcode: userToken } = req.headers;
+    const result = await memberOrderService.getMemberOrders(userToken, clubId, memberId);
+    res.status(result.status).json(result.response);
+  } catch (error) {
+    console.error('[getMemberOrders] - Error:', error);
+    res.status(500).json({ success: false, error: 'Bestellungen konnten nicht geladen werden.' });
+  }
+};
+
+const createMemberOrder = async (req, res) => {
+  try {
+    const { clubId, memberId } = req.params;
+    const { authcode: userToken } = req.headers;
+    const result = await memberOrderService.createMemberOrder(userToken, clubId, memberId, req.body || {});
+    res.status(result.status).json(result.response);
+  } catch (error) {
+    console.error('[createMemberOrder] - Error:', error);
+    res.status(500).json({ success: false, error: 'Bestellung konnte nicht gespeichert werden.' });
+  }
+};
+
+const updateMemberOrder = async (req, res) => {
+  try {
+    const { clubId, memberId, orderId } = req.params;
+    const { authcode: userToken } = req.headers;
+    const result = await memberOrderService.updateMemberOrder(userToken, clubId, memberId, orderId, req.body || {});
+    res.status(result.status).json(result.response);
+  } catch (error) {
+    console.error('[updateMemberOrder] - Error:', error);
+    res.status(500).json({ success: false, error: 'Bestellung konnte nicht aktualisiert werden.' });
+  }
+};
+
+const getGlobalOrders = async (req, res) => {
+  try {
+    const { authcode: userToken } = req.headers;
+    const result = await memberOrderService.getGlobalOrders(userToken);
+    res.status(result.status).json(result.response);
+  } catch (error) {
+    console.error('[getGlobalOrders] - Error:', error);
+    res.status(500).json({ success: false, error: 'Bestellübersicht konnte nicht geladen werden.' });
+  }
+};
+
+export {
+  getMemberOrders,
+  createMemberOrder,
+  updateMemberOrder,
+  getGlobalOrders
+};

backend/controllers/mobileFeedbackController.js

@@ -0,0 +1,29 @@
+import User from '../models/User.js';
+import { sendMobileFeedbackEmail } from '../services/emailService.js';
+
+const clean = (value, max = 4000) => String(value ?? '').trim().slice(0, max);
+
+export const sendMobileFeedback = async (req, res) => {
+  try {
+    const message = clean(req.body?.message, 5000);
+    if (!message) {
+      return res.status(400).json({ error: 'message_required' });
+    }
+
+    const user = req.user?.id ? await User.findByPk(req.user.id) : null;
+    await sendMobileFeedbackEmail({
+      message,
+      screen: clean(req.body?.screen, 200),
+      clubId: req.body?.clubId ?? null,
+      appVersion: clean(req.body?.appVersion, 80),
+      platform: clean(req.body?.platform, 80) || 'Android',
+      backendBaseUrl: clean(req.body?.backendBaseUrl, 300),
+      user: user ? { id: user.id, username: user.username, email: user.email } : { id: req.user?.id },
+    });
+
+    return res.status(200).json({ success: true });
+  } catch (error) {
+    console.error('[sendMobileFeedback] - error:', error);
+    return res.status(500).json({ error: 'internalerror' });
+  }
+};

backend/controllers/myTischtennisController.js

@@ -1,6 +1,9 @@
 import myTischtennisService from '../services/myTischtennisService.js';
+import myTischtennisSessionService from '../services/myTischtennisSessionService.js';
+import myTischtennisProxyService from '../services/myTischtennisProxyService.js';
 import HttpError from '../exceptions/HttpError.js';
 import axios from 'axios';
+import myTischtennisClient from '../clients/myTischtennisClient.js';
 
 class MyTischtennisController {
   /**
@@ -36,6 +39,49 @@ class MyTischtennisController {
     }
   }
 
+  /**
+   * GET /api/mytischtennis/login-form
+   * Parsed login form data from mytischtennis.de
+   */
+  async getLoginForm(req, res, next) {
+    try {
+      const myTischtennisClient = (await import('../clients/myTischtennisClient.js')).default;
+      const result = await myTischtennisClient.getLoginPage();
+
+      if (!result.success) {
+        throw new HttpError('Login-Formular konnte nicht geladen werden', 502);
+      }
+
+      const publicFields = (result.fields || [])
+        .filter((field) => ['email', 'password'].includes(field.type) || field.name === 'email' || field.name === 'password')
+        .map((field) => ({
+          name: field.name,
+          id: field.id,
+          type: field.type,
+          placeholder: field.placeholder || null,
+          required: !!field.required,
+          autocomplete: field.autocomplete || null,
+          minlength: field.minlength ? Number(field.minlength) : null
+        }));
+
+      res.status(200).json({
+        success: true,
+        form: {
+          action: result.loginAction,
+          fields: publicFields
+        },
+        captcha: {
+          required: !!result.requiresCaptcha,
+          siteKey: result.captchaSiteKey || null,
+          puzzleEndpoint: result.captchaPuzzleEndpoint || null,
+          solutionField: result.captchaSolutionField || 'captcha'
+        }
+      });
+    } catch (error) {
+      next(error);
+    }
+  }
+
   /**
    * POST /api/mytischtennis/account
    * Create or update myTischtennis account
@@ -43,7 +89,9 @@ class MyTischtennisController {
   async upsertAccount(req, res, next) {
     try {
       const userId = req.user.id;
-      const { email, password, savePassword, autoUpdateRatings, userPassword } = req.body;
+      const { email, password, savePassword, userPassword } = req.body;
+      const hasAutoUpdateRatings = Object.prototype.hasOwnProperty.call(req.body, 'autoUpdateRatings');
+      const autoUpdateRatings = hasAutoUpdateRatings ? req.body.autoUpdateRatings : undefined;
 
       if (!email) {
         throw new HttpError('E-Mail-Adresse erforderlich', 400);
@@ -59,7 +107,7 @@ class MyTischtennisController {
         email,
         password,
         savePassword || false,
-        autoUpdateRatings || false,
+        autoUpdateRatings,
         userPassword
       );
 
@@ -226,7 +274,7 @@ class MyTischtennisController {
       req.userId = userId;
       
       // Lade die Login-Seite von mytischtennis.de
-      const response = await axios.get('https://www.mytischtennis.de/login?next=%2F', {
+      const response = await axios.get(`${myTischtennisProxyService.getOrigin()}/login?next=%2F`, {
         headers: {
           'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36',
           'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8',
@@ -262,6 +310,14 @@ class MyTischtennisController {
           /action="\/login/g,
           'action="/api/mytischtennis/login-submit'
         );
+        html = myTischtennisProxyService.rewriteContent(html);
+
+        // MyTischtennis bootet eine große React-App, die im Proxy-Kontext häufig mit
+        // Runtime-Fehlern abstürzt ("Da ist etwas schiefgelaufen"). Für den iframe-Login
+        // reicht die serverseitig gerenderte Form aus; deshalb Bootstrap-Skripte entfernen.
+        html = html.replace(/<script\b[^>]*type=(?:"|')module(?:"|')[^>]*>[\s\S]*?<\/script>/gi, '');
+        html = html.replace(/<script\b[^>]*src=(?:"|')[^"']*\/build\/[^"']*(?:"|')[^>]*>\s*<\/script>/gi, '');
+        html = html.replace(/<link\b[^>]*rel=(?:"|')modulepreload(?:"|')[^>]*>/gi, '');
       }
 
       // Setze Content-Type
@@ -275,6 +331,55 @@ class MyTischtennisController {
     }
   }
 
+  /**
+   * GET /api/mytischtennis/proxy/*
+   * Same-Origin-Proxy für mytischtennis Build-/Font-/Captcha-Ressourcen
+   */
+  async proxyRemote(req, res, next) {
+    try {
+      const proxyPath = req.params[0] || '';
+      const queryString = new URLSearchParams(req.query || {}).toString();
+      const targetUrl = `${myTischtennisProxyService.getOrigin()}/${proxyPath}${queryString ? `?${queryString}` : ''}`;
+
+      const upstream = await axios.get(targetUrl, {
+        responseType: 'arraybuffer',
+        headers: {
+          'User-Agent': req.headers['user-agent'] || 'Mozilla/5.0',
+          'Accept': req.headers.accept || '*/*',
+          'Accept-Language': req.headers['accept-language'] || 'de-DE,de;q=0.9,en-US;q=0.8,en;q=0.7',
+          ...(req.headers.cookie ? { 'Cookie': req.headers.cookie } : {})
+        },
+        validateStatus: () => true
+      });
+
+      // Wichtige Header durchreichen
+      const passthroughHeaders = ['content-type', 'cache-control', 'etag', 'last-modified', 'expires'];
+      for (const headerName of passthroughHeaders) {
+        const value = upstream.headers[headerName];
+        if (value) {
+          res.setHeader(headerName, value);
+        }
+      }
+      if (upstream.headers['set-cookie']) {
+        res.setHeader('Set-Cookie', upstream.headers['set-cookie']);
+      }
+
+      const contentType = String(upstream.headers['content-type'] || '').toLowerCase();
+      const isTextLike = /(text\/|javascript|json|xml|svg)/.test(contentType);
+
+      if (isTextLike) {
+        const asText = Buffer.from(upstream.data).toString('utf-8');
+        const rewritten = myTischtennisProxyService.rewriteContent(asText);
+        return res.status(upstream.status).send(rewritten);
+      }
+
+      return res.status(upstream.status).send(upstream.data);
+    } catch (error) {
+      console.error('Fehler beim Proxy von mytischtennis-Ressourcen:', error.message);
+      next(error);
+    }
+  }
+
   /**
    * POST /api/mytischtennis/login-submit
    * Proxy für Login-Form-Submission
@@ -300,14 +405,81 @@ class MyTischtennisController {
       if (req.body.__token) {
         delete req.body.__token;
       }
-      
-      // Hole Cookies aus dem Request
+
+      // Hole Cookies aus dem Request (wird auch für CAPTCHA-Fallback benötigt)
       const cookies = req.headers.cookie || '';
+
+      // Normalisiere Payload
+      const payload = { ...(req.body || {}) };
+      const mask = (v) => (typeof v === 'string' && v.length > 12 ? `${v.slice(0, 12)}...(${v.length})` : v);
+
+      // Falls captcha im Browser-Kontext nicht gesetzt wurde, versuche serverseitigen Fallback
+      if (!payload.captcha) {
+        try {
+          const loginPageResponse = await axios.get('https://www.mytischtennis.de/login?next=%2F', {
+            headers: {
+              'Cookie': cookies,
+              'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36',
+              'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
+              'Accept-Language': 'de-DE,de;q=0.9,en-US;q=0.8,en;q=0.7',
+              'Referer': 'https://www.mytischtennis.de/'
+            },
+            validateStatus: () => true
+          });
+
+          const html = typeof loginPageResponse.data === 'string' ? loginPageResponse.data : '';
+          const siteKeyMatch = html.match(/data-sitekey=(?:"([^"]+)"|'([^']+)')/i);
+          const puzzleEndpointMatch = html.match(/data-puzzle-endpoint=(?:"([^"]+)"|'([^']+)')/i);
+          const siteKey = siteKeyMatch ? (siteKeyMatch[1] || siteKeyMatch[2]) : null;
+          const puzzleEndpoint = puzzleEndpointMatch ? (puzzleEndpointMatch[1] || puzzleEndpointMatch[2]) : null;
+
+          if (siteKey && puzzleEndpoint) {
+            const puzzleResponse = await axios.get(`${puzzleEndpoint}?sitekey=${encodeURIComponent(siteKey)}`, {
+              headers: {
+                'Cookie': cookies,
+                'Accept': '*/*',
+                'Origin': 'https://www.mytischtennis.de',
+                'Referer': 'https://www.mytischtennis.de/'
+              },
+              validateStatus: () => true
+            });
+
+            if (puzzleResponse.status === 200 && typeof puzzleResponse.data === 'string' && puzzleResponse.data.trim()) {
+              payload.captcha = puzzleResponse.data.trim();
+              payload.captcha_clicked = 'true';
+            }
+          }
+        } catch (captchaFallbackError) {
+          console.warn('[submitLogin] CAPTCHA-Fallback fehlgeschlagen:', captchaFallbackError.message);
+        }
+      }
+
+      // Wenn captcha vorhanden ist, als bestätigt markieren
+      if (payload.captcha && !payload.captcha_clicked) {
+        payload.captcha_clicked = 'true';
+      }
+
+      console.log('[submitLogin] Incoming payload fields:', {
+        keys: Object.keys(payload),
+        hasEmail: !!payload.email,
+        hasPassword: !!payload.password,
+        xsrf: mask(payload.xsrf),
+        captchaClicked: payload.captcha_clicked,
+        captcha: mask(payload.captcha)
+      });
+
+      // Form-Daten sauber als x-www-form-urlencoded serialisieren
+      const formData = new URLSearchParams();
+      for (const [key, value] of Object.entries(payload)) {
+        if (value !== undefined && value !== null) {
+          formData.append(key, String(value));
+        }
+      }
       
       // Leite den Login-Request an mytischtennis.de weiter
       const response = await axios.post(
         'https://www.mytischtennis.de/login?next=%2F&_data=routes%2F_auth%2B%2Flogin',
-        req.body, // Form-Daten
+        formData.toString(),
         {
           headers: {
             'Cookie': cookies,
@@ -321,6 +493,34 @@ class MyTischtennisController {
         }
       );
 
+      console.log('[submitLogin] Upstream response:', {
+        status: response.status,
+        hasSetCookie: Array.isArray(response.headers['set-cookie']) && response.headers['set-cookie'].length > 0,
+        bodyPreview: typeof response.data === 'string'
+          ? response.data.slice(0, 220)
+          : JSON.stringify(response.data || {}).slice(0, 220)
+      });
+
+      // Falls CAPTCHA-Bestätigung im Proxy-Flow fehlschlägt:
+      // Fallback auf echten Browser-Login (Playwright), dann Session direkt speichern.
+      const upstreamBody = typeof response.data === 'string' ? response.data : JSON.stringify(response.data || {});
+      const isCaptchaFailure = response.status === 400
+        && (upstreamBody.includes('Captcha-Bestätigung fehlgeschlagen') || upstreamBody.includes('Captcha-Bestätigung ist erforderlich'));
+
+      if (isCaptchaFailure && userId && payload.email && payload.password) {
+        console.log('[submitLogin] CAPTCHA-Fehler erkannt, starte Playwright-Fallback...');
+        const browserLogin = await myTischtennisClient.loginWithBrowserAutomation(payload.email, payload.password);
+
+        if (browserLogin.success && browserLogin.cookie) {
+          await myTischtennisSessionService.saveSessionFromCookie(userId, browserLogin.cookie);
+          return res.status(200).send(
+            '<!doctype html><html><body><p>Login erfolgreich. Fenster kann geschlossen werden.</p></body></html>'
+          );
+        }
+
+        console.warn('[submitLogin] Playwright-Fallback fehlgeschlagen:', browserLogin.error);
+      }
+
       // Setze Cookies aus der Response
       const setCookieHeaders = response.headers['set-cookie'];
       if (setCookieHeaders) {
@@ -339,7 +539,7 @@ class MyTischtennisController {
       const authCookie = setCookieHeaders?.find(cookie => cookie.startsWith('sb-10-auth-token='));
       if (authCookie && userId) {
         // Login erfolgreich - speichere Session (nur wenn userId vorhanden)
-        await this.saveSessionFromCookie(userId, authCookie);
+        await myTischtennisSessionService.saveSessionFromCookie(userId, authCookie);
       }
 
       // Sende Response weiter
@@ -350,49 +550,6 @@ class MyTischtennisController {
     }
   }
 
-  /**
-   * Speichere Session-Daten aus Cookie
-   */
-  async saveSessionFromCookie(userId, cookieString) {
-    try {
-      const tokenMatch = cookieString.match(/sb-10-auth-token=base64-([^;]+)/);
-      if (!tokenMatch) {
-        throw new Error('Token-Format ungültig');
-      }
-
-      const base64Token = tokenMatch[1];
-      const decodedToken = Buffer.from(base64Token, 'base64').toString('utf-8');
-      const tokenData = JSON.parse(decodedToken);
-
-      const MyTischtennis = (await import('../models/MyTischtennis.js')).default;
-      const myTischtennisAccount = await MyTischtennis.findOne({ where: { userId } });
-      
-      if (myTischtennisAccount) {
-        myTischtennisAccount.accessToken = tokenData.access_token;
-        myTischtennisAccount.refreshToken = tokenData.refresh_token;
-        myTischtennisAccount.expiresAt = tokenData.expires_at;
-        myTischtennisAccount.cookie = cookieString.split(';')[0].trim();
-        myTischtennisAccount.userData = tokenData.user;
-        myTischtennisAccount.lastLoginSuccess = new Date();
-        myTischtennisAccount.lastLoginAttempt = new Date();
-        
-        // Hole Club-Informationen
-        const myTischtennisClient = (await import('../clients/myTischtennisClient.js')).default;
-        const profileResult = await myTischtennisClient.getUserProfile(myTischtennisAccount.cookie);
-        if (profileResult.success) {
-          myTischtennisAccount.clubId = profileResult.clubId;
-          myTischtennisAccount.clubName = profileResult.clubName;
-          myTischtennisAccount.fedNickname = profileResult.fedNickname;
-        }
-        
-        await myTischtennisAccount.save();
-      }
-    } catch (error) {
-      console.error('Fehler beim Speichern der Session:', error);
-      throw error;
-    }
-  }
-
   /**
    * POST /api/mytischtennis/extract-session
    * Extrahiere Session nach Login im iframe

backend/controllers/myTischtennisUrlController.js

@@ -3,14 +3,132 @@ import myTischtennisService from '../services/myTischtennisService.js';
 import MemberService from '../services/memberService.js';
 import autoFetchMatchResultsService from '../services/autoFetchMatchResultsService.js';
 import apiLogService from '../services/apiLogService.js';
+import axios from 'axios';
 import ClubTeam from '../models/ClubTeam.js';
 import League from '../models/League.js';
 import Season from '../models/Season.js';
 import User from '../models/User.js';
 import HttpError from '../exceptions/HttpError.js';
 import { devLog } from '../utils/logger.js';
+import { randomUUID } from 'crypto';
+
+const teamDataFetchJobs = new Map();
+const TEAM_DATA_JOB_TTL_MS = 60 * 60 * 1000;
+
+const cleanupFinishedTeamDataJobs = () => {
+  const now = Date.now();
+  for (const [jobId, job] of teamDataFetchJobs.entries()) {
+    if (job.finishedAt && (now - job.finishedAt) > TEAM_DATA_JOB_TTL_MS) {
+      teamDataFetchJobs.delete(jobId);
+    }
+  }
+};
 
 class MyTischtennisUrlController {
+  async startFetchTeamDataJob(req, res, next) {
+    try {
+      const { clubTeamId } = req.body || {};
+      if (!clubTeamId) {
+        throw new HttpError('clubTeamId is required', 400);
+      }
+
+      cleanupFinishedTeamDataJobs();
+
+      const jobId = randomUUID();
+      const startedAt = Date.now();
+      teamDataFetchJobs.set(jobId, {
+        jobId,
+        status: 'queued',
+        startedAt,
+        updatedAt: startedAt,
+        finishedAt: null,
+        clubTeamId,
+        result: null,
+        error: null
+      });
+
+      const authHeaders = {
+        authcode: req.headers.authcode,
+        userid: req.headers.userid
+      };
+      const internalPort = process.env.PORT || 3050;
+      const internalUrl = `http://127.0.0.1:${internalPort}/api/mytischtennis/fetch-team-data`;
+
+      // Background execution; response is returned immediately.
+      (async () => {
+        const job = teamDataFetchJobs.get(jobId);
+        if (!job) return;
+        job.status = 'running';
+        job.updatedAt = Date.now();
+
+        try {
+          const response = await axios.post(
+            internalUrl,
+            { clubTeamId },
+            {
+              headers: authHeaders,
+              timeout: 10 * 60 * 1000,
+              validateStatus: () => true
+            }
+          );
+
+          if (response.status >= 200 && response.status < 300 && response.data?.success) {
+            job.status = 'completed';
+            job.result = response.data;
+            job.error = null;
+          } else {
+            job.status = 'failed';
+            job.result = null;
+            job.error = response.data?.error || response.data?.message || `Job failed with status ${response.status}`;
+          }
+        } catch (error) {
+          job.status = 'failed';
+          job.result = null;
+          job.error = error?.message || String(error);
+        } finally {
+          job.updatedAt = Date.now();
+          job.finishedAt = Date.now();
+        }
+      })();
+
+      return res.status(202).json({
+        success: true,
+        jobId,
+        status: 'queued'
+      });
+    } catch (error) {
+      next(error);
+    }
+  }
+
+  async getFetchTeamDataJobStatus(req, res, next) {
+    try {
+      const { jobId } = req.params;
+      cleanupFinishedTeamDataJobs();
+      const job = teamDataFetchJobs.get(jobId);
+
+      if (!job) {
+        throw new HttpError('Job not found', 404);
+      }
+
+      return res.status(200).json({
+        success: true,
+        job: {
+          jobId: job.jobId,
+          status: job.status,
+          startedAt: job.startedAt,
+          updatedAt: job.updatedAt,
+          finishedAt: job.finishedAt,
+          clubTeamId: job.clubTeamId,
+          result: job.result,
+          error: job.error
+        }
+      });
+    } catch (error) {
+      next(error);
+    }
+  }
+
   /**
    * Parse myTischtennis URL and return configuration data
    * POST /api/mytischtennis/parse-url

backend/controllers/officialTournamentController.js

@@ -1,16 +1,21 @@
-import { createRequire } from 'module';
-const require = createRequire(import.meta.url);
-const pdfParse = require('pdf-parse/lib/pdf-parse.js');
 import { checkAccess } from '../utils/userUtils.js';
-import OfficialTournament from '../models/OfficialTournament.js';
-import OfficialCompetition from '../models/OfficialCompetition.js';
-import OfficialCompetitionMember from '../models/OfficialCompetitionMember.js';
-import Member from '../models/Member.js';
-import { Op } from 'sequelize';
+import officialTournamentService from '../services/officialTournamentService.js';
+import clickTtTournamentRegistrationService from '../services/clickTtTournamentRegistrationService.js';
 
-// In-Memory Store (einfacher Start); später DB-Modell
-const parsedTournaments = new Map(); // key: id, value: { id, clubId, rawText, parsedData }
-let seq = 1;
+export const updateOfficialTournament = async (req, res) => {
+  try {
+    const { authcode: userToken } = req.headers;
+    const { clubId, id } = req.params;
+    await checkAccess(userToken, clubId);
+
+    const result = await officialTournamentService.updateOfficialTournament(clubId, id, req.body);
+    if (!result) return res.status(404).json({ error: 'not found' });
+    res.status(200).json(result);
+  } catch (e) {
+    console.error('[updateOfficialTournament] Error:', e);
+    res.status(500).json({ error: 'Failed to update tournament' });
+  }
+};
 
 export const uploadTournamentPdf = async (req, res) => {
   try {
@@ -18,45 +23,9 @@ export const uploadTournamentPdf = async (req, res) => {
     const { clubId } = req.params;
     await checkAccess(userToken, clubId);
     if (!req.file || !req.file.buffer) return res.status(400).json({ error: 'No pdf provided' });
-    const data = await pdfParse(req.file.buffer);
-    const parsed = parseTournamentText(data.text);
-    const t = await OfficialTournament.create({
-      clubId,
-      title: parsed.title || null,
-      eventDate: parsed.termin || null,
-      organizer: null,
-      host: null,
-      venues: JSON.stringify(parsed.austragungsorte || []),
-      competitionTypes: JSON.stringify(parsed.konkurrenztypen || []),
-      registrationDeadlines: JSON.stringify(parsed.meldeschluesse || []),
-      entryFees: JSON.stringify(parsed.entryFees || {}),
-    });
-    // competitions persistieren
-    for (const c of parsed.competitions || []) {
-      // Korrigiere Fehlzuordnung: Wenn die Zeile mit "Stichtag" fälschlich in performanceClass steht
-      let performanceClass = c.leistungsklasse || c.performanceClass || null;
-      let cutoffDate = c.stichtag || c.cutoffDate || null;
-      if (performanceClass && /^stichtag\b/i.test(performanceClass)) {
-        cutoffDate = performanceClass.replace(/^stichtag\s*:?\s*/i, '').trim();
-        performanceClass = null;
-      }
-      await OfficialCompetition.create({
-        tournamentId: t.id,
-        ageClassCompetition: c.altersklasseWettbewerb || c.ageClassCompetition || null,
-        performanceClass,
-        startTime: c.startzeit || c.startTime || null,
-        registrationDeadlineDate: c.meldeschlussDatum || c.registrationDeadlineDate || null,
-        registrationDeadlineOnline: c.meldeschlussOnline || c.registrationDeadlineOnline || null,
-        cutoffDate,
-        ttrRelevant: c.ttrRelevant || null,
-        openTo: c.offenFuer || c.openTo || null,
-        preliminaryRound: c.vorrunde || c.preliminaryRound || null,
-        finalRound: c.endrunde || c.finalRound || null,
-        maxParticipants: c.maxTeilnehmer || c.maxParticipants || null,
-        entryFee: c.startgeld || c.entryFee || null,
-      });
-    }
-    res.status(201).json({ id: String(t.id) });
+
+    const result = await officialTournamentService.uploadTournamentPdf(clubId, req.file.buffer);
+    res.status(201).json(result);
   } catch (e) {
     console.error('[uploadTournamentPdf] Error:', e);
     res.status(500).json({ error: 'Failed to parse pdf' });
@@ -68,64 +37,10 @@ export const getParsedTournament = async (req, res) => {
     const { authcode: userToken } = req.headers;
     const { clubId, id } = req.params;
     await checkAccess(userToken, clubId);
-    const t = await OfficialTournament.findOne({ where: { id, clubId } });
-    if (!t) return res.status(404).json({ error: 'not found' });
-    const comps = await OfficialCompetition.findAll({ where: { tournamentId: id } });
-    const entries = await OfficialCompetitionMember.findAll({ where: { tournamentId: id } });
-    const competitions = comps.map((c) => {
-      const j = c.toJSON();
-      return {
-        id: j.id,
-        tournamentId: j.tournamentId,
-        ageClassCompetition: j.ageClassCompetition || null,
-        performanceClass: j.performanceClass || null,
-        startTime: j.startTime || null,
-        registrationDeadlineDate: j.registrationDeadlineDate || null,
-        registrationDeadlineOnline: j.registrationDeadlineOnline || null,
-        cutoffDate: j.cutoffDate || null,
-        ttrRelevant: j.ttrRelevant || null,
-        openTo: j.openTo || null,
-        preliminaryRound: j.preliminaryRound || null,
-        finalRound: j.finalRound || null,
-        maxParticipants: j.maxParticipants || null,
-        entryFee: j.entryFee || null,
-        // Legacy Felder zusätzlich, falls Frontend sie noch nutzt
-        altersklasseWettbewerb: j.ageClassCompetition || null,
-        leistungsklasse: j.performanceClass || null,
-        startzeit: j.startTime || null,
-        meldeschlussDatum: j.registrationDeadlineDate || null,
-        meldeschlussOnline: j.registrationDeadlineOnline || null,
-        stichtag: j.cutoffDate || null,
-        offenFuer: j.openTo || null,
-        vorrunde: j.preliminaryRound || null,
-        endrunde: j.finalRound || null,
-        maxTeilnehmer: j.maxParticipants || null,
-        startgeld: j.entryFee || null,
-      };
-    });
-    res.status(200).json({
-      id: String(t.id),
-      clubId: String(t.clubId),
-      parsedData: {
-        title: t.title,
-        termin: t.eventDate,
-        austragungsorte: JSON.parse(t.venues || '[]'),
-        konkurrenztypen: JSON.parse(t.competitionTypes || '[]'),
-        meldeschluesse: JSON.parse(t.registrationDeadlines || '[]'),
-        entryFees: JSON.parse(t.entryFees || '{}'),
-        competitions,
-      },
-      participation: entries.map(e => ({
-        id: e.id,
-        tournamentId: e.tournamentId,
-        competitionId: e.competitionId,
-        memberId: e.memberId,
-        wants: !!e.wants,
-        registered: !!e.registered,
-        participated: !!e.participated,
-        placement: e.placement || null,
-      })),
-    });
+
+    const result = await officialTournamentService.getParsedTournament(clubId, id);
+    if (!result) return res.status(404).json({ error: 'not found' });
+    res.status(200).json(result);
   } catch (e) {
     res.status(500).json({ error: 'Failed to fetch parsed tournament' });
   }
@@ -134,30 +49,14 @@ export const getParsedTournament = async (req, res) => {
 export const upsertCompetitionMember = async (req, res) => {
   try {
     const { authcode: userToken } = req.headers;
-    const { clubId, id } = req.params; // id = tournamentId
+    const { clubId, id } = req.params;
     await checkAccess(userToken, clubId);
-    const { competitionId, memberId, wants, registered, participated, placement } = req.body;
-    if (!competitionId || !memberId) return res.status(400).json({ error: 'competitionId and memberId required' });
-    const [row] = await OfficialCompetitionMember.findOrCreate({
-      where: { competitionId, memberId },
-      defaults: {
-        tournamentId: id,
-        competitionId,
-        memberId,
-        wants: !!wants,
-        registered: !!registered,
-        participated: !!participated,
-        placement: placement || null,
-      }
-    });
-    row.wants = wants !== undefined ? !!wants : row.wants;
-    row.registered = registered !== undefined ? !!registered : row.registered;
-    row.participated = participated !== undefined ? !!participated : row.participated;
-    if (placement !== undefined) row.placement = placement;
-    await row.save();
-    return res.status(200).json({ success: true, id: row.id });
+
+    const result = await officialTournamentService.upsertCompetitionMember(id, req.body);
+    return res.status(200).json(result);
   } catch (e) {
     console.error('[upsertCompetitionMember] Error:', e);
+    if (e?.status) return res.status(e.status).json({ error: e.message });
     res.status(500).json({ error: 'Failed to save participation' });
   }
 };
@@ -165,64 +64,14 @@ export const upsertCompetitionMember = async (req, res) => {
 export const updateParticipantStatus = async (req, res) => {
   try {
     const { authcode: userToken } = req.headers;
-    const { clubId, id } = req.params; // id = tournamentId
+    const { clubId, id } = req.params;
     await checkAccess(userToken, clubId);
-    const { competitionId, memberId, action } = req.body;
-    
-    if (!competitionId || !memberId || !action) {
-      return res.status(400).json({ error: 'competitionId, memberId and action required' });
-    }
 
-    const [row] = await OfficialCompetitionMember.findOrCreate({
-      where: { competitionId, memberId },
-      defaults: {
-        tournamentId: id,
-        competitionId,
-        memberId,
-        wants: false,
-        registered: false,
-        participated: false,
-        placement: null,
-      }
-    });
-
-    // Status-Update basierend auf Aktion
-    switch (action) {
-      case 'register':
-        // Von "möchte teilnehmen" zu "angemeldet"
-        row.wants = true;
-        row.registered = true;
-        row.participated = false;
-        break;
-      case 'participate':
-        // Von "angemeldet" zu "hat gespielt"
-        row.wants = true;
-        row.registered = true;
-        row.participated = true;
-        break;
-      case 'reset':
-        // Zurück zu "möchte teilnehmen"
-        row.wants = true;
-        row.registered = false;
-        row.participated = false;
-        break;
-      default:
-        return res.status(400).json({ error: 'Invalid action. Use: register, participate, or reset' });
-    }
-
-    await row.save();
-    return res.status(200).json({ 
-      success: true, 
-      id: row.id,
-      status: {
-        wants: row.wants,
-        registered: row.registered,
-        participated: row.participated,
-        placement: row.placement
-      }
-    });
+    const result = await officialTournamentService.updateParticipantStatus(id, req.body);
+    return res.status(200).json(result);
   } catch (e) {
     console.error('[updateParticipantStatus] Error:', e);
+    if (e?.status) return res.status(e.status).json({ error: e.message });
     res.status(500).json({ error: 'Failed to update participant status' });
   }
 };
@@ -232,8 +81,9 @@ export const listOfficialTournaments = async (req, res) => {
     const { authcode: userToken } = req.headers;
     const { clubId } = req.params;
     await checkAccess(userToken, clubId);
-    const list = await OfficialTournament.findAll({ where: { clubId } });
-    res.status(200).json(Array.isArray(list) ? list : []);
+
+    const list = await officialTournamentService.listOfficialTournaments(clubId);
+    res.status(200).json(list);
   } catch (e) {
     console.error('[listOfficialTournaments] Error:', e);
     const errorMessage = e.message || 'Failed to list tournaments';
@@ -246,99 +96,8 @@ export const listClubParticipations = async (req, res) => {
     const { authcode: userToken } = req.headers;
     const { clubId } = req.params;
     await checkAccess(userToken, clubId);
-    const tournaments = await OfficialTournament.findAll({ where: { clubId } });
-    if (!tournaments || tournaments.length === 0) return res.status(200).json([]);
-    const tournamentIds = tournaments.map(t => t.id);
-
-    const rows = await OfficialCompetitionMember.findAll({
-      where: { tournamentId: { [Op.in]: tournamentIds }, participated: true },
-      include: [
-        { model: OfficialCompetition, as: 'competition', attributes: ['id', 'tournamentId', 'ageClassCompetition', 'startTime'] },
-        { model: OfficialTournament, as: 'tournament', attributes: ['id', 'title', 'eventDate'] },
-        { model: Member, as: 'member', attributes: ['id', 'firstName', 'lastName'] },
-      ]
-    });
-
-    const parseDmy = (s) => {
-      if (!s) return null;
-      const m = String(s).match(/(\d{1,2})\.(\d{1,2})\.(\d{4})/);
-      if (!m) return null;
-      const d = new Date(Number(m[3]), Number(m[2]) - 1, Number(m[1]));
-      return isNaN(d.getTime()) ? null : d;
-    };
-    const fmtDmy = (d) => {
-      const dd = String(d.getDate()).padStart(2, '0');
-      const mm = String(d.getMonth() + 1).padStart(2, '0');
-      const yyyy = d.getFullYear();
-      return `${dd}.${mm}.${yyyy}`;
-    };
-
-    const byTournament = new Map();
-    for (const r of rows) {
-      const t = r.tournament;
-      const c = r.competition;
-      const m = r.member;
-      if (!t || !c || !m) continue;
-      if (!byTournament.has(t.id)) {
-        byTournament.set(t.id, {
-          tournamentId: String(t.id),
-          title: t.title || null,
-          startDate: null,
-          endDate: null,
-          entries: [],
-          _dates: [],
-          _eventDate: t.eventDate || null,
-        });
-      }
-      const bucket = byTournament.get(t.id);
-      const compDate = parseDmy(c.startTime || '') || null;
-      if (compDate) bucket._dates.push(compDate);
-      bucket.entries.push({
-        memberId: m.id,
-        memberName: `${m.firstName || ''} ${m.lastName || ''}`.trim(),
-        competitionId: c.id,
-        competitionName: c.ageClassCompetition || '',
-        placement: r.placement || null,
-        date: compDate ? fmtDmy(compDate) : null,
-      });
-    }
-
-    const out = [];
-    for (const t of tournaments) {
-      const bucket = byTournament.get(t.id) || {
-        tournamentId: String(t.id),
-        title: t.title || null,
-        startDate: null,
-        endDate: null,
-        entries: [],
-        _dates: [],
-        _eventDate: t.eventDate || null,
-      };
-      // Ableiten Start/Ende
-      if (bucket._dates.length) {
-        bucket._dates.sort((a, b) => a - b);
-        bucket.startDate = fmtDmy(bucket._dates[0]);
-        bucket.endDate = fmtDmy(bucket._dates[bucket._dates.length - 1]);
-      } else if (bucket._eventDate) {
-        const all = String(bucket._eventDate).match(/(\d{1,2}\.\d{1,2}\.\d{4})/g) || [];
-        if (all.length >= 1) {
-          const d1 = parseDmy(all[0]);
-          const d2 = all.length >= 2 ? parseDmy(all[1]) : d1;
-          if (d1) bucket.startDate = fmtDmy(d1);
-          if (d2) bucket.endDate = fmtDmy(d2);
-        }
-      }
-      // Sort entries: Mitglied, dann Konkurrenz
-      bucket.entries.sort((a, b) => {
-        const mcmp = (a.memberName || '').localeCompare(b.memberName || '', 'de', { sensitivity: 'base' });
-        if (mcmp !== 0) return mcmp;
-        return (a.competitionName || '').localeCompare(b.competitionName || '', 'de', { sensitivity: 'base' });
-      });
-      delete bucket._dates;
-      delete bucket._eventDate;
-      out.push(bucket);
-    }
 
+    const out = await officialTournamentService.listClubParticipations(clubId);
     res.status(200).json(out);
   } catch (e) {
     res.status(500).json({ error: 'Failed to list club participations' });
@@ -350,272 +109,34 @@ export const deleteOfficialTournament = async (req, res) => {
     const { authcode: userToken } = req.headers;
     const { clubId, id } = req.params;
     await checkAccess(userToken, clubId);
-    const t = await OfficialTournament.findOne({ where: { id, clubId } });
-    if (!t) return res.status(404).json({ error: 'not found' });
-    await OfficialCompetition.destroy({ where: { tournamentId: id } });
-    await OfficialTournament.destroy({ where: { id } });
+
+    const deleted = await officialTournamentService.deleteOfficialTournament(clubId, id);
+    if (!deleted) return res.status(404).json({ error: 'not found' });
     res.status(204).send();
   } catch (e) {
     res.status(500).json({ error: 'Failed to delete tournament' });
   }
 };
 
-function parseTournamentText(text) {
-  const lines = text.split(/\r?\n/);
-  const normLines = lines.map(l => l.replace(/\s+/g, ' ').trim());
+export const autoRegisterOfficialTournamentParticipants = async (req, res) => {
+  try {
+    const { authcode: userToken } = req.headers;
+    const { clubId, id: tournamentId } = req.params;
+    const userId = req.user?.id;
 
-  const findTitle = () => {
-    const idx = normLines.findIndex(l => /Kreiseinzelmeisterschaften/i.test(l));
-    return idx >= 0 ? normLines[idx] : null;
-  };
+    const result = await clickTtTournamentRegistrationService.autoRegisterPendingParticipants({
+      userToken,
+      userId,
+      clubId,
+      tournamentId
+    });
 
-  // Neue Funktion: Teilnahmegebühren pro Spielklasse extrahieren
-  const extractEntryFees = () => {
-    const entryFees = {};
-    
-    // Verschiedene Patterns für Teilnahmegebühren suchen
-    const feePatterns = [
-      // Pattern 1: "Startgeld: U12: 5€, U14: 7€, U16: 10€"
-      /startgeld\s*:?\s*(.+)/i,
-      // Pattern 2: "Teilnahmegebühr: U12: 5€, U14: 7€"
-      /teilnahmegebühr\s*:?\s*(.+)/i,
-      // Pattern 3: "Gebühr: U12: 5€, U14: 7€"
-      /gebühr\s*:?\s*(.+)/i,
-      // Pattern 4: "Einschreibegebühr: U12: 5€, U14: 7€"
-      /einschreibegebühr\s*:?\s*(.+)/i,
-      // Pattern 5: "Anmeldegebühr: U12: 5€, U14: 7€"
-      /anmeldegebühr\s*:?\s*(.+)/i
-    ];
-
-    for (const pattern of feePatterns) {
-      for (let i = 0; i < normLines.length; i++) {
-        const line = normLines[i];
-        const match = line.match(pattern);
-        if (match) {
-          const feeText = match[1];
-          
-          // Extrahiere Gebühren aus dem Text
-          // Unterstützt verschiedene Formate:
-          // "U12: 5€, U14: 7€, U16: 10€"
-          // "U12: 5 Euro, U14: 7 Euro"
-          // "U12 5€, U14 7€"
-          // "U12: 5,00€, U14: 7,00€"
-          const feeMatches = feeText.matchAll(/(U\d+|AK\s*\d+)\s*:?\s*(\d+(?:[,.]\d+)?)\s*(?:€|Euro|EUR)?/gi);
-          
-          for (const feeMatch of feeMatches) {
-            const ageClass = feeMatch[1].toUpperCase().replace(/\s+/g, '');
-            const amount = feeMatch[2].replace(',', '.');
-            const numericAmount = parseFloat(amount);
-            
-            if (!isNaN(numericAmount)) {
-              entryFees[ageClass] = {
-                amount: numericAmount,
-                currency: '€',
-                rawText: feeMatch[0]
-              };
-            }
-          }
-          
-          // Wenn wir Gebühren gefunden haben, brechen wir ab
-          if (Object.keys(entryFees).length > 0) {
-            break;
-          }
-        }
-      }
-      if (Object.keys(entryFees).length > 0) {
-        break;
-      }
-    }
-
-    return entryFees;
-  };
-
-  const extractBlockAfter = (labels, multiline = false) => {
-    const idx = normLines.findIndex(l => labels.some(lb => l.toLowerCase().startsWith(lb)));
-    if (idx === -1) return multiline ? [] : null;
-    const line = normLines[idx];
-    const afterColon = line.includes(':') ? line.split(':').slice(1).join(':').trim() : '';
-    if (!multiline) {
-      if (afterColon) return afterColon;
-      // sonst nächste nicht-leere Zeile
-      for (let i = idx + 1; i < normLines.length; i++) {
-        if (normLines[i]) return normLines[i];
-      }
-      return null;
-    }
-    // multiline bis zur nächsten Leerzeile oder nächsten bekannten Section
-    const out = [];
-    if (afterColon) out.push(afterColon);
-    for (let i = idx + 1; i < normLines.length; i++) {
-      const ln = normLines[i];
-      if (!ln) break;
-      if (/^(termin|austragungsort|austragungsorte|konkurrenz|konkurrenzen|konkurrenztypen|meldeschluss|altersklassen|startzeiten)/i.test(ln)) break;
-      out.push(ln);
-    }
-    return out;
-  };
-
-  const extractAllMatches = (regex) => {
-    const results = [];
-    for (const l of normLines) {
-      const m = l.match(regex);
-      if (m) results.push(m);
-    }
-    return results;
-  };
-
-  const title = findTitle();
-  const termin = extractBlockAfter(['termin', 'termin '], false);
-  const austragungsorte = extractBlockAfter(['austragungsort', 'austragungsorte'], true);
-  let konkurrenzRaw = extractBlockAfter(['konkurrenz', 'konkurrenzen', 'konkurrenztypen'], true);
-  if (konkurrenzRaw && !Array.isArray(konkurrenzRaw)) konkurrenzRaw = [konkurrenzRaw];
-  const konkurrenztypen = (konkurrenzRaw || []).flatMap(l => l.split(/[;,]/)).map(s => s.trim()).filter(Boolean);
-
-  // Meldeschlüsse mit Position und Zuordnung zu AK ermitteln
-  const meldeschluesseRaw = [];
-  for (let i = 0; i < normLines.length; i++) {
-    const l = normLines[i];
-    const m = l.match(/meldeschluss\s*:?\s*(.+)$/i);
-    if (m) meldeschluesseRaw.push({ line: i, value: m[1].trim() });
+    res.status(200).json(result);
+  } catch (e) {
+    console.error('[autoRegisterOfficialTournamentParticipants] Error:', e);
+    res.status(e.statusCode || e.status || 500).json({
+      success: false,
+      error: e.message || 'Teilnehmer konnten nicht automatisch in click-TT angemeldet werden'
+    });
   }
-
-  let altersRaw = extractBlockAfter(['altersklassen', 'altersklasse'], true);
-  if (altersRaw && !Array.isArray(altersRaw)) altersRaw = [altersRaw];
-  const altersklassen = (altersRaw || []).flatMap(l => l.split(/[;,]/)).map(s => s.trim()).filter(Boolean);
-
-  // Wettbewerbe/Konkurrenzen parsen (Block ab "3. Konkurrenzen")
-  const competitions = [];
-  const konkIdx = normLines.findIndex(l => /^\s*3\.?\s+Konkurrenzen/i.test(l) || /^Konkurrenzen\b/i.test(l));
-  // Bestimme Start-Sektionsnummer (z. B. 3 bei "3. Konkurrenzen"), fallback 3
-  const startSectionNum = (() => {
-    if (konkIdx === -1) return 3;
-    const m = normLines[konkIdx].match(/^\s*(\d+)\./);
-    return m ? parseInt(m[1], 10) : 3;
-  })();
-  const nextSectionIdx = () => {
-    for (let i = konkIdx + 1; i < normLines.length; i++) {
-      const m = normLines[i].match(/^\s*(\d+)\.\s+/);
-      if (m) {
-        const num = parseInt(m[1], 10);
-        if (!Number.isNaN(num) && num > startSectionNum) return i;
-      }
-      // Hinweis: Seitenfußzeilen wie "nu.Dokument ..." ignorieren wir, damit mehrseitige Blöcke nicht abbrechen
-    }
-    return normLines.length;
-  };
-  if (konkIdx !== -1) {
-    const endIdx = nextSectionIdx();
-    let i = konkIdx + 1;
-    while (i < endIdx) {
-      const line = normLines[i];
-      if (/^Altersklasse\/Wettbewerb\s*:/i.test(line)) {
-        const comp = {};
-        comp.altersklasseWettbewerb = line.split(':').slice(1).join(':').trim();
-        i++;
-        while (i < endIdx && !/^Altersklasse\/Wettbewerb\s*:/i.test(normLines[i])) {
-          const ln = normLines[i];
-          const m = ln.match(/^([^:]+):\s*(.*)$/);
-          if (m) {
-            const key = m[1].trim().toLowerCase();
-            const val = m[2].trim();
-            if (key.startsWith('leistungsklasse')) comp.leistungsklasse = val;
-            else if (key === 'startzeit') {
-              // Erwartet: 20.09.2025 13:30 Uhr -> wir extrahieren Datum+Zeit
-              const sm = val.match(/(\d{2}\.\d{2}\.\d{4})\s+(\d{1,2}:\d{2})/);
-              comp.startzeit = sm ? `${sm[1]} ${sm[2]}` : val;
-            }
-            else if (key.startsWith('meldeschluss datum')) comp.meldeschlussDatum = val;
-            else if (key.startsWith('meldeschluss online')) comp.meldeschlussOnline = val;
-            else if (key === 'stichtag') comp.stichtag = val;
-            else if (key === 'ttr-relevant') comp.ttrRelevant = val;
-            else if (key === 'offen für') comp.offenFuer = val;
-            else if (key.startsWith('austragungssys. vorrunde')) comp.vorrunde = val;
-            else if (key.startsWith('austragungssys. endrunde')) comp.endrunde = val;
-            else if (key.startsWith('max. teilnehmerzahl')) comp.maxTeilnehmer = val;
-            else if (key === 'startgeld') {
-              comp.startgeld = val;
-              // Versuche auch spezifische Gebühren für diese Altersklasse zu extrahieren
-              const ageClassMatch = comp.altersklasseWettbewerb?.match(/(U\d+|AK\s*\d+)/i);
-              if (ageClassMatch) {
-                const ageClass = ageClassMatch[1].toUpperCase().replace(/\s+/g, '');
-                const feeMatch = val.match(/(\d+(?:[,.]\d+)?)\s*(?:€|Euro|EUR)?/);
-                if (feeMatch) {
-                  const amount = feeMatch[1].replace(',', '.');
-                  const numericAmount = parseFloat(amount);
-                  if (!isNaN(numericAmount)) {
-                    comp.entryFeeDetails = {
-                      amount: numericAmount,
-                      currency: '€',
-                      ageClass: ageClass
-                    };
-                  }
-                }
-              }
-            }
-          }
-          i++;
-        }
-        competitions.push(comp);
-        continue; // schon auf nächster Zeile
-      }
-      i++;
-    }
-  }
-
-  // Altersklassen-Positionen im Text (zur Zuordnung von Meldeschlüssen)
-  const akPositions = [];
-  for (let i = 0; i < normLines.length; i++) {
-    const l = normLines[i];
-    const m = l.match(/\b(U\d+|AK\s*\d+)\b/i);
-    if (m) akPositions.push({ line: i, ak: m[1].toUpperCase().replace(/\s+/g, '') });
-  }
-
-  const meldeschluesseByAk = {};
-  for (const ms of meldeschluesseRaw) {
-    // Nächste AK im Umkreis von 3 Zeilen suchen
-    let best = null;
-    let bestDist = Infinity;
-    for (const ak of akPositions) {
-      const dist = Math.abs(ak.line - ms.line);
-      if (dist < bestDist && dist <= 3) { best = ak; bestDist = dist; }
-    }
-    if (best) {
-      if (!meldeschluesseByAk[best.ak]) meldeschluesseByAk[best.ak] = new Set();
-      meldeschluesseByAk[best.ak].add(ms.value);
-    }
-  }
-
-  // Dedup global
-  const meldeschluesse = Array.from(new Set(meldeschluesseRaw.map(x => x.value)));
-  // Sets zu Arrays
-  const meldeschluesseByAkOut = Object.fromEntries(Object.entries(meldeschluesseByAk).map(([k,v]) => [k, Array.from(v)]));
-
-  // Vorhandene einfache Personenerkennung (optional, zu Analysezwecken)
-  const entries = [];
-  for (const l of normLines) {
-    const m = l.match(/^([A-Za-zÄÖÜäöüß\-\s']{3,})(?:\s+\((m|w|d)\))?$/i);
-    if (m && /\s/.test(m[1])) {
-      entries.push({ name: m[1].trim(), genderHint: m[2] || null });
-    }
-  }
-
-  // Extrahiere Teilnahmegebühren
-  const entryFees = extractEntryFees();
-
-  return {
-    title,
-    termin,
-    austragungsorte,
-    konkurrenztypen,
-    meldeschluesse,
-    meldeschluesseByAk: meldeschluesseByAkOut,
-    altersklassen,
-    startzeiten: {},
-    competitions,
-    entries,
-    entryFees, // Neue: Teilnahmegebühren pro Spielklasse
-    debug: { normLines },
-  };
-}
-
-
+};

backend/controllers/participantController.js

@@ -1,13 +1,17 @@
 import Participant from '../models/Participant.js';
 import DiaryDates from '../models/DiaryDates.js';
+import DiaryMemberActivity from '../models/DiaryMemberActivity.js';
 import { devLog } from '../utils/logger.js';
 import { emitParticipantAdded, emitParticipantRemoved, emitParticipantUpdated } from '../services/socketService.js';
+
+const PARTICIPANT_ATTRIBUTES = ['id', 'diaryDateId', 'memberId', 'attendanceStatus', 'groupId', 'notes', 'createdAt', 'updatedAt'];
+
 export const getParticipants = async (req, res) => {
     try {
         const { dateId } = req.params;
         const participants = await Participant.findAll({ 
             where: { diaryDateId: dateId },
-            attributes: ['id', 'diaryDateId', 'memberId', 'groupId', 'notes', 'createdAt', 'updatedAt']
+            attributes: PARTICIPANT_ATTRIBUTES
         });
         res.status(200).json(participants);
     } catch (error) {
@@ -68,12 +72,22 @@ export const updateParticipantGroup = async (req, res) => {
 export const addParticipant = async (req, res) => {
     try {
         const { diaryDateId, memberId } = req.body;
-        const participant = await Participant.create({ diaryDateId, memberId });
+        const [participant, created] = await Participant.findOrCreate({
+            where: { diaryDateId, memberId },
+            defaults: { diaryDateId, memberId, attendanceStatus: 'present' }
+        });
+
+        participant.attendanceStatus = 'present';
+        await participant.save();
         
         // Hole DiaryDate für clubId
         const diaryDate = await DiaryDates.findByPk(diaryDateId);
         if (diaryDate?.clubId) {
-            emitParticipantAdded(diaryDate.clubId, diaryDateId, participant);
+            if (created) {
+                emitParticipantAdded(diaryDate.clubId, diaryDateId, participant);
+            } else {
+                emitParticipantUpdated(diaryDate.clubId, diaryDateId, participant);
+            }
         }
         
         res.status(201).json(participant);
@@ -90,6 +104,15 @@ export const removeParticipant = async (req, res) => {
         // Hole DiaryDate für clubId vor dem Löschen
         const diaryDate = await DiaryDates.findByPk(diaryDateId);
         const clubId = diaryDate?.clubId;
+
+        const participant = await Participant.findOne({
+            where: { diaryDateId, memberId },
+            attributes: ['id']
+        });
+
+        if (participant) {
+            await DiaryMemberActivity.destroy({ where: { participantId: participant.id } });
+        }
         
         await Participant.destroy({ where: { diaryDateId, memberId } });
         
@@ -104,3 +127,53 @@ export const removeParticipant = async (req, res) => {
         res.status(500).json({ error: 'Fehler beim Entfernen des Teilnehmers' });
     }
 };
+
+export const updateParticipantStatus = async (req, res) => {
+    try {
+        const { dateId, memberId } = req.params;
+        const { attendanceStatus } = req.body;
+
+        if (!['excused', 'cancelled'].includes(attendanceStatus)) {
+            return res.status(400).json({ error: 'Ungültiger Teilnehmerstatus' });
+        }
+
+        const diaryDate = await DiaryDates.findByPk(dateId);
+        if (!diaryDate) {
+            return res.status(404).json({ error: 'Trainingstag nicht gefunden' });
+        }
+
+        const [participant] = await Participant.findOrCreate({
+            where: {
+                diaryDateId: dateId,
+                memberId
+            },
+            defaults: {
+                diaryDateId: dateId,
+                memberId,
+                attendanceStatus
+            }
+        });
+
+        participant.attendanceStatus = attendanceStatus;
+        participant.groupId = null;
+        await participant.save();
+        await DiaryMemberActivity.destroy({ where: { participantId: participant.id } });
+
+        const updatedParticipant = await Participant.findOne({
+            where: {
+                diaryDateId: dateId,
+                memberId
+            },
+            attributes: PARTICIPANT_ATTRIBUTES
+        });
+
+        if (diaryDate.clubId && updatedParticipant) {
+            emitParticipantUpdated(diaryDate.clubId, dateId, updatedParticipant);
+        }
+
+        res.status(200).json(updatedParticipant || participant);
+    } catch (error) {
+        devLog(error);
+        res.status(500).json({ error: 'Fehler beim Aktualisieren des Teilnehmerstatus' });
+    }
+};

backend/controllers/permissionController.js

@@ -76,6 +76,29 @@ export const updateUserRole = async (req, res) => {
   }
 };
 
+export const updateUserRoles = async (req, res) => {
+  try {
+    const { clubId, userId: targetUserId } = req.params;
+    const { roleIds } = req.body;
+    const updatingUserId = req.user.id;
+
+    const result = await permissionService.setUserRoles(
+      parseInt(targetUserId),
+      parseInt(clubId),
+      Array.isArray(roleIds) ? roleIds : [],
+      updatingUserId
+    );
+
+    res.json(result);
+  } catch (error) {
+    console.error('Error updating user roles:', error);
+    if (error.message && error.message.toLowerCase().includes('keine berechtigung')) {
+      return res.status(403).json({ error: error.message });
+    }
+    res.status(400).json({ error: error.message });
+  }
+};
+
 /**
  * Update user custom permissions
  */
@@ -128,6 +151,62 @@ export const getPermissionStructure = async (req, res) => {
   }
 };
 
+export const getClubRoles = async (req, res) => {
+  try {
+    const { clubId } = req.params;
+    const roles = await permissionService.getClubRoles(parseInt(clubId, 10), req.user.id);
+    res.json(roles);
+  } catch (error) {
+    console.error('Error getting club roles:', error);
+    if (error.message && error.message.toLowerCase().includes('keine berechtigung')) {
+      return res.status(403).json({ error: error.message });
+    }
+    res.status(400).json({ error: error.message });
+  }
+};
+
+export const createClubRole = async (req, res) => {
+  try {
+    const { clubId } = req.params;
+    const role = await permissionService.createClubRole(parseInt(clubId, 10), req.body || {}, req.user.id);
+    res.status(201).json(role);
+  } catch (error) {
+    console.error('Error creating club role:', error);
+    if (error.message && error.message.toLowerCase().includes('keine berechtigung')) {
+      return res.status(403).json({ error: error.message });
+    }
+    res.status(400).json({ error: error.message });
+  }
+};
+
+export const updateClubRole = async (req, res) => {
+  try {
+    const { clubId, roleId } = req.params;
+    const role = await permissionService.updateClubRole(parseInt(clubId, 10), parseInt(roleId, 10), req.body || {}, req.user.id);
+    res.json(role);
+  } catch (error) {
+    console.error('Error updating club role:', error);
+    if (error.message && error.message.toLowerCase().includes('keine berechtigung')) {
+      return res.status(403).json({ error: error.message });
+    }
+    res.status(400).json({ error: error.message });
+  }
+};
+
+export const deleteClubRole = async (req, res) => {
+  try {
+    const { clubId, roleId } = req.params;
+    const result = await permissionService.deleteClubRole(parseInt(clubId, 10), parseInt(roleId, 10), req.user.id);
+    res.json(result);
+  } catch (error) {
+    console.error('Error deleting club role:', error);
+    if (error.message && error.message.toLowerCase().includes('keine berechtigung')) {
+      return res.status(403).json({ error: error.message });
+    }
+    res.status(400).json({ error: error.message });
+  }
+};
+
 /**
  * Update user status (activate/deactivate)
  */
@@ -158,10 +237,14 @@ export default {
   getUserPermissions,
   getClubMembersWithPermissions,
   updateUserRole,
+  updateUserRoles,
   updateUserPermissions,
   updateUserStatus,
   getAvailableRoles,
-  getPermissionStructure
+  getPermissionStructure,
+  getClubRoles,
+  createClubRole,
+  updateClubRole,
+  deleteClubRole,
 };
 
-

backend/controllers/predefinedActivityController.js

@@ -5,8 +5,8 @@ import fs from 'fs';
 
 export const createPredefinedActivity = async (req, res) => {
     try {
-        const { name, code, description, durationText, duration, imageLink, drawingData } = req.body;
-        const predefinedActivity = await predefinedActivityService.createPredefinedActivity({ name, code, description, durationText, duration, imageLink, drawingData });
+        const { name, code, description, durationText, duration, imageLink, drawingData, excludeFromStats } = req.body;
+        const predefinedActivity = await predefinedActivityService.createPredefinedActivity({ name, code, description, durationText, duration, imageLink, drawingData, excludeFromStats });
         res.status(201).json(predefinedActivity);
     } catch (error) {
         console.error('[createPredefinedActivity] - Error:', error);
@@ -16,7 +16,8 @@ export const createPredefinedActivity = async (req, res) => {
 
 export const getAllPredefinedActivities = async (req, res) => {
     try {
-        const predefinedActivities = await predefinedActivityService.getAllPredefinedActivities();
+        const { scope = 'all' } = req.query;
+        const predefinedActivities = await predefinedActivityService.getAllPredefinedActivities(scope);
         res.status(200).json(predefinedActivities);
     } catch (error) {
         console.error('[getAllPredefinedActivities] - Error:', error);
@@ -42,8 +43,8 @@ export const getPredefinedActivityById = async (req, res) => {
 export const updatePredefinedActivity = async (req, res) => {
     try {
         const { id } = req.params;
-        const { name, code, description, durationText, duration, imageLink, drawingData } = req.body;
-        const updatedActivity = await predefinedActivityService.updatePredefinedActivity(id, { name, code, description, durationText, duration, imageLink, drawingData });
+        const { name, code, description, durationText, duration, imageLink, drawingData, excludeFromStats } = req.body;
+        const updatedActivity = await predefinedActivityService.updatePredefinedActivity(id, { name, code, description, durationText, duration, imageLink, drawingData, excludeFromStats });
         res.status(200).json(updatedActivity);
     } catch (error) {
         console.error('[updatePredefinedActivity] - Error:', error);

backend/controllers/tournamentController.js

@@ -2,6 +2,7 @@
 import tournamentService from "../services/tournamentService.js";
 import { emitTournamentChanged } from '../services/socketService.js';
 import TournamentClass from '../models/TournamentClass.js';
+import HttpError from '../exceptions/HttpError.js';
 
 // 1. Alle Turniere eines Vereins
 export const getTournaments = async (req, res) => {
@@ -12,6 +13,11 @@ export const getTournaments = async (req, res) => {
         res.status(200).json(tournaments);
     } catch (error) {
         console.error(error);
+        if (error instanceof HttpError) {
+            res.set('x-debug-tournament-clubid', String(clubId));
+            res.set('x-debug-tournament-clubid-num', String(Number(clubId)));
+            return res.status(error.statusCode || 500).json({ error: error.message });
+        }
         res.status(500).json({ error: error.message });
     }
 };
@@ -36,23 +42,36 @@ export const addTournament = async (req, res) => {
 // 3. Teilnehmer hinzufügen - klassengebunden
 export const addParticipant = async (req, res) => {
     const { authcode: token } = req.headers;
-    const { clubId, classId, participant: participantId } = req.body;
+    const { clubId, classId, participant: participantId, tournamentId } = req.body;
     try {
+    // Payloads:
+    // - Mit Klasse (klassengebunden): { clubId, classId, participant }
+    // - Ohne Klasse (turnierweit):    { clubId, tournamentId, participant, classId: null }
         if (!participantId) {
             return res.status(400).json({ error: 'Teilnehmer-ID ist erforderlich' });
         }
-        if (!classId) {
-            return res.status(400).json({ error: 'Klasse ist erforderlich' });
+        // Allow adding a participant either to a specific class (classId) or to the whole tournament (no class)
+        if (!classId && !tournamentId) {
+            return res.status(400).json({ error: 'Klasse oder tournamentId ist erforderlich' });
         }
-        await tournamentService.addParticipant(token, clubId, classId, participantId);
-        // Hole tournamentId über die Klasse
-        const tournamentClass = await TournamentClass.findByPk(classId);
-        if (!tournamentClass) {
-            return res.status(404).json({ error: 'Klasse nicht gefunden' });
+
+        // Pass through to service. If classId is present it will be used, otherwise the service should add the participant with classId = null for the given tournamentId
+        await tournamentService.addParticipant(token, clubId, classId || null, participantId, tournamentId || null);
+
+        // Determine tournamentId for response and event emission
+        let respTournamentId = tournamentId;
+        if (classId && !respTournamentId) {
+            const tournamentClass = await TournamentClass.findByPk(classId);
+            if (!tournamentClass) {
+                return res.status(404).json({ error: 'Klasse nicht gefunden' });
+            }
+            respTournamentId = tournamentClass.tournamentId;
         }
-        const participants = await tournamentService.getParticipants(token, clubId, tournamentClass.tournamentId, classId);
+
+        // Fetch updated participants for the (optional) class or whole tournament
+        const participants = await tournamentService.getParticipants(token, clubId, respTournamentId, classId || null);
         // Emit Socket-Event
-        emitTournamentChanged(clubId, tournamentClass.tournamentId);
+        if (respTournamentId) emitTournamentChanged(clubId, respTournamentId);
         res.status(200).json(participants);
     } catch (error) {
         console.error('[addParticipant] Error:', error);
@@ -93,7 +112,29 @@ export const createGroups = async (req, res) => {
     const { authcode: token } = req.headers;
     const { clubId, tournamentId, numberOfGroups } = req.body;
     try {
-        await tournamentService.createGroups(token, clubId, tournamentId, numberOfGroups);
+        // DEBUG: Eingehende Daten sichtbar machen (temporär)
+        console.log('[tournamentController.createGroups] body:', req.body);
+        console.log('[tournamentController.createGroups] types:', {
+            clubId: typeof clubId,
+            tournamentId: typeof tournamentId,
+            numberOfGroups: typeof numberOfGroups,
+        });
+
+        // Turniere ohne Klassen: `numberOfGroups: 0` kommt aus der UI (Default) vor.
+        // Statt „nichts passiert“ normalisieren wir auf mindestens 1 Gruppe.
+        let normalizedNumberOfGroups = numberOfGroups;
+        if (normalizedNumberOfGroups !== undefined && normalizedNumberOfGroups !== null) {
+            const n = Number(normalizedNumberOfGroups);
+            console.log('[tournamentController.createGroups] parsed numberOfGroups:', n);
+            if (!Number.isFinite(n) || !Number.isInteger(n) || n < 0) {
+                return res.status(400).json({ error: 'numberOfGroups muss eine ganze Zahl >= 0 sein' });
+            }
+            normalizedNumberOfGroups = Math.max(1, n);
+        }
+
+        console.log('[tournamentController.createGroups] normalizedNumberOfGroups:', normalizedNumberOfGroups);
+
+        await tournamentService.createGroups(token, clubId, tournamentId, normalizedNumberOfGroups);
         // Emit Socket-Event
         emitTournamentChanged(clubId, tournamentId);
         res.sendStatus(204);
@@ -133,6 +174,21 @@ export const fillGroups = async (req, res) => {
     }
 };
 
+// 7b. Gruppenspiele erstellen ohne Gruppenzuordnungen zu ändern
+export const createGroupMatches = async (req, res) => {
+    const { authcode: token } = req.headers;
+    const { clubId, tournamentId, classId } = req.body;
+    try {
+        await tournamentService.createGroupMatches(token, clubId, tournamentId, classId);
+        // Emit Socket-Event
+        emitTournamentChanged(clubId, tournamentId);
+        res.sendStatus(204);
+    } catch (error) {
+        console.error(error);
+        res.status(500).json({ error: error.message });
+    }
+};
+
 // 8. Gruppen mit ihren Teilnehmern abfragen
 export const getGroups = async (req, res) => {
     const { authcode: token } = req.headers;
@@ -163,9 +219,11 @@ export const getTournament = async (req, res) => {
 export const updateTournament = async (req, res) => {
     const { authcode: token } = req.headers;
     const { clubId, tournamentId } = req.params;
-    const { name, date, winningSets } = req.body;
+    const { name, date, winningSets, numberOfTables } = req.body;
     try {
-        const tournament = await tournamentService.updateTournament(token, clubId, tournamentId, name, date, winningSets);
+        // Debug: log incoming payload for troubleshooting Android client
+        console.log('[updateTournament] incoming body:', req.body);
+        const tournament = await tournamentService.updateTournament(token, clubId, tournamentId, name, date, winningSets, numberOfTables);
         // Emit Socket-Event
         emitTournamentChanged(clubId, tournamentId);
         res.status(200).json(tournament);
@@ -189,6 +247,35 @@ export const getTournamentMatches = async (req, res) => {
     }
 };
 
+// Setze Tischnummer für ein Spiel
+export const setMatchTable = async (req, res) => {
+    const { authcode: token } = req.headers;
+    const { clubId, tournamentId, matchId } = req.params;
+    const { tableNumber } = req.body;
+    try {
+        const updated = await tournamentService.setMatchTable(token, clubId, tournamentId, matchId, tableNumber);
+        emitTournamentChanged(clubId, tournamentId);
+        res.status(200).json(updated);
+    } catch (error) {
+        console.error('[setMatchTable] Error:', error);
+        res.status(500).json({ error: error.message });
+    }
+};
+
+// Freie Tische verteilen (Batch)
+export const distributeTables = async (req, res) => {
+    const { authcode: token } = req.headers;
+    const { clubId, tournamentId } = req.body;
+    try {
+        const updated = await tournamentService.distributeTables(token, clubId, tournamentId);
+        emitTournamentChanged(clubId, tournamentId);
+        res.status(200).json({ updated, message: 'Tische wurden verteilt.' });
+    } catch (error) {
+        console.error('[distributeTables] Error:', error);
+        res.status(500).json({ error: error.message });
+    }
+};
+
 // 11. Satz-Ergebnis speichern
 export const addMatchResult = async (req, res) => {
     const { authcode: token } = req.headers;
@@ -300,9 +387,9 @@ export const resetGroups = async (req, res) => {
 
 export const resetMatches = async (req, res) => {
     const { authcode: token } = req.headers;
-    const { clubId, tournamentId } = req.body;
+    const { clubId, tournamentId, classId } = req.body;
     try {
-        await tournamentService.resetMatches(token, clubId, tournamentId);
+        await tournamentService.resetMatches(token, clubId, tournamentId, classId || null);
         // Emit Socket-Event
         emitTournamentChanged(clubId, tournamentId);
         res.sendStatus(204);
@@ -380,9 +467,9 @@ export const reopenMatch = async (req, res) => {
 
 export const deleteKnockoutMatches = async (req, res) => {
     const { authcode: token } = req.headers;
-    const { clubId, tournamentId } = req.body;
+        const { clubId, tournamentId, classId } = req.body;
     try {
-      await tournamentService.resetKnockout(token, clubId, tournamentId);
+            await tournamentService.resetKnockout(token, clubId, tournamentId, classId);
       // Emit Socket-Event
       emitTournamentChanged(clubId, tournamentId);
       res.status(200).json({ message: "K.o.-Runde gelöscht" });

backend/controllers/tournamentStagesController.js

@@ -0,0 +1,70 @@
+import tournamentService from '../services/tournamentService.js';
+import HttpError from '../exceptions/HttpError.js';
+
+export const getStages = async (req, res) => {
+    const { authcode: token } = req.headers;
+    const { clubId, tournamentId } = req.query;
+    try {
+        if (clubId == null || tournamentId == null) {
+            return res.status(400).json({ error: 'clubId und tournamentId sind erforderlich.' });
+        }
+        const data = await tournamentService.getTournamentStages(token, Number(clubId), Number(tournamentId));
+        res.status(200).json(data);
+    } catch (error) {
+        console.error(error);
+        if (error instanceof HttpError) {
+            // Debug-Hilfe: zeigt, welche IDs tatsächlich am Endpoint ankamen (ohne sensible Daten)
+            res.set('x-debug-stages-clubid', String(clubId));
+            res.set('x-debug-stages-tournamentid', String(tournamentId));
+            res.set('x-debug-stages-clubid-num', String(Number(clubId)));
+            return res.status(error.statusCode || 500).json({ error: error.message });
+        }
+        res.status(500).json({ error: error.message });
+    }
+};
+
+export const upsertStages = async (req, res) => {
+    const { authcode: token } = req.headers;
+    const { clubId, tournamentId, stages, advancement, advancements } = req.body;
+    try {
+        const data = await tournamentService.upsertTournamentStages(
+            token,
+            Number(clubId),
+            Number(tournamentId),
+            stages,
+            advancement,
+            advancements
+        );
+        res.status(200).json(data);
+    } catch (error) {
+        console.error(error);
+        if (error instanceof HttpError) {
+            res.set('x-debug-stages-clubid', String(clubId));
+            res.set('x-debug-stages-tournamentid', String(tournamentId));
+            res.set('x-debug-stages-clubid-num', String(Number(clubId)));
+            return res.status(error.statusCode || 500).json({ error: error.message });
+        }
+        res.status(500).json({ error: error.message });
+    }
+};
+
+export const advanceStage = async (req, res) => {
+    const { authcode: token } = req.headers;
+    const { clubId, tournamentId, fromStageIndex, toStageIndex } = req.body;
+    try {
+        const data = await tournamentService.advanceTournamentStage(
+            token,
+            Number(clubId),
+            Number(tournamentId),
+            Number(fromStageIndex || 1),
+            (toStageIndex == null ? null : Number(toStageIndex))
+        );
+        res.status(200).json(data);
+    } catch (error) {
+        console.error(error);
+        if (error instanceof HttpError) {
+            return res.status(error.statusCode || 500).json({ error: error.message });
+        }
+        res.status(500).json({ error: error.message });
+    }
+};

backend/controllers/trainingCancellationController.js

@@ -0,0 +1,50 @@
+import trainingCancellationService from '../services/trainingCancellationService.js';
+import { getSafeErrorMessage } from '../utils/errorUtils.js';
+
+export const getTrainingCancellations = async (req, res) => {
+  try {
+    const { authcode: userToken } = req.headers;
+    const { clubId } = req.params;
+    const { year } = req.query;
+    const result = await trainingCancellationService.getTrainingCancellations(userToken, clubId, year);
+    res.status(200).json(result);
+  } catch (error) {
+    console.error('[getTrainingCancellations] - Error:', error);
+    const message = getSafeErrorMessage(error, 'Fehler beim Laden der Trainingsausfälle');
+    res.status(error.statusCode || 500).json({ error: message });
+  }
+};
+
+export const upsertTrainingCancellation = async (req, res) => {
+  try {
+    const { authcode: userToken } = req.headers;
+    const { clubId } = req.params;
+    const { date, startDate, endDate, reason, trainingGroupIds } = req.body;
+    const result = await trainingCancellationService.upsertTrainingCancellation(
+      userToken,
+      clubId,
+      startDate || date,
+      reason,
+      endDate || date || startDate,
+      trainingGroupIds
+    );
+    res.status(200).json(result);
+  } catch (error) {
+    console.error('[upsertTrainingCancellation] - Error:', error);
+    const message = getSafeErrorMessage(error, 'Fehler beim Speichern des Trainingsausfalls');
+    res.status(error.statusCode || 500).json({ error: message });
+  }
+};
+
+export const deleteTrainingCancellation = async (req, res) => {
+  try {
+    const { authcode: userToken } = req.headers;
+    const { clubId, cancellationId } = req.params;
+    const result = await trainingCancellationService.deleteTrainingCancellation(userToken, clubId, cancellationId);
+    res.status(200).json(result);
+  } catch (error) {
+    console.error('[deleteTrainingCancellation] - Error:', error);
+    const message = getSafeErrorMessage(error, 'Fehler beim Löschen des Trainingsausfalls');
+    res.status(error.statusCode || 500).json({ error: message });
+  }
+};

backend/controllers/trainingGroupController.js

@@ -32,8 +32,7 @@ export const updateTrainingGroup = async (req, res) => {
     try {
         const { authcode: userToken } = req.headers;
         const { clubId, groupId } = req.params;
-        const { name, sortOrder } = req.body;
-        const group = await trainingGroupService.updateTrainingGroup(userToken, clubId, groupId, name, sortOrder);
+        const group = await trainingGroupService.updateTrainingGroup(userToken, clubId, groupId, req.body);
         res.status(200).json(group);
     } catch (error) {
         console.error('[updateTrainingGroup] - Error:', error);

backend/controllers/trainingStatsController.js

@@ -1,173 +1,16 @@
-import { DiaryDate, Member, Participant } from '../models/index.js';
-import { Op } from 'sequelize';
+import trainingStatsService from '../services/trainingStatsService.js';
 
 class TrainingStatsController {
   async getTrainingStats(req, res) {
     try {
       const { clubId } = req.params;
-      
-      // Aktuelle Datum für Berechnungen
-      const now = new Date();
-      const twelveMonthsAgo = new Date(now.getFullYear() - 1, now.getMonth(), now.getDate());
-      const threeMonthsAgo = new Date(now.getFullYear(), now.getMonth() - 3, now.getDate());
-      
-      // Alle aktiven Mitglieder des spezifischen Vereins laden
-      const members = await Member.findAll({
-        where: {
-          active: true,
-          clubId: parseInt(clubId)
-        }
-      });
-      
-      // Anzahl der Trainings im jeweiligen Zeitraum berechnen
-      const trainingsCount12Months = await DiaryDate.count({
-        where: {
-          clubId: parseInt(clubId),
-          date: {
-            [Op.gte]: twelveMonthsAgo
-          }
-        }
-      });
-      
-      const trainingsCount3Months = await DiaryDate.count({
-        where: {
-          clubId: parseInt(clubId),
-          date: {
-            [Op.gte]: threeMonthsAgo
-          }
-        }
-      });
-      
-      const stats = [];
-      
-      for (const member of members) {
-        // Trainingsteilnahmen der letzten 12 Monate über Participant-Model
-        const participation12Months = await Participant.count({
-          include: [{
-            model: DiaryDate,
-            as: 'diaryDate',
-            where: {
-              clubId: parseInt(clubId),
-              date: {
-                [Op.gte]: twelveMonthsAgo
-              }
-            }
-          }],
-          where: {
-            memberId: member.id
-          }
-        });
-        
-        // Trainingsteilnahmen der letzten 3 Monate über Participant-Model
-        const participation3Months = await Participant.count({
-          include: [{
-            model: DiaryDate,
-            as: 'diaryDate',
-            where: {
-              clubId: parseInt(clubId),
-              date: {
-                [Op.gte]: threeMonthsAgo
-              }
-            }
-          }],
-          where: {
-            memberId: member.id
-          }
-        });
-        
-        // Trainingsteilnahmen insgesamt über Participant-Model
-        const participationTotal = await Participant.count({
-          include: [{
-            model: DiaryDate,
-            as: 'diaryDate',
-            where: {
-              clubId: parseInt(clubId)
-            }
-          }],
-          where: {
-            memberId: member.id
-          }
-        });
-        
-        // Detaillierte Trainingsdaten (absteigend sortiert) über Participant-Model
-        const trainingDetails = await Participant.findAll({
-          include: [{
-            model: DiaryDate,
-            as: 'diaryDate',
-            where: {
-              clubId: parseInt(clubId)
-            }
-          }],
-          where: {
-            memberId: member.id
-          },
-          order: [['diaryDate', 'date', 'DESC']],
-          limit: 50 // Begrenzen auf die letzten 50 Trainingseinheiten
-        });
-        
-        // Trainingsteilnahmen für den Member formatieren
-        const formattedTrainingDetails = trainingDetails.map(participation => ({
-          id: participation.id,
-          date: participation.diaryDate.date,
-          activityName: 'Training',
-          startTime: '--:--',
-          endTime: '--:--'
-        }));
-        
-        // Letztes Training
-        const lastTrainingDate = trainingDetails.length ? trainingDetails[0].diaryDate.date : null;
-        const lastTrainingTs = lastTrainingDate ? new Date(lastTrainingDate).getTime() : 0;
-
-        stats.push({
-          id: member.id,
-          firstName: member.firstName,
-          lastName: member.lastName,
-          birthDate: member.birthDate,
-          participation12Months,
-          participation3Months,
-          participationTotal,
-          lastTraining: lastTrainingDate,
-          lastTrainingTs,
-          trainingDetails: formattedTrainingDetails
-        });
-      }
-      
-      // Nach Gesamtteilnahme absteigend sortieren
-      stats.sort((a, b) => b.participationTotal - a.participationTotal);
-      
-      // Trainingstage mit Teilnehmerzahlen abrufen (letzte 12 Monate, absteigend sortiert)
-      const trainingDays = await DiaryDate.findAll({
-        where: {
-          clubId: parseInt(clubId),
-          date: {
-            [Op.gte]: twelveMonthsAgo
-          }
-        },
-        include: [{
-          model: Participant,
-          as: 'participantList',
-          attributes: ['id']
-        }],
-        order: [['date', 'DESC']]
-      });
-      
-      // Formatiere Trainingstage mit Teilnehmerzahl
-      const formattedTrainingDays = trainingDays.map(day => ({
-        id: day.id,
-        date: day.date,
-        participantCount: day.participantList ? day.participantList.length : 0
-      }));
-      
-      // Zusätzliche Metadaten mit Trainingsanzahl zurückgeben
-      res.json({
-        members: stats,
-        trainingsCount12Months,
-        trainingsCount3Months,
-        trainingDays: formattedTrainingDays
-      });
-      
+      const stats = await trainingStatsService.getTrainingStats(clubId);
+      res.json(stats);
     } catch (error) {
       console.error('Fehler beim Laden der Trainings-Statistik:', error);
+      if (error?.status) {
+        return res.status(error.status).json({ error: error.message });
+      }
       res.status(500).json({ error: 'Fehler beim Laden der Trainings-Statistik' });
     }
   }

backend/middleware/authorizationMiddleware.js

@@ -142,7 +142,7 @@ export const requireAdmin = () => {
         parseInt(clubId)
       );
 
-      if (!userPermissions || (userPermissions.role !== 'admin' && !userPermissions.isOwner)) {
+      if (!userPermissions || (!userPermissions.isAdmin && !userPermissions.isOwner)) {
         return res.status(403).json({ 
           error: 'Keine Berechtigung',
           details: 'Administrator-Rechte erforderlich'
@@ -190,7 +190,10 @@ export const requireRole = (roles) => {
         parseInt(clubId)
       );
 
-      if (!userPermissions || !roles.includes(userPermissions.role)) {
+      const assignedRoleKeys = Array.isArray(userPermissions?.roles)
+        ? userPermissions.roles.map((role) => role.roleKey)
+        : [];
+      if (!userPermissions || (!roles.includes(userPermissions.role) && !assignedRoleKeys.some((roleKey) => roles.includes(roleKey)))) {
         return res.status(403).json({ 
           error: 'Keine Berechtigung',
           details: `Erforderliche Rolle: ${roles.join(', ')}`
@@ -212,4 +215,3 @@ export default {
   requireAdmin,
   requireRole
 };
-

backend/migrations/20251213_add_tournament_stages.sql

@@ -0,0 +1,58 @@
+-- Adds multi-stage tournaments (rounds) support
+-- MariaDB/MySQL compatible migration (manual execution)
+
+-- 1) New table: tournament_stage
+CREATE TABLE IF NOT EXISTS tournament_stage (
+  id INT NOT NULL AUTO_INCREMENT,
+  tournament_id INT NOT NULL,
+  stage_index INT NOT NULL,
+  name VARCHAR(255) NULL,
+  type VARCHAR(32) NOT NULL, -- 'groups' | 'knockout'
+  number_of_groups INT NULL,
+  advancing_per_group INT NULL,
+  max_group_size INT NULL,
+  created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (id),
+  CONSTRAINT fk_tournament_stage_tournament
+    FOREIGN KEY (tournament_id) REFERENCES tournament(id)
+    ON DELETE CASCADE
+) ENGINE=InnoDB;
+
+CREATE INDEX idx_tournament_stage_tournament_id ON tournament_stage (tournament_id);
+CREATE UNIQUE INDEX uq_tournament_stage_tournament_id_index ON tournament_stage (tournament_id, stage_index);
+
+-- 2) New table: tournament_stage_advancement
+CREATE TABLE IF NOT EXISTS tournament_stage_advancement (
+  id INT NOT NULL AUTO_INCREMENT,
+  tournament_id INT NOT NULL,
+  from_stage_id INT NOT NULL,
+  to_stage_id INT NOT NULL,
+  mode VARCHAR(32) NOT NULL DEFAULT 'pools',
+  config JSON NOT NULL,
+  created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (id),
+  CONSTRAINT fk_tournament_stage_adv_tournament
+    FOREIGN KEY (tournament_id) REFERENCES tournament(id)
+    ON DELETE CASCADE,
+  CONSTRAINT fk_tournament_stage_adv_from
+    FOREIGN KEY (from_stage_id) REFERENCES tournament_stage(id)
+    ON DELETE CASCADE,
+  CONSTRAINT fk_tournament_stage_adv_to
+    FOREIGN KEY (to_stage_id) REFERENCES tournament_stage(id)
+    ON DELETE CASCADE
+) ENGINE=InnoDB;
+
+CREATE INDEX idx_tournament_stage_adv_tournament_id ON tournament_stage_advancement (tournament_id);
+CREATE INDEX idx_tournament_stage_adv_from_stage_id ON tournament_stage_advancement (from_stage_id);
+CREATE INDEX idx_tournament_stage_adv_to_stage_id ON tournament_stage_advancement (to_stage_id);
+
+-- 3) Add stage_id to tournament_group and tournament_match
+-- MariaDB has no IF NOT EXISTS for columns; run each ALTER once.
+-- If you rerun, comment out the ALTERs or check INFORMATION_SCHEMA first.
+ALTER TABLE tournament_group ADD COLUMN stage_id INT NULL;
+ALTER TABLE tournament_match ADD COLUMN stage_id INT NULL;
+
+CREATE INDEX idx_tournament_group_tournament_stage ON tournament_group (tournament_id, stage_id);
+CREATE INDEX idx_tournament_match_tournament_stage ON tournament_match (tournament_id, stage_id);

backend/migrations/20251214_allow_null_players_in_tournament_match.sql

@@ -0,0 +1,16 @@
+-- Allow NULL placeholders for KO (e.g. "Spiel um Platz 3")
+-- MariaDB/MySQL manual migration
+--
+-- Background: We create placeholder matches with player1_id/player2_id = NULL.
+-- Some prod DBs still have NOT NULL on these columns.
+
+-- 1) Make player columns nullable
+ALTER TABLE tournament_match MODIFY COLUMN player1_id INT NULL;
+ALTER TABLE tournament_match MODIFY COLUMN player2_id INT NULL;
+
+-- 2) (Optional) If you have foreign keys to tournament_member/external participant IDs,
+-- ensure they also allow NULL. (Not adding here because not all installations have FKs.)
+
+-- 3) Verify
+-- SHOW COLUMNS FROM tournament_match LIKE 'player1_id';
+-- SHOW COLUMNS FROM tournament_match LIKE 'player2_id';

backend/migrations/20260107_add_pool_and_out_of_competition.sql

@@ -0,0 +1,11 @@
+-- Add pool_id to tournament_group for pooled group phases
+ALTER TABLE `tournament_group`
+  ADD COLUMN `pool_id` INT NULL AFTER `class_id`;
+
+-- Add out_of_competition flags
+ALTER TABLE `tournament_member`
+  ADD COLUMN `out_of_competition` TINYINT(1) NOT NULL DEFAULT 0 AFTER `class_id`;
+
+ALTER TABLE `external_tournament_participant`
+  ADD COLUMN `out_of_competition` TINYINT(1) NOT NULL DEFAULT 0 AFTER `class_id`;
+

backend/migrations/20260107_change_accident_to_text.sql

@@ -0,0 +1,3 @@
+-- Change accident field from VARCHAR to TEXT to allow longer descriptions
+ALTER TABLE `accident`
+  MODIFY COLUMN `accident` TEXT NOT NULL;

backend/migrations/20260130_add_email_address_to_external_participant.sql

@@ -0,0 +1,6 @@
+-- E-Mail und Adresse für externe Teilnehmer (für Weitermeldung)
+-- Die Felder werden verschlüsselt gespeichert (siehe Model)
+
+ALTER TABLE `external_tournament_participant`
+  ADD COLUMN `email` VARCHAR(500) NULL AFTER `club`,
+  ADD COLUMN `address` TEXT NULL AFTER `email`;

backend/migrations/20260130_add_gave_up_to_tournament_participants.sql

@@ -0,0 +1,8 @@
+-- Add gave_up (Aufgabe) to tournament participants
+-- Wenn ein Spieler aufgibt: alle seine Spiele zählen für den Gegner (11:0), beide aufgegeben = 0:0, kein Sieger
+
+ALTER TABLE `tournament_member`
+  ADD COLUMN `gave_up` TINYINT(1) NOT NULL DEFAULT 0 AFTER `out_of_competition`;
+
+ALTER TABLE `external_tournament_participant`
+  ADD COLUMN `gave_up` TINYINT(1) NOT NULL DEFAULT 0 AFTER `out_of_competition`;

backend/migrations/20260130_add_mini_championship_and_max_birth_year.sql

@@ -0,0 +1,9 @@
+-- Minimeisterschaften: Turnier-Jahr und Alters-Obergrenze pro Klasse
+-- tournament.mini_championship_year: Jahr der Minimeisterschaft (z.B. 2025); nur gesetzt bei Minimeisterschaften
+-- tournament_class.max_birth_year: Geboren im Jahr X oder früher (<=); für Altersklassen 12/10
+
+ALTER TABLE `tournament`
+  ADD COLUMN `mini_championship_year` INT NULL AFTER `allows_external`;
+
+ALTER TABLE `tournament_class`
+  ADD COLUMN `max_birth_year` INT NULL AFTER `min_birth_year`;

backend/migrations/20260130_add_number_of_tables_and_table_number.sql

@@ -0,0 +1,9 @@
+-- Anzahl der Tische im Turnier
+ALTER TABLE tournament
+ADD COLUMN number_of_tables INT NULL DEFAULT NULL
+COMMENT 'Anzahl der Tische, auf denen gespielt wird';
+
+-- Tischnummer pro Match
+ALTER TABLE tournament_match
+ADD COLUMN table_number INT NULL DEFAULT NULL
+COMMENT 'Tischnummer, an der das Match stattfindet';

backend/migrations/20260130_add_password_reset_fields.sql

@@ -0,0 +1,8 @@
+-- Felder für "Passwort vergessen"-Funktion
+ALTER TABLE user
+ADD COLUMN reset_token VARCHAR(255) NULL DEFAULT NULL
+COMMENT 'Token für Passwort-Reset';
+
+ALTER TABLE user
+ADD COLUMN reset_token_expires DATETIME NULL DEFAULT NULL
+COMMENT 'Ablaufzeitpunkt des Reset-Tokens';

backend/migrations/20260310_add_clicktt_payload_logging.sql

@@ -0,0 +1,10 @@
+ALTER TABLE http_page_fetch_log
+    ADD COLUMN IF NOT EXISTS request_method VARCHAR(16) NULL COMMENT 'HTTP-Methode des ausgehenden Requests' AFTER club_id_param,
+    ADD COLUMN IF NOT EXISTS request_headers LONGTEXT NULL COMMENT 'Gesendete Request-Header als JSON' AFTER request_method,
+    ADD COLUMN IF NOT EXISTS request_body LONGTEXT NULL COMMENT 'Gesendeter Request-Body im Originalformat' AFTER request_headers,
+    ADD COLUMN IF NOT EXISTS response_headers LONGTEXT NULL COMMENT 'Empfangene Response-Header als JSON' AFTER content_type,
+    ADD COLUMN IF NOT EXISTS response_body LONGTEXT NULL COMMENT 'Vollstaendiger Response-Body' AFTER response_headers,
+    ADD COLUMN IF NOT EXISTS response_url TEXT NULL COMMENT 'Finale Response-URL nach Redirects' AFTER response_body;
+
+ALTER TABLE http_page_fetch_log
+    MODIFY COLUMN response_snippet LONGTEXT NULL COMMENT 'Gekuerzter oder kompletter Response-Anfang zur Strukturanalyse';

backend/migrations/20260315_add_club_rankings_settings.sql

@@ -0,0 +1,9 @@
+-- Migration: Add myTischtennis rankings settings to clubs table
+-- Enables per-club configuration of TTR/QTTR rankings fetch.
+-- Club number comes from association_member_number (Verbands-Mitgliedsnummer).
+
+ALTER TABLE clubs
+  ADD COLUMN IF NOT EXISTS my_tischtennis_fed_nickname VARCHAR(50) NULL
+    COMMENT 'Federation short name for rankings (e.g. HeTTV)',
+  ADD COLUMN IF NOT EXISTS auto_fetch_rankings BOOLEAN NOT NULL DEFAULT FALSE
+    COMMENT 'Enable automatic TTR/QTTR rankings fetch for this club';

backend/migrations/20260324_create_member_orders_tables.sql

@@ -0,0 +1,36 @@
+CREATE TABLE IF NOT EXISTS member_orders (
+  id INT NOT NULL AUTO_INCREMENT,
+  member_id INT NOT NULL,
+  club_id INT NOT NULL,
+  item VARCHAR(255) NOT NULL,
+  status ENUM('requested', 'ordered', 'arrived', 'handed_over') NOT NULL DEFAULT 'requested',
+  order_date DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  status_date DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  cost DECIMAL(10,2) NOT NULL DEFAULT 0.00,
+  paid_amount DECIMAL(10,2) NOT NULL DEFAULT 0.00,
+  created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  updated_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (id),
+  KEY idx_member_orders_member_id (member_id),
+  KEY idx_member_orders_club_id (club_id),
+  KEY idx_member_orders_status (status)
+);
+
+CREATE TABLE IF NOT EXISTS member_order_history (
+  id INT NOT NULL AUTO_INCREMENT,
+  member_order_id INT NOT NULL,
+  member_id INT NOT NULL,
+  club_id INT NOT NULL,
+  item VARCHAR(255) NOT NULL,
+  status ENUM('requested', 'ordered', 'arrived', 'handed_over') NOT NULL,
+  changed_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  cost DECIMAL(10,2) NOT NULL DEFAULT 0.00,
+  paid_amount DECIMAL(10,2) NOT NULL DEFAULT 0.00,
+  created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  updated_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (id),
+  KEY idx_member_order_history_order_id (member_order_id),
+  KEY idx_member_order_history_member_id (member_id),
+  KEY idx_member_order_history_club_id (club_id),
+  KEY idx_member_order_history_changed_at (changed_at)
+);

backend/migrations/20260401_add_adult_release_reserve_approved_to_member.sql

@@ -0,0 +1,10 @@
+-- Jugend-Freigaben (Schema wie backend/models/Member.js)
+-- Fehlende Spalten verursachen SequelizeDatabaseError ER_BAD_FIELD_ERROR bei getClubMembers.
+
+ALTER TABLE `member`
+  ADD COLUMN `adult_release_approved` TINYINT(1) NOT NULL DEFAULT 0
+    COMMENT 'Jugendspieler mit Freigabe fuer Erwachsene'
+    AFTER `member_form_handed_over`,
+  ADD COLUMN `adult_reserve_approved` TINYINT(1) NOT NULL DEFAULT 0
+    COMMENT 'Jugendspieler als Ersatz bei Erwachsenen zugelassen'
+    AFTER `adult_release_approved`;

backend/migrations/20260402_add_team_gender_team_age_group_to_club_team.sql

@@ -0,0 +1,10 @@
+-- club_team: Felder wie backend/models/ClubTeam.js (teamGender, teamAgeGroup)
+-- Fehlen in der DB -> SequelizeDatabaseError ER_BAD_FIELD_ERROR bei getClubTeams.
+
+ALTER TABLE `club_team`
+  ADD COLUMN `team_gender` ENUM('open', 'female') NOT NULL DEFAULT 'open'
+    COMMENT 'Geschlecht Team (offen / nur weiblich)'
+    AFTER `my_tischtennis_team_id`,
+  ADD COLUMN `team_age_group` ENUM('adult', 'J19', 'J17', 'J15', 'J13', 'J11') NOT NULL DEFAULT 'adult'
+    COMMENT 'Altersklasse Mannschaft'
+    AFTER `team_gender`;

backend/migrations/20260403_add_planned_league_name_to_club_team.sql

@@ -0,0 +1,6 @@
+-- Optional: manuell gepflegte geplante Spielklasse (unabhängig von league / MyTischtennis)
+
+ALTER TABLE `club_team`
+  ADD COLUMN `planned_league_name` VARCHAR(512) NULL
+    COMMENT 'Geplante Spielklasse (freier Text, optional)'
+    AFTER `team_age_group`;

backend/migrations/20260415_add_member_data_quality_requirements_to_clubs.sql

@@ -0,0 +1,6 @@
+-- Migration: Add per-club member data quality requirements.
+-- Controls which optional contact/address fields count as required on /members.
+
+ALTER TABLE clubs
+  ADD COLUMN IF NOT EXISTS member_data_quality_requirements JSON NULL
+    COMMENT 'Configures which member fields are required for data quality checks';

backend/migrations/20260415_create_member_group_photo.sql

@@ -0,0 +1,28 @@
+-- Migration: Store group photos for later member photo cropping.
+
+CREATE TABLE IF NOT EXISTS `member_group_photo` (
+  `id` INT NOT NULL AUTO_INCREMENT,
+  `club_id` INT NOT NULL,
+  `title` VARCHAR(255) NOT NULL,
+  `description` TEXT NULL,
+  `file_name` VARCHAR(255) NOT NULL,
+  `original_file_name` VARCHAR(255) NULL,
+  `mime_type` VARCHAR(100) NULL,
+  `file_size` INT NULL,
+  `width` INT NULL,
+  `height` INT NULL,
+  `taken_at` DATETIME NULL,
+  `created_by_user_id` INT NULL,
+  `created_at` DATETIME NOT NULL,
+  `updated_at` DATETIME NOT NULL,
+  PRIMARY KEY (`id`),
+  INDEX `idx_member_group_photo_club_id` (`club_id`),
+  CONSTRAINT `fk_member_group_photo_club`
+    FOREIGN KEY (`club_id`) REFERENCES `clubs` (`id`)
+    ON DELETE CASCADE
+    ON UPDATE CASCADE,
+  CONSTRAINT `fk_member_group_photo_created_by`
+    FOREIGN KEY (`created_by_user_id`) REFERENCES `user` (`id`)
+    ON DELETE SET NULL
+    ON UPDATE CASCADE
+);

backend/migrations/20260415_create_member_play_interest.sql

@@ -0,0 +1,16 @@
+-- Halbserienbasierte Spielinteressen (pro Mitglied, Club, Saison und Halbserie)
+
+CREATE TABLE IF NOT EXISTS `member_play_interest` (
+  `id` INT NOT NULL AUTO_INCREMENT,
+  `club_id` INT NOT NULL,
+  `member_id` INT NOT NULL,
+  `season_id` INT NOT NULL,
+  `lineup_half` ENUM('first_half', 'second_half') NOT NULL,
+  `interested` TINYINT(1) NOT NULL DEFAULT 1,
+  `created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `updated_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uniq_member_play_interest_half` (`club_id`, `member_id`, `season_id`, `lineup_half`),
+  KEY `idx_member_play_interest_member` (`member_id`),
+  KEY `idx_member_play_interest_season` (`season_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;

backend/migrations/20260420_create_billing_tables.sql

@@ -0,0 +1,122 @@
+-- Abrechnungsmodul: Vorlagen, Feld-Mapping, Abrechnungslauf und erzeugte Dokumente
+
+CREATE TABLE IF NOT EXISTS `billing_template` (
+  `id` INT NOT NULL AUTO_INCREMENT,
+  `club_id` INT NOT NULL,
+  `name` VARCHAR(255) NOT NULL,
+  `description` TEXT NULL,
+  `pdf_storage_path` VARCHAR(1000) NOT NULL,
+  `pdf_filename` VARCHAR(255) NOT NULL,
+  `pdf_mime_type` VARCHAR(100) NOT NULL DEFAULT 'application/pdf',
+  `is_active` TINYINT(1) NOT NULL DEFAULT 1,
+  `version` INT NOT NULL DEFAULT 1,
+  `created_by_user_id` INT NULL,
+  `created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `updated_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`id`),
+  KEY `idx_billing_template_club` (`club_id`),
+  UNIQUE KEY `uniq_billing_template_club_name_version` (`club_id`, `name`, `version`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+
+CREATE TABLE IF NOT EXISTS `billing_template_field` (
+  `id` INT NOT NULL AUTO_INCREMENT,
+  `template_id` INT NOT NULL,
+  `field_key` VARCHAR(120) NOT NULL,
+  `label` VARCHAR(255) NOT NULL,
+  `field_type` ENUM('text', 'number', 'currency', 'date', 'checkbox', 'formula', 'table_row') NOT NULL,
+  `source_type` ENUM('manual', 'member', 'trainer', 'club', 'system', 'constant', 'formula') NOT NULL DEFAULT 'manual',
+  `source_path` VARCHAR(255) NULL,
+  `constant_value` VARCHAR(500) NULL,
+  `formatter` ENUM('none', 'iban_no_country', 'date_dd_mm_yyyy', 'currency_eur_2') NOT NULL DEFAULT 'none',
+  `is_required` TINYINT(1) NOT NULL DEFAULT 0,
+  `mapping_mode` ENUM('acroform', 'overlay') NOT NULL DEFAULT 'overlay',
+  `acroform_field_name` VARCHAR(255) NULL,
+  `page_number` INT NULL,
+  `x` DECIMAL(10, 2) NULL,
+  `y` DECIMAL(10, 2) NULL,
+  `width` DECIMAL(10, 2) NULL,
+  `height` DECIMAL(10, 2) NULL,
+  `font_size` DECIMAL(5, 2) NULL,
+  `align` ENUM('left', 'center', 'right') NULL,
+  `formula_expression` VARCHAR(1000) NULL,
+  `table_group` VARCHAR(100) NULL,
+  `row_index` INT NULL,
+  `sort_order` INT NOT NULL DEFAULT 0,
+  `created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `updated_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`id`),
+  KEY `idx_billing_template_field_template` (`template_id`),
+  UNIQUE KEY `uniq_billing_template_field_key` (`template_id`, `field_key`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+
+CREATE TABLE IF NOT EXISTS `billing_run` (
+  `id` INT NOT NULL AUTO_INCREMENT,
+  `club_id` INT NOT NULL,
+  `template_id` INT NOT NULL,
+  `name` VARCHAR(255) NOT NULL,
+  `period_start` DATE NOT NULL,
+  `period_end` DATE NOT NULL,
+  `self_recipient_user_id` INT NOT NULL,
+  `self_recipient_name` VARCHAR(255) NOT NULL,
+  `hourly_rate` DECIMAL(10, 2) NOT NULL,
+  `computed_hours_total` DECIMAL(10, 2) NOT NULL DEFAULT 0,
+  `iban` VARCHAR(64) NULL,
+  `iban_without_country` TINYINT(1) NOT NULL DEFAULT 0,
+  `session_label` VARCHAR(255) NULL,
+  `same_account_checkbox` TINYINT(1) NOT NULL DEFAULT 0,
+  `omit_self_recipient_name` TINYINT(1) NOT NULL DEFAULT 0,
+  `omit_iban` TINYINT(1) NOT NULL DEFAULT 0,
+  `omit_location_text` TINYINT(1) NOT NULL DEFAULT 0,
+  `omit_document_date` TINYINT(1) NOT NULL DEFAULT 0,
+  `omit_session_label` TINYINT(1) NOT NULL DEFAULT 0,
+  `location_text` VARCHAR(255) NULL,
+  `document_date` DATE NULL,
+  `status` ENUM('draft', 'generated', 'finalized', 'cancelled') NOT NULL DEFAULT 'draft',
+  `created_by_user_id` INT NULL,
+  `created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `updated_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`id`),
+  KEY `idx_billing_run_club` (`club_id`),
+  KEY `idx_billing_run_template` (`template_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+
+CREATE TABLE IF NOT EXISTS `billing_user_setting` (
+  `id` INT NOT NULL AUTO_INCREMENT,
+  `club_id` INT NOT NULL,
+  `user_id` INT NOT NULL,
+  `last_hourly_rate` DECIMAL(10, 2) NOT NULL DEFAULT 0,
+  `last_self_recipient_name` VARCHAR(255) NULL,
+  `last_location_text` VARCHAR(255) NULL,
+  `created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `updated_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uniq_billing_user_setting_club_user` (`club_id`, `user_id`),
+  KEY `idx_billing_user_setting_club` (`club_id`),
+  KEY `idx_billing_user_setting_user` (`user_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+
+CREATE TABLE IF NOT EXISTS `billing_document` (
+  `id` INT NOT NULL AUTO_INCREMENT,
+  `run_id` INT NOT NULL,
+  `display_name` VARCHAR(255) NOT NULL,
+  `status` ENUM('draft', 'generated', 'error') NOT NULL DEFAULT 'draft',
+  `pdf_storage_path` VARCHAR(1000) NULL,
+  `pdf_filename` VARCHAR(255) NULL,
+  `error_message` TEXT NULL,
+  `created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `updated_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`id`),
+  KEY `idx_billing_document_run` (`run_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+
+CREATE TABLE IF NOT EXISTS `billing_document_value` (
+  `id` INT NOT NULL AUTO_INCREMENT,
+  `billing_document_id` INT NOT NULL,
+  `field_key` VARCHAR(120) NOT NULL,
+  `resolved_value` TEXT NULL,
+  `resolved_source` VARCHAR(255) NULL,
+  `created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  PRIMARY KEY (`id`),
+  KEY `idx_billing_doc_value_doc` (`billing_document_id`),
+  UNIQUE KEY `uniq_billing_doc_value_field` (`billing_document_id`, `field_key`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;

backend/migrations/20260421_add_budget_to_member_orders.sql

@@ -0,0 +1,5 @@
+ALTER TABLE `member_orders`
+  ADD COLUMN `budget` DECIMAL(10,2) NOT NULL DEFAULT 0.00 AFTER `paid_amount`;
+
+ALTER TABLE `member_order_history`
+  ADD COLUMN `budget` DECIMAL(10,2) NOT NULL DEFAULT 0.00 AFTER `paid_amount`;

backend/migrations/20260506_add_paid_confirmed_to_member_orders.sql

@@ -0,0 +1,5 @@
+ALTER TABLE `member_orders`
+  ADD COLUMN `paid_confirmed` TINYINT(1) NOT NULL DEFAULT 0 AFTER `budget`;
+
+ALTER TABLE `member_order_history`
+  ADD COLUMN `paid_confirmed` TINYINT(1) NOT NULL DEFAULT 0 AFTER `budget`;

backend/migrations/20260508_add_duration_and_order_to_group_activity.sql

@@ -0,0 +1,4 @@
+ALTER TABLE `group_activity`
+    ADD COLUMN `duration` INT NULL AFTER `custom_activity`,
+    ADD COLUMN `duration_text` VARCHAR(255) NULL AFTER `duration`,
+    ADD COLUMN `order_id` INT NOT NULL DEFAULT 1 AFTER `duration_text`;

backend/migrations/20260508_add_group_id_to_diary_date_activities_and_migrate_group_activity.sql

@@ -0,0 +1,30 @@
+ALTER TABLE `diary_date_activities`
+    ADD COLUMN `group_id` INT NULL AFTER `predefined_activity_id`,
+    ADD CONSTRAINT `fk_diary_date_activities_group_id`
+        FOREIGN KEY (`group_id`) REFERENCES `group`(`id`)
+        ON DELETE SET NULL
+        ON UPDATE CASCADE;
+
+INSERT INTO `diary_date_activities` (
+    `diary_date_id`,
+    `is_timeblock`,
+    `predefined_activity_id`,
+    `group_id`,
+    `duration`,
+    `duration_text`,
+    `order_id`,
+    `created_at`,
+    `updated_at`
+)
+SELECT
+    d.`diary_date_id`,
+    0 AS `is_timeblock`,
+    ga.`custom_activity` AS `predefined_activity_id`,
+    ga.`group_id`,
+    ga.`duration`,
+    ga.`duration_text`,
+    (d.`order_id` * 100) + COALESCE(ga.`order_id`, 1) AS `order_id`,
+    COALESCE(ga.`created_at`, NOW()) AS `created_at`,
+    COALESCE(ga.`updated_at`, NOW()) AS `updated_at`
+FROM `group_activity` ga
+INNER JOIN `diary_date_activities` d ON d.`id` = ga.`diary_date_activity`;

backend/migrations/20260514_add_exclude_from_quick_diary_create_to_training_group.sql

@@ -0,0 +1,4 @@
+-- Trainingsgruppen vom Tagebuch-Schnellanlegen ausnehmen (optional)
+ALTER TABLE training_group
+ADD COLUMN exclude_from_quick_diary_create TINYINT(1) NOT NULL DEFAULT 0
+COMMENT '1 = Gruppe bei Schnellanlegen-Terminsuche ignorieren';

backend/migrations/20260518_add_result_details_to_friendly_match.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `friendly_match`
+  ADD COLUMN IF NOT EXISTS `result_details` JSON NULL AFTER `guest_participants`;

backend/migrations/20260518_create_friendly_match.sql

@@ -0,0 +1,30 @@
+CREATE TABLE IF NOT EXISTS `friendly_match` (
+  `id` INT NOT NULL AUTO_INCREMENT,
+  `club_id` INT NOT NULL,
+  `date` DATE NOT NULL,
+  `time` TIME NULL,
+  `home_team_name` VARCHAR(255) NOT NULL,
+  `guest_team_name` VARCHAR(255) NOT NULL,
+  `location_name` VARCHAR(255) NULL,
+  `location_address` VARCHAR(255) NULL,
+  `location_city` VARCHAR(255) NULL,
+  `location_zip` VARCHAR(32) NULL,
+  `match_system` VARCHAR(120) NOT NULL DEFAULT 'Braunschweiger System',
+  `singles_count` INT NOT NULL DEFAULT 12,
+  `doubles_count` INT NOT NULL DEFAULT 4,
+  `winning_sets` INT NOT NULL DEFAULT 3,
+  `home_match_points` INT NOT NULL DEFAULT 0,
+  `guest_match_points` INT NOT NULL DEFAULT 0,
+  `is_completed` TINYINT(1) NOT NULL DEFAULT 0,
+  `home_participants` JSON NULL,
+  `guest_participants` JSON NULL,
+  `result_details` JSON NULL,
+  `players_ready` JSON NULL,
+  `players_planned` JSON NULL,
+  `players_played` JSON NULL,
+  `created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `updated_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`id`),
+  KEY `idx_friendly_match_club_date` (`club_id`, `date`),
+  KEY `idx_friendly_match_completed` (`club_id`, `is_completed`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;

backend/migrations/20260530_create_friendly_match_shared_and_invitation.sql

@@ -0,0 +1,84 @@
+-- Manual migration for cross-club friendly match concept
+-- Created: 2026-05-30
+
+-- 1) Invitation table
+CREATE TABLE IF NOT EXISTS `friendly_match_invitation` (
+  `id` INT NOT NULL AUTO_INCREMENT,
+  `from_club_id` INT NOT NULL,
+  `to_club_id` INT NOT NULL,
+  `proposed_date` DATE NOT NULL,
+  `proposed_start_time` TIME NULL,
+  `proposed_match_name` VARCHAR(255) NOT NULL,
+  `message` TEXT NULL,
+  `status` VARCHAR(32) NOT NULL DEFAULT 'pending',
+  `created_by_user_id` INT NULL,
+  `accepted_by_user_id` INT NULL,
+  `accepted_at` DATETIME NULL,
+  `created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `updated_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`id`),
+  CONSTRAINT `chk_friendly_match_invitation_clubs_different`
+    CHECK (`from_club_id` <> `to_club_id`),
+  CONSTRAINT `fk_friendly_match_invitation_from_club`
+    FOREIGN KEY (`from_club_id`) REFERENCES `clubs` (`id`) ON DELETE CASCADE,
+  CONSTRAINT `fk_friendly_match_invitation_to_club`
+    FOREIGN KEY (`to_club_id`) REFERENCES `clubs` (`id`) ON DELETE CASCADE,
+  CONSTRAINT `fk_friendly_match_invitation_created_by`
+    FOREIGN KEY (`created_by_user_id`) REFERENCES `user` (`id`) ON DELETE SET NULL,
+  CONSTRAINT `fk_friendly_match_invitation_accepted_by`
+    FOREIGN KEY (`accepted_by_user_id`) REFERENCES `user` (`id`) ON DELETE SET NULL,
+  KEY `idx_friendly_match_invitation_to_status_date` (`to_club_id`, `status`, `proposed_date`),
+  KEY `idx_friendly_match_invitation_from_status_date` (`from_club_id`, `status`, `proposed_date`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+
+-- 2) Shared match table
+CREATE TABLE IF NOT EXISTS `friendly_match_shared` (
+  `id` INT NOT NULL AUTO_INCREMENT,
+  `home_club_id` INT NOT NULL,
+  `guest_club_id` INT NOT NULL,
+  `date` DATE NOT NULL,
+  `start_time` TIME NULL,
+  `match_name` VARCHAR(255) NULL,
+  `home_team_name` VARCHAR(255) NOT NULL,
+  `guest_team_name` VARCHAR(255) NOT NULL,
+  `location_name` VARCHAR(255) NULL,
+  `location_address` VARCHAR(255) NULL,
+  `location_city` VARCHAR(255) NULL,
+  `location_zip` VARCHAR(32) NULL,
+  `match_system` VARCHAR(120) NOT NULL DEFAULT 'Braunschweiger System',
+  `singles_count` INT NOT NULL DEFAULT 12,
+  `doubles_count` INT NOT NULL DEFAULT 4,
+  `winning_sets` INT NOT NULL DEFAULT 3,
+  `home_match_points` INT NOT NULL DEFAULT 0,
+  `guest_match_points` INT NOT NULL DEFAULT 0,
+  `is_completed` TINYINT(1) NOT NULL DEFAULT 0,
+  `home_participants` JSON NULL,
+  `guest_participants` JSON NULL,
+  `result_details` JSON NULL,
+  `players_ready` JSON NULL,
+  `players_planned` JSON NULL,
+  `players_played` JSON NULL,
+  `status` VARCHAR(32) NOT NULL DEFAULT 'active',
+  `created_by_user_id` INT NULL,
+  `created_from_invitation_id` INT NULL,
+  `created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `updated_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`id`),
+  CONSTRAINT `chk_friendly_match_shared_clubs_different`
+    CHECK (`home_club_id` <> `guest_club_id`),
+  CONSTRAINT `fk_friendly_match_shared_home_club`
+    FOREIGN KEY (`home_club_id`) REFERENCES `clubs` (`id`) ON DELETE CASCADE,
+  CONSTRAINT `fk_friendly_match_shared_guest_club`
+    FOREIGN KEY (`guest_club_id`) REFERENCES `clubs` (`id`) ON DELETE CASCADE,
+  CONSTRAINT `fk_friendly_match_shared_created_by`
+    FOREIGN KEY (`created_by_user_id`) REFERENCES `user` (`id`) ON DELETE SET NULL,
+  CONSTRAINT `fk_friendly_match_shared_from_invitation`
+    FOREIGN KEY (`created_from_invitation_id`) REFERENCES `friendly_match_invitation` (`id`) ON DELETE SET NULL,
+  KEY `idx_friendly_match_shared_home_date_time` (`home_club_id`, `date`, `start_time`),
+  KEY `idx_friendly_match_shared_guest_date_time` (`guest_club_id`, `date`, `start_time`),
+  KEY `idx_friendly_match_shared_status` (`status`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+
+-- Optional rollback statements (manual use):
+-- DROP TABLE IF EXISTS `friendly_match_shared`;
+-- DROP TABLE IF EXISTS `friendly_match_invitation`;

backend/migrations/20260605_create_club_venue.sql

@@ -0,0 +1,15 @@
+CREATE TABLE IF NOT EXISTS `club_venue` (
+  `id` INT NOT NULL AUTO_INCREMENT,
+  `club_id` INT NOT NULL,
+  `name` VARCHAR(255) NOT NULL,
+  `address` VARCHAR(255) NULL,
+  `zip` VARCHAR(32) NULL,
+  `city` VARCHAR(255) NULL,
+  `sort_order` INT NOT NULL DEFAULT 0,
+  `created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `updated_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`id`),
+  KEY `idx_club_venue_club_sort` (`club_id`, `sort_order`),
+  KEY `idx_club_venue_club_name` (`club_id`, `name`),
+  CONSTRAINT `fk_club_venue_club` FOREIGN KEY (`club_id`) REFERENCES `clubs` (`id`) ON DELETE CASCADE
+);

backend/migrations/TABELLEN_LISTE.md

@@ -72,6 +72,7 @@
 
 ## API & Logging
 51. `api_log` - API-Logs
+52. `http_page_fetch_log` - HTTP-Aufrufe an click-TT/HTTV-Seiten (Logging)
 
-## Gesamt: 51 Tabellen
+## Gesamt: 52 Tabellen
 

backend/migrations/add_calendar_region_to_clubs.sql

@@ -0,0 +1,3 @@
+ALTER TABLE clubs
+  ADD COLUMN IF NOT EXISTS country_code VARCHAR(2) NOT NULL DEFAULT 'DE',
+  ADD COLUMN IF NOT EXISTS state_code VARCHAR(16) NULL;

backend/migrations/add_mytischtennis_history_player_id_to_member.sql

@@ -0,0 +1,5 @@
+-- Add my_tischtennis_history_player_id column
+ALTER TABLE member
+ADD COLUMN my_tischtennis_history_player_id VARCHAR(255) NULL COMMENT 'TTR history player ID from myTischtennis (e.g. P14EC4981D)';
+
+CREATE INDEX idx_member_my_tischtennis_history_player_id ON member(my_tischtennis_history_player_id);

backend/migrations/add_range_to_training_cancellations.sql

@@ -0,0 +1,13 @@
+ALTER TABLE training_cancellations
+  ADD COLUMN IF NOT EXISTS start_date DATE NULL,
+  ADD COLUMN IF NOT EXISTS end_date DATE NULL;
+
+UPDATE training_cancellations
+SET
+  start_date = COALESCE(start_date, date),
+  end_date = COALESCE(end_date, date)
+WHERE start_date IS NULL OR end_date IS NULL;
+
+ALTER TABLE training_cancellations
+  MODIFY start_date DATE NOT NULL,
+  MODIFY end_date DATE NOT NULL;

backend/migrations/add_training_group_ids_to_training_cancellations.sql

@@ -0,0 +1,2 @@
+ALTER TABLE training_cancellations
+  ADD COLUMN IF NOT EXISTS training_group_ids JSON NULL;

backend/migrations/create_calendar_events_table.sql

@@ -0,0 +1,15 @@
+CREATE TABLE IF NOT EXISTS calendar_events (
+  id INT AUTO_INCREMENT PRIMARY KEY,
+  club_id INT NOT NULL,
+  title VARCHAR(255) NOT NULL,
+  start_date DATE NOT NULL,
+  end_date DATE NOT NULL,
+  category VARCHAR(64) NULL,
+  notes TEXT NULL,
+  created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  updated_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  KEY idx_calendar_events_club_start (club_id, start_date),
+  CONSTRAINT fk_calendar_events_club
+    FOREIGN KEY (club_id) REFERENCES clubs(id)
+    ON DELETE CASCADE
+);

backend/migrations/create_http_page_fetch_log.sql

@@ -0,0 +1,31 @@
+-- Migration: Create http_page_fetch_log table for logging HTTP page fetches (HTTV/click-TT etc.)
+-- Dient zum Verständnis der externen Seiten-Struktur und URL-Varianten je nach Verband/Saison
+
+CREATE TABLE IF NOT EXISTS http_page_fetch_log (
+    id INT AUTO_INCREMENT PRIMARY KEY,
+    user_id INT NULL COMMENT 'Optional: User der den Aufruf ausgelöst hat',
+    fetch_type VARCHAR(64) NOT NULL COMMENT 'z.B. leaguePage, clubInfoDisplay, regionMeetingFilter',
+    base_domain VARCHAR(255) NOT NULL COMMENT 'z.B. httv.click-tt.de',
+    full_url TEXT NOT NULL COMMENT 'Vollständige aufgerufene URL',
+    association VARCHAR(64) NULL COMMENT 'Verband (z.B. HeTTV, RTTV)',
+    championship VARCHAR(128) NULL COMMENT 'Championship-Parameter (z.B. HTTV 25/26)',
+    club_id_param VARCHAR(64) NULL COMMENT 'Club-ID falls clubInfoDisplay',
+    request_method VARCHAR(16) NULL COMMENT 'HTTP-Methode des ausgehenden Requests',
+    request_headers LONGTEXT NULL COMMENT 'Gesendete Request-Header als JSON',
+    request_body LONGTEXT NULL COMMENT 'Gesendeter Request-Body im Originalformat',
+    http_status INT NULL COMMENT 'HTTP-Status der Response',
+    success BOOLEAN NOT NULL DEFAULT FALSE,
+    response_snippet TEXT NULL COMMENT 'Gekürzter Response-Anfang (max 2000 Zeichen) zur Strukturanalyse',
+    content_type VARCHAR(128) NULL COMMENT 'Content-Type der Response',
+    response_headers LONGTEXT NULL COMMENT 'Empfangene Response-Header als JSON',
+    response_body LONGTEXT NULL COMMENT 'Vollständiger Response-Body',
+    response_url TEXT NULL COMMENT 'Finale Response-URL nach Redirects',
+    error_message TEXT NULL,
+    execution_time_ms INT NULL COMMENT 'Laufzeit in Millisekunden',
+    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+
+    INDEX idx_created_at (created_at),
+    INDEX idx_base_domain_fetch_type (base_domain, fetch_type),
+    INDEX idx_association_championship (association, championship),
+    FOREIGN KEY (user_id) REFERENCES user(id) ON DELETE SET NULL ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;

backend/migrations/create_training_cancellations_table.sql

@@ -0,0 +1,15 @@
+CREATE TABLE IF NOT EXISTS training_cancellations (
+  id INT AUTO_INCREMENT PRIMARY KEY,
+  club_id INT NOT NULL,
+  start_date DATE NOT NULL,
+  end_date DATE NOT NULL,
+  date DATE NULL,
+  reason VARCHAR(255) NULL,
+  training_group_ids JSON NULL,
+  created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  updated_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  UNIQUE KEY uniq_training_cancellation_club_range (club_id, start_date, end_date),
+  CONSTRAINT fk_training_cancellations_club
+    FOREIGN KEY (club_id) REFERENCES clubs(id)
+    ON DELETE CASCADE
+);

backend/models/Accident.js

@@ -13,7 +13,7 @@ const Accident = sequelize.define('Accident', {
     allowNull: false,
   },
   accident: {
-    type: DataTypes.STRING,
+    type: DataTypes.TEXT,
     allowNull: false,
     set(value) {
       const encryptedValue = encryptData(value);

backend/models/BillingDocument.js

@@ -0,0 +1,47 @@
+import { DataTypes } from 'sequelize';
+import sequelize from '../database.js';
+
+const BillingDocument = sequelize.define('BillingDocument', {
+  id: {
+    type: DataTypes.INTEGER,
+    primaryKey: true,
+    autoIncrement: true,
+    allowNull: false
+  },
+  runId: {
+    type: DataTypes.INTEGER,
+    allowNull: false,
+    field: 'run_id'
+  },
+  displayName: {
+    type: DataTypes.STRING(255),
+    allowNull: false,
+    field: 'display_name'
+  },
+  status: {
+    type: DataTypes.ENUM('draft', 'generated', 'error'),
+    allowNull: false,
+    defaultValue: 'draft'
+  },
+  pdfStoragePath: {
+    type: DataTypes.STRING(1000),
+    allowNull: true,
+    field: 'pdf_storage_path'
+  },
+  pdfFilename: {
+    type: DataTypes.STRING(255),
+    allowNull: true,
+    field: 'pdf_filename'
+  },
+  errorMessage: {
+    type: DataTypes.TEXT,
+    allowNull: true,
+    field: 'error_message'
+  }
+}, {
+  tableName: 'billing_document',
+  underscored: true,
+  timestamps: true
+});
+
+export default BillingDocument;

backend/models/BillingDocumentValue.js

@@ -0,0 +1,37 @@
+import { DataTypes } from 'sequelize';
+import sequelize from '../database.js';
+
+const BillingDocumentValue = sequelize.define('BillingDocumentValue', {
+  id: {
+    type: DataTypes.INTEGER,
+    primaryKey: true,
+    autoIncrement: true,
+    allowNull: false
+  },
+  billingDocumentId: {
+    type: DataTypes.INTEGER,
+    allowNull: false,
+    field: 'billing_document_id'
+  },
+  fieldKey: {
+    type: DataTypes.STRING(120),
+    allowNull: false,
+    field: 'field_key'
+  },
+  resolvedValue: {
+    type: DataTypes.TEXT,
+    allowNull: true,
+    field: 'resolved_value'
+  },
+  resolvedSource: {
+    type: DataTypes.STRING(255),
+    allowNull: true,
+    field: 'resolved_source'
+  }
+}, {
+  tableName: 'billing_document_value',
+  underscored: true,
+  timestamps: false
+});
+
+export default BillingDocumentValue;

backend/models/BillingRun.js

@@ -0,0 +1,133 @@
+import { DataTypes } from 'sequelize';
+import sequelize from '../database.js';
+
+const BillingRun = sequelize.define('BillingRun', {
+  id: {
+    type: DataTypes.INTEGER,
+    primaryKey: true,
+    autoIncrement: true,
+    allowNull: false
+  },
+  clubId: {
+    type: DataTypes.INTEGER,
+    allowNull: false,
+    field: 'club_id'
+  },
+  templateId: {
+    type: DataTypes.INTEGER,
+    allowNull: false,
+    field: 'template_id'
+  },
+  name: {
+    type: DataTypes.STRING(255),
+    allowNull: false
+  },
+  periodStart: {
+    type: DataTypes.DATEONLY,
+    allowNull: false,
+    field: 'period_start'
+  },
+  periodEnd: {
+    type: DataTypes.DATEONLY,
+    allowNull: false,
+    field: 'period_end'
+  },
+  selfRecipientUserId: {
+    type: DataTypes.INTEGER,
+    allowNull: false,
+    field: 'self_recipient_user_id'
+  },
+  selfRecipientName: {
+    type: DataTypes.STRING(255),
+    allowNull: false,
+    field: 'self_recipient_name'
+  },
+  hourlyRate: {
+    type: DataTypes.DECIMAL(10, 2),
+    allowNull: false,
+    field: 'hourly_rate'
+  },
+  computedHoursTotal: {
+    type: DataTypes.DECIMAL(10, 2),
+    allowNull: false,
+    defaultValue: 0,
+    field: 'computed_hours_total'
+  },
+  iban: {
+    type: DataTypes.STRING(64),
+    allowNull: true
+  },
+  ibanWithoutCountry: {
+    type: DataTypes.BOOLEAN,
+    allowNull: false,
+    defaultValue: false,
+    field: 'iban_without_country'
+  },
+  sessionLabel: {
+    type: DataTypes.STRING(255),
+    allowNull: true,
+    field: 'session_label'
+  },
+  sameAccountCheckbox: {
+    type: DataTypes.BOOLEAN,
+    allowNull: false,
+    defaultValue: false,
+    field: 'same_account_checkbox'
+  },
+  omitSelfRecipientName: {
+    type: DataTypes.BOOLEAN,
+    allowNull: false,
+    defaultValue: false,
+    field: 'omit_self_recipient_name'
+  },
+  omitIban: {
+    type: DataTypes.BOOLEAN,
+    allowNull: false,
+    defaultValue: false,
+    field: 'omit_iban'
+  },
+  omitLocationText: {
+    type: DataTypes.BOOLEAN,
+    allowNull: false,
+    defaultValue: false,
+    field: 'omit_location_text'
+  },
+  omitDocumentDate: {
+    type: DataTypes.BOOLEAN,
+    allowNull: false,
+    defaultValue: false,
+    field: 'omit_document_date'
+  },
+  omitSessionLabel: {
+    type: DataTypes.BOOLEAN,
+    allowNull: false,
+    defaultValue: false,
+    field: 'omit_session_label'
+  },
+  locationText: {
+    type: DataTypes.STRING(255),
+    allowNull: true,
+    field: 'location_text'
+  },
+  documentDate: {
+    type: DataTypes.DATEONLY,
+    allowNull: true,
+    field: 'document_date'
+  },
+  status: {
+    type: DataTypes.ENUM('draft', 'generated', 'finalized', 'cancelled'),
+    allowNull: false,
+    defaultValue: 'draft'
+  },
+  createdByUserId: {
+    type: DataTypes.INTEGER,
+    allowNull: true,
+    field: 'created_by_user_id'
+  }
+}, {
+  tableName: 'billing_run',
+  underscored: true,
+  timestamps: true
+});
+
+export default BillingRun;

backend/models/BillingTemplate.js

@@ -0,0 +1,62 @@
+import { DataTypes } from 'sequelize';
+import sequelize from '../database.js';
+
+const BillingTemplate = sequelize.define('BillingTemplate', {
+  id: {
+    type: DataTypes.INTEGER,
+    primaryKey: true,
+    autoIncrement: true,
+    allowNull: false
+  },
+  clubId: {
+    type: DataTypes.INTEGER,
+    allowNull: false,
+    field: 'club_id'
+  },
+  name: {
+    type: DataTypes.STRING(255),
+    allowNull: false
+  },
+  description: {
+    type: DataTypes.TEXT,
+    allowNull: true
+  },
+  pdfStoragePath: {
+    type: DataTypes.STRING(1000),
+    allowNull: false,
+    field: 'pdf_storage_path'
+  },
+  pdfFilename: {
+    type: DataTypes.STRING(255),
+    allowNull: false,
+    field: 'pdf_filename'
+  },
+  pdfMimeType: {
+    type: DataTypes.STRING(100),
+    allowNull: false,
+    defaultValue: 'application/pdf',
+    field: 'pdf_mime_type'
+  },
+  isActive: {
+    type: DataTypes.BOOLEAN,
+    allowNull: false,
+    defaultValue: true,
+    field: 'is_active'
+  },
+  version: {
+    type: DataTypes.INTEGER,
+    allowNull: false,
+    defaultValue: 1
+  },
+  createdByUserId: {
+    type: DataTypes.INTEGER,
+    allowNull: true,
+    field: 'created_by_user_id'
+  }
+}, {
+  tableName: 'billing_template',
+  underscored: true,
+  timestamps: true
+});
+
+export default BillingTemplate;

backend/models/BillingTemplateField.js

@@ -0,0 +1,125 @@
+import { DataTypes } from 'sequelize';
+import sequelize from '../database.js';
+
+const BillingTemplateField = sequelize.define('BillingTemplateField', {
+  id: {
+    type: DataTypes.INTEGER,
+    primaryKey: true,
+    autoIncrement: true,
+    allowNull: false
+  },
+  templateId: {
+    type: DataTypes.INTEGER,
+    allowNull: false,
+    field: 'template_id'
+  },
+  fieldKey: {
+    type: DataTypes.STRING(120),
+    allowNull: false,
+    field: 'field_key'
+  },
+  label: {
+    type: DataTypes.STRING(255),
+    allowNull: false
+  },
+  fieldType: {
+    type: DataTypes.ENUM('text', 'number', 'currency', 'date', 'checkbox', 'formula', 'table_row'),
+    allowNull: false,
+    field: 'field_type'
+  },
+  sourceType: {
+    type: DataTypes.ENUM('manual', 'member', 'trainer', 'club', 'system', 'constant', 'formula'),
+    allowNull: false,
+    defaultValue: 'manual',
+    field: 'source_type'
+  },
+  sourcePath: {
+    type: DataTypes.STRING(255),
+    allowNull: true,
+    field: 'source_path'
+  },
+  constantValue: {
+    type: DataTypes.STRING(500),
+    allowNull: true,
+    field: 'constant_value'
+  },
+  formatter: {
+    type: DataTypes.ENUM('none', 'iban_no_country', 'date_dd_mm_yyyy', 'currency_eur_2'),
+    allowNull: false,
+    defaultValue: 'none'
+  },
+  isRequired: {
+    type: DataTypes.BOOLEAN,
+    allowNull: false,
+    defaultValue: false,
+    field: 'is_required'
+  },
+  mappingMode: {
+    type: DataTypes.ENUM('acroform', 'overlay'),
+    allowNull: false,
+    defaultValue: 'overlay',
+    field: 'mapping_mode'
+  },
+  acroformFieldName: {
+    type: DataTypes.STRING(255),
+    allowNull: true,
+    field: 'acroform_field_name'
+  },
+  pageNumber: {
+    type: DataTypes.INTEGER,
+    allowNull: true,
+    field: 'page_number'
+  },
+  x: {
+    type: DataTypes.DECIMAL(10, 2),
+    allowNull: true
+  },
+  y: {
+    type: DataTypes.DECIMAL(10, 2),
+    allowNull: true
+  },
+  width: {
+    type: DataTypes.DECIMAL(10, 2),
+    allowNull: true
+  },
+  height: {
+    type: DataTypes.DECIMAL(10, 2),
+    allowNull: true
+  },
+  fontSize: {
+    type: DataTypes.DECIMAL(5, 2),
+    allowNull: true,
+    field: 'font_size'
+  },
+  align: {
+    type: DataTypes.ENUM('left', 'center', 'right'),
+    allowNull: true
+  },
+  formulaExpression: {
+    type: DataTypes.STRING(1000),
+    allowNull: true,
+    field: 'formula_expression'
+  },
+  tableGroup: {
+    type: DataTypes.STRING(100),
+    allowNull: true,
+    field: 'table_group'
+  },
+  rowIndex: {
+    type: DataTypes.INTEGER,
+    allowNull: true,
+    field: 'row_index'
+  },
+  sortOrder: {
+    type: DataTypes.INTEGER,
+    allowNull: false,
+    defaultValue: 0,
+    field: 'sort_order'
+  }
+}, {
+  tableName: 'billing_template_field',
+  underscored: true,
+  timestamps: true
+});
+
+export default BillingTemplateField;

backend/models/BillingUserSetting.js

@@ -0,0 +1,43 @@
+import { DataTypes } from 'sequelize';
+import sequelize from '../database.js';
+
+const BillingUserSetting = sequelize.define('BillingUserSetting', {
+  id: {
+    type: DataTypes.INTEGER,
+    primaryKey: true,
+    autoIncrement: true,
+    allowNull: false
+  },
+  clubId: {
+    type: DataTypes.INTEGER,
+    allowNull: false,
+    field: 'club_id'
+  },
+  userId: {
+    type: DataTypes.INTEGER,
+    allowNull: false,
+    field: 'user_id'
+  },
+  lastHourlyRate: {
+    type: DataTypes.DECIMAL(10, 2),
+    allowNull: false,
+    defaultValue: 0,
+    field: 'last_hourly_rate'
+  },
+  lastSelfRecipientName: {
+    type: DataTypes.STRING(255),
+    allowNull: true,
+    field: 'last_self_recipient_name'
+  },
+  lastLocationText: {
+    type: DataTypes.STRING(255),
+    allowNull: true,
+    field: 'last_location_text'
+  }
+}, {
+  tableName: 'billing_user_setting',
+  underscored: true,
+  timestamps: true
+});
+
+export default BillingUserSetting;

backend/models/CalendarEvent.js

@@ -0,0 +1,25 @@
+import { DataTypes } from 'sequelize';
+import sequelize from '../database.js';
+import Club from './Club.js';
+
+const CalendarEvent = sequelize.define('CalendarEvent', {
+  id: { type: DataTypes.INTEGER, primaryKey: true, autoIncrement: true },
+  clubId: {
+    type: DataTypes.INTEGER,
+    allowNull: false,
+    references: { model: Club, key: 'id' },
+    onDelete: 'CASCADE',
+  },
+  title: { type: DataTypes.STRING(255), allowNull: false },
+  startDate: { type: DataTypes.DATEONLY, allowNull: false, field: 'start_date' },
+  endDate: { type: DataTypes.DATEONLY, allowNull: false, field: 'end_date' },
+  category: { type: DataTypes.STRING(64), allowNull: true },
+  notes: { type: DataTypes.TEXT, allowNull: true },
+}, {
+  tableName: 'calendar_events',
+  underscored: true,
+  timestamps: true,
+  indexes: [{ fields: ['club_id', 'start_date'] }],
+});
+
+export default CalendarEvent;

backend/models/ClickTtAccount.js

@@ -0,0 +1,107 @@
+import { DataTypes } from 'sequelize';
+import sequelize from '../database.js';
+import { encryptData, decryptData } from '../utils/encrypt.js';
+
+const ClickTtAccount = sequelize.define('ClickTtAccount', {
+  id: {
+    type: DataTypes.INTEGER,
+    primaryKey: true,
+    autoIncrement: true,
+    allowNull: false
+  },
+  userId: {
+    type: DataTypes.INTEGER,
+    allowNull: false,
+    unique: true,
+    references: {
+      model: 'user',
+      key: 'id'
+    },
+    onDelete: 'CASCADE',
+    field: 'user_id'
+  },
+  username: {
+    type: DataTypes.STRING,
+    allowNull: false,
+    set(value) {
+      this.setDataValue('username', encryptData(value));
+    },
+    get() {
+      const encryptedValue = this.getDataValue('username');
+      return encryptedValue ? decryptData(encryptedValue) : null;
+    }
+  },
+  encryptedPassword: {
+    type: DataTypes.TEXT('long'),
+    allowNull: true,
+    field: 'encrypted_password'
+  },
+  savePassword: {
+    type: DataTypes.BOOLEAN,
+    defaultValue: false,
+    allowNull: false,
+    field: 'save_password'
+  },
+  lastLoginAttempt: {
+    type: DataTypes.DATE,
+    allowNull: true,
+    field: 'last_login_attempt'
+  },
+  lastLoginSuccess: {
+    type: DataTypes.DATE,
+    allowNull: true,
+    field: 'last_login_success'
+  },
+  playwrightStorageState: {
+    type: DataTypes.TEXT('long'),
+    allowNull: true,
+    field: 'playwright_storage_state',
+    set(value) {
+      if (value === null || value === undefined) {
+        this.setDataValue('playwrightStorageState', null);
+      } else {
+        const jsonString = typeof value === 'string' ? value : JSON.stringify(value);
+        this.setDataValue('playwrightStorageState', encryptData(jsonString));
+      }
+    },
+    get() {
+      const encrypted = this.getDataValue('playwrightStorageState');
+      if (!encrypted) return null;
+      try {
+        return JSON.parse(decryptData(encrypted));
+      } catch (_err) {
+        return null;
+      }
+    }
+  }
+}, {
+  underscored: true,
+  tableName: 'click_tt_account',
+  timestamps: true,
+  hooks: {
+    beforeSave: async (instance) => {
+      if (!instance.savePassword) {
+        instance.encryptedPassword = null;
+      }
+    }
+  }
+});
+
+ClickTtAccount.prototype.setPassword = function(password) {
+  if (password && this.savePassword) {
+    this.encryptedPassword = encryptData(password);
+  } else {
+    this.encryptedPassword = null;
+  }
+};
+
+ClickTtAccount.prototype.getPassword = function() {
+  if (!this.encryptedPassword) return null;
+  try {
+    return decryptData(this.encryptedPassword);
+  } catch (_err) {
+    return null;
+  }
+};
+
+export default ClickTtAccount;

backend/models/Club.js

@@ -17,6 +17,38 @@ const Club = sequelize.define('Club', {
     allowNull: true,
     field: 'association_member_number'
   },
+  myTischtennisFedNickname: {
+    type: DataTypes.STRING,
+    allowNull: true,
+    field: 'my_tischtennis_fed_nickname',
+    comment: 'Federation short name for rankings (e.g. HeTTV)'
+  },
+  autoFetchRankings: {
+    type: DataTypes.BOOLEAN,
+    allowNull: false,
+    defaultValue: false,
+    field: 'auto_fetch_rankings',
+    comment: 'Enable automatic TTR/QTTR rankings fetch for this club'
+  },
+  countryCode: {
+    type: DataTypes.STRING(2),
+    allowNull: false,
+    defaultValue: 'DE',
+    field: 'country_code',
+    comment: 'ISO 3166-1 alpha-2 country code for regional calendar data'
+  },
+  stateCode: {
+    type: DataTypes.STRING(16),
+    allowNull: true,
+    field: 'state_code',
+    comment: 'ISO 3166-2 subdivision code for regional calendar data, e.g. DE-NW'
+  },
+  memberDataQualityRequirements: {
+    type: DataTypes.JSON,
+    allowNull: true,
+    field: 'member_data_quality_requirements',
+    comment: 'Configures which member fields are required for data quality checks'
+  }
 }, {
   tableName: 'clubs',
   underscored: true,

backend/models/ClubAccount.js

@@ -0,0 +1,94 @@
+import { DataTypes } from 'sequelize';
+import sequelize from '../database.js';
+
+const ClubAccount = sequelize.define('ClubAccount', {
+  clubId: {
+    type: DataTypes.INTEGER,
+    allowNull: false,
+    field: 'club_id',
+  },
+  name: {
+    type: DataTypes.STRING(160),
+    allowNull: false,
+  },
+  accountHolder: {
+    type: DataTypes.STRING(255),
+    allowNull: true,
+    field: 'account_holder',
+  },
+  bankName: {
+    type: DataTypes.STRING(160),
+    allowNull: true,
+    field: 'bank_name',
+  },
+  iban: {
+    type: DataTypes.STRING(34),
+    allowNull: true,
+  },
+  bic: {
+    type: DataTypes.STRING(11),
+    allowNull: true,
+  },
+  accountType: {
+    type: DataTypes.ENUM('bank', 'cash', 'virtual'),
+    allowNull: false,
+    defaultValue: 'bank',
+    field: 'account_type',
+  },
+  usageType: {
+    type: DataTypes.ENUM('general', 'membership_fees', 'donations', 'expenses', 'reserve', 'petty_cash'),
+    allowNull: false,
+    defaultValue: 'general',
+    field: 'usage_type',
+  },
+  currencyCode: {
+    type: DataTypes.STRING(3),
+    allowNull: false,
+    defaultValue: 'EUR',
+    field: 'currency_code',
+  },
+  allowSepaCollections: {
+    type: DataTypes.BOOLEAN,
+    allowNull: false,
+    defaultValue: false,
+    field: 'allow_sepa_collections',
+  },
+  allowOutgoingPayments: {
+    type: DataTypes.BOOLEAN,
+    allowNull: false,
+    defaultValue: true,
+    field: 'allow_outgoing_payments',
+  },
+  isDefault: {
+    type: DataTypes.BOOLEAN,
+    allowNull: false,
+    defaultValue: false,
+    field: 'is_default',
+  },
+  status: {
+    type: DataTypes.ENUM('active', 'inactive', 'archived'),
+    allowNull: false,
+    defaultValue: 'active',
+  },
+  notes: {
+    type: DataTypes.TEXT,
+    allowNull: true,
+  },
+  archivedAt: {
+    type: DataTypes.DATE,
+    allowNull: true,
+    field: 'archived_at',
+  },
+  sortOrder: {
+    type: DataTypes.INTEGER,
+    allowNull: false,
+    defaultValue: 0,
+    field: 'sort_order',
+  },
+}, {
+  tableName: 'club_accounts',
+  underscored: true,
+  timestamps: true,
+});
+
+export default ClubAccount;

backend/models/ClubPaymentClaim.js

@@ -0,0 +1,78 @@
+import { DataTypes } from 'sequelize';
+import sequelize from '../database.js';
+
+const ClubPaymentClaim = sequelize.define('ClubPaymentClaim', {
+  clubId: {
+    type: DataTypes.INTEGER,
+    allowNull: false,
+    field: 'club_id'
+  },
+  memberId: {
+    type: DataTypes.INTEGER,
+    allowNull: true,
+    field: 'member_id'
+  },
+  feeRuleId: {
+    type: DataTypes.INTEGER,
+    allowNull: true,
+    field: 'fee_rule_id'
+  },
+  claimType: {
+    type: DataTypes.STRING(32),
+    allowNull: false,
+    defaultValue: 'membership_fee',
+    field: 'claim_type'
+  },
+  status: {
+    type: DataTypes.ENUM('open', 'partially_paid', 'paid', 'written_off', 'cancelled'),
+    allowNull: false,
+    defaultValue: 'open'
+  },
+  dueOn: {
+    type: DataTypes.DATEONLY,
+    allowNull: false,
+    field: 'due_on'
+  },
+  amountCents: {
+    type: DataTypes.BIGINT,
+    allowNull: false,
+    field: 'amount_cents'
+  },
+  currencyCode: {
+    type: DataTypes.STRING(3),
+    allowNull: false,
+    defaultValue: 'EUR',
+    field: 'currency_code'
+  },
+  reminderLevel: {
+    type: DataTypes.INTEGER,
+    allowNull: false,
+    defaultValue: 0,
+    field: 'reminder_level'
+  },
+  lastReminderAt: {
+    type: DataTypes.DATE,
+    allowNull: true,
+    field: 'last_reminder_at'
+  },
+  notes: {
+    type: DataTypes.TEXT,
+    allowNull: true
+  },
+  settledAt: {
+    type: DataTypes.DATE,
+    allowNull: true,
+    field: 'settled_at'
+  },
+  archivedAt: {
+    type: DataTypes.DATE,
+    allowNull: true,
+    field: 'archived_at'
+  }
+}, {
+  tableName: 'club_payment_claims',
+  underscored: true,
+  timestamps: true
+});
+
+export default ClubPaymentClaim;

backend/models/ClubRequest.js

@@ -0,0 +1,94 @@
+import { DataTypes } from 'sequelize';
+import sequelize from '../database.js';
+
+const ClubRequest = sequelize.define('ClubRequest', {
+  clubId: {
+    type: DataTypes.INTEGER,
+    allowNull: false,
+    field: 'club_id'
+  },
+  requestType: {
+    type: DataTypes.ENUM('contact', 'trial_training', 'membership', 'sponsoring'),
+    allowNull: false,
+    defaultValue: 'contact',
+    field: 'request_type'
+  },
+  status: {
+    type: DataTypes.ENUM('open', 'in_progress', 'waiting', 'converted', 'rejected', 'archived'),
+    allowNull: false,
+    defaultValue: 'open'
+  },
+  workflowStage: {
+    type: DataTypes.STRING(64),
+    allowNull: true,
+    field: 'workflow_stage'
+  },
+  priority: {
+    type: DataTypes.ENUM('low', 'normal', 'high', 'urgent'),
+    allowNull: false,
+    defaultValue: 'normal'
+  },
+  subject: {
+    type: DataTypes.STRING,
+    allowNull: true
+  },
+  firstName: {
+    type: DataTypes.STRING,
+    allowNull: true,
+    field: 'first_name'
+  },
+  lastName: {
+    type: DataTypes.STRING,
+    allowNull: true,
+    field: 'last_name'
+  },
+  email: {
+    type: DataTypes.STRING,
+    allowNull: true
+  },
+  phone: {
+    type: DataTypes.STRING,
+    allowNull: true
+  },
+  message: {
+    type: DataTypes.TEXT,
+    allowNull: true
+  },
+  sourceSystem: {
+    type: DataTypes.STRING,
+    allowNull: true,
+    field: 'source_system'
+  },
+  receivedAt: {
+    type: DataTypes.DATE,
+    allowNull: false,
+    defaultValue: DataTypes.NOW,
+    field: 'received_at'
+  },
+  assignedUserId: {
+    type: DataTypes.INTEGER,
+    allowNull: true,
+    field: 'assigned_user_id'
+  },
+  assignedMemberId: {
+    type: DataTypes.INTEGER,
+    allowNull: true,
+    field: 'assigned_member_id'
+  },
+  convertedMemberId: {
+    type: DataTypes.INTEGER,
+    allowNull: true,
+    field: 'converted_member_id'
+  },
+  closedAt: {
+    type: DataTypes.DATE,
+    allowNull: true,
+    field: 'closed_at'
+  }
+}, {
+  tableName: 'club_requests',
+  underscored: true,
+  timestamps: true
+});
+
+export default ClubRequest;

backend/models/ClubRequestNote.js

@@ -0,0 +1,32 @@
+import { DataTypes } from 'sequelize';
+import sequelize from '../database.js';
+
+const ClubRequestNote = sequelize.define('ClubRequestNote', {
+  clubRequestId: {
+    type: DataTypes.INTEGER,
+    allowNull: false,
+    field: 'club_request_id'
+  },
+  noteType: {
+    type: DataTypes.STRING(32),
+    allowNull: false,
+    defaultValue: 'internal',
+    field: 'note_type'
+  },
+  createdByUserId: {
+    type: DataTypes.INTEGER,
+    allowNull: true,
+    field: 'created_by_user_id'
+  },
+  body: {
+    type: DataTypes.TEXT,
+    allowNull: false
+  }
+}, {
+  tableName: 'club_request_notes',
+  underscored: true,
+  timestamps: true,
+  updatedAt: false
+});
+
+export default ClubRequestNote;

backend/models/ClubRole.js

@@ -0,0 +1,58 @@
+import { DataTypes } from 'sequelize';
+import sequelize from '../database.js';
+
+const ClubRole = sequelize.define('ClubRole', {
+  id: {
+    type: DataTypes.INTEGER,
+    primaryKey: true,
+    autoIncrement: true,
+    allowNull: false,
+  },
+  clubId: {
+    type: DataTypes.INTEGER,
+    allowNull: false,
+    field: 'club_id',
+  },
+  roleKey: {
+    type: DataTypes.STRING(64),
+    allowNull: false,
+    field: 'role_key',
+  },
+  name: {
+    type: DataTypes.STRING(120),
+    allowNull: false,
+  },
+  description: {
+    type: DataTypes.TEXT,
+    allowNull: true,
+  },
+  permissions: {
+    type: DataTypes.JSON,
+    allowNull: false,
+    defaultValue: {},
+  },
+  isSystemRole: {
+    type: DataTypes.BOOLEAN,
+    allowNull: false,
+    defaultValue: false,
+    field: 'is_system_role',
+  },
+  sortOrder: {
+    type: DataTypes.INTEGER,
+    allowNull: false,
+    defaultValue: 0,
+    field: 'sort_order',
+  },
+}, {
+  tableName: 'club_roles',
+  underscored: true,
+  timestamps: true,
+  indexes: [
+    {
+      unique: true,
+      fields: ['club_id', 'role_key'],
+    },
+  ],
+});
+
+export default ClubRole;