Compare commits
6
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
adf723419d | ||
|
|
f3f4ca2c9f | ||
|
|
c9c40af382 | ||
|
|
ae4f153482 | ||
|
|
1bfcc7a079 | ||
|
|
43c7dccc9f |
No files matched your search
@@ -0,0 +1,106 @@
|
|||||||
|
# Tests every push and pull request; deploys pushes to master to the Plesk server.
|
||||||
|
# Setup and what the deploy may touch: docs/deployment.md.
|
||||||
|
#
|
||||||
|
# Same pattern as the calendar frontend (Calendar_Frontend/.gitea/workflows/deploy.yml): build here,
|
||||||
|
# deliver over SSH as the Plesk subscription user, restart Passenger. Unlike there, the app folder
|
||||||
|
# also holds things the deploy must never touch (.env with the secrets, logs/, tmp/), so only the
|
||||||
|
# app's own folders are synced with --delete and nothing is deleted at the top level.
|
||||||
|
name: Test and deploy
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches: [master]
|
||||||
|
pull_request:
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
# One job, not test + deploy: every job starts in a fresh container, so two jobs meant checking out,
|
||||||
|
# setting up Node and running `npm ci` twice (~2 min each, 2026-11-08). The deploy steps only run
|
||||||
|
# for pushes to master; on pull requests the job ends after the tests. The condition is spelled out
|
||||||
|
# on every deploy step rather than stored in an env flag: a flag compared as a string ('true') would
|
||||||
|
# skip the deploy silently - and green - if the runner ever rendered the boolean differently.
|
||||||
|
test-and-deploy:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
env:
|
||||||
|
DEPLOY_HOST: ${{ vars.DEPLOY_HOST }}
|
||||||
|
DEPLOY_PORT: ${{ vars.DEPLOY_PORT }}
|
||||||
|
DEPLOY_USER: ${{ vars.DEPLOY_USER }}
|
||||||
|
DEPLOY_PATH: ${{ vars.DEPLOY_PATH }}
|
||||||
|
# Absolute on purpose: rsync passes its -e string to ssh without a shell, and ssh expands "~"
|
||||||
|
# from the passwd entry, not $HOME (see the calendar frontend's docs/gotchas.md).
|
||||||
|
SSH_DIR: /tmp/deploy-ssh
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
- uses: actions/setup-node@v4
|
||||||
|
with:
|
||||||
|
node-version-file: .nvmrc
|
||||||
|
- run: npm ci
|
||||||
|
- run: npx tsc --noEmit
|
||||||
|
# Unit tests only. The integration tests (npm run test:integration) start their own MariaDB
|
||||||
|
# container and aren't run here.
|
||||||
|
# FEEDBACK_IP_SALT (which the Jenkins job exported) isn't needed: vitest.config.ts sets one.
|
||||||
|
- run: npm test
|
||||||
|
|
||||||
|
- name: Build
|
||||||
|
if: github.event_name == 'push' && github.ref == 'refs/heads/master'
|
||||||
|
run: npm run build
|
||||||
|
# Only runtime dependencies go to the server (no typescript, vitest, ...).
|
||||||
|
- name: Prune dev dependencies
|
||||||
|
if: github.event_name == 'push' && github.ref == 'refs/heads/master'
|
||||||
|
run: npm prune --omit=dev
|
||||||
|
|
||||||
|
- name: SSH setup
|
||||||
|
if: github.event_name == 'push' && github.ref == 'refs/heads/master'
|
||||||
|
env:
|
||||||
|
DEPLOY_SSH_KEY: ${{ secrets.DEPLOY_SSH_KEY }}
|
||||||
|
DEPLOY_KNOWN_HOSTS: ${{ secrets.DEPLOY_KNOWN_HOSTS }}
|
||||||
|
run: |
|
||||||
|
test -n "$DEPLOY_HOST" && test -n "$DEPLOY_USER" && test -n "$DEPLOY_PATH"
|
||||||
|
if ! command -v rsync >/dev/null 2>&1 || ! command -v ssh >/dev/null 2>&1; then
|
||||||
|
apt-get update && apt-get install -y --no-install-recommends rsync openssh-client
|
||||||
|
fi
|
||||||
|
install -m 700 -d "$SSH_DIR"
|
||||||
|
printf '%s\n' "$DEPLOY_SSH_KEY" > "$SSH_DIR/key"
|
||||||
|
chmod 600 "$SSH_DIR/key"
|
||||||
|
# Pinned host key, never trust-on-first-use.
|
||||||
|
printf '%s\n' "$DEPLOY_KNOWN_HOSTS" > "$SSH_DIR/known_hosts"
|
||||||
|
|
||||||
|
- name: Upload
|
||||||
|
if: github.event_name == 'push' && github.ref == 'refs/heads/master'
|
||||||
|
run: |
|
||||||
|
rsh="ssh -p ${DEPLOY_PORT:-22} -i $SSH_DIR/key -o UserKnownHostsFile=$SSH_DIR/known_hosts -o IdentitiesOnly=yes -o BatchMode=yes"
|
||||||
|
target="$DEPLOY_USER@$DEPLOY_HOST:$DEPLOY_PATH"
|
||||||
|
# The app's own folders, each mirrored exactly (--delete within the folder only).
|
||||||
|
# src/ is needed at runtime: swagger-jsdoc reads the route docs from src/models/**/*.ts.
|
||||||
|
for dir in dist src public node_modules; do
|
||||||
|
rsync -az --delete -e "$rsh" "$dir/" "$target/$dir/"
|
||||||
|
done
|
||||||
|
# Single files at the top level, without --delete: .env, logs/ and tmp/ live there too.
|
||||||
|
# package.json is what makes Node treat dist/ as ES modules ("type": "module").
|
||||||
|
rsync -az -e "$rsh" package.json package-lock.json "$target/"
|
||||||
|
|
||||||
|
- name: Restart
|
||||||
|
if: github.event_name == 'push' && github.ref == 'refs/heads/master'
|
||||||
|
run: |
|
||||||
|
# Passenger restarts the app on its next request when tmp/restart.txt is touched.
|
||||||
|
ssh -p "${DEPLOY_PORT:-22}" -i "$SSH_DIR/key" -o "UserKnownHostsFile=$SSH_DIR/known_hosts" \
|
||||||
|
-o IdentitiesOnly=yes -o BatchMode=yes "$DEPLOY_USER@$DEPLOY_HOST" \
|
||||||
|
"mkdir -p '$DEPLOY_PATH/tmp' && touch '$DEPLOY_PATH/tmp/restart.txt'"
|
||||||
|
|
||||||
|
# Set DEPLOY_SMOKE_URL to an endpoint that must answer 200 without a session, e.g.
|
||||||
|
# https://api.nachklang.art/calendar/events/public/json (what nachklang.art itself reads).
|
||||||
|
- name: Smoke test
|
||||||
|
if: github.event_name == 'push' && github.ref == 'refs/heads/master' && vars.DEPLOY_SMOKE_URL != ''
|
||||||
|
env:
|
||||||
|
DEPLOY_SMOKE_URL: ${{ vars.DEPLOY_SMOKE_URL }}
|
||||||
|
run: |
|
||||||
|
# Passenger starts the app on the first request after the restart; give it a moment.
|
||||||
|
for _ in 1 2 3 4 5 6; do
|
||||||
|
if curl -fsS -o /dev/null "$DEPLOY_SMOKE_URL"; then echo "OK: $DEPLOY_SMOKE_URL"; exit 0; fi
|
||||||
|
sleep 5
|
||||||
|
done
|
||||||
|
echo "Smoke test failed: $DEPLOY_SMOKE_URL"
|
||||||
|
exit 1
|
||||||
|
|
||||||
|
- name: Remove key
|
||||||
|
if: always() && github.event_name == 'push' && github.ref == 'refs/heads/master'
|
||||||
|
run: rm -f "$SSH_DIR/key"
|
||||||
@@ -8,7 +8,7 @@ This file provides guidance to Claude Code (claude.ai/code) when working with co
|
|||||||
npm run build # Compile TypeScript → dist/
|
npm run build # Compile TypeScript → dist/
|
||||||
npm run start # Build and start (tsc && node ./dist/app.js)
|
npm run start # Build and start (tsc && node ./dist/app.js)
|
||||||
npm run debug # Start with DEBUG=* environment variable
|
npm run debug # Start with DEBUG=* environment variable
|
||||||
npm run test # Run the vitest suite once with coverage (lcov + testResults/sonar-report.xml)
|
npm run test # Run the vitest suite once with coverage (text summary + lcov in coverage/)
|
||||||
npm run test:watch # vitest in watch mode
|
npm run test:watch # vitest in watch mode
|
||||||
npm run test:integration # Admin-module tests against a throwaway MariaDB (needs docker or podman)
|
npm run test:integration # Admin-module tests against a throwaway MariaDB (needs docker or podman)
|
||||||
```
|
```
|
||||||
@@ -18,6 +18,12 @@ Run a single test file:
|
|||||||
npx vitest run test/some.test.ts
|
npx vitest run test/some.test.ts
|
||||||
```
|
```
|
||||||
|
|
||||||
|
**Deploys** run in Gitea Actions (`.gitea/workflows/deploy.yml`, since 2026-11-08; Jenkins is
|
||||||
|
retired): every push/PR runs `tsc` and the unit tests, pushes to master build, prune dev
|
||||||
|
dependencies and rsync `dist/`, `src/`, `public/`, `node_modules/` and `package.json` to Plesk over
|
||||||
|
SSH. `.env`, `logs/` and `tmp/` on the server are never touched; SQL migrations stay manual.
|
||||||
|
Details: `docs/deployment.md`.
|
||||||
|
|
||||||
## Architecture
|
## Architecture
|
||||||
|
|
||||||
Express.js REST API in TypeScript with a service-oriented layering. Domains: `Calendar` (events, users), `Feedback` (concert feedback forms, mounted at `/feedback`, backed by its own `FEEDBACK_DB` — see `src/models/feedback/`: public submission flow, admin CRUD, reporting, and a Salesforce newsletter-sync integration), `Tickets` (mounted at `/tickets`), and `Admin` (identity and permissions, mounted at `/admin`, backed by `ADMIN_DB` — see below).
|
Express.js REST API in TypeScript with a service-oriented layering. Domains: `Calendar` (events, users), `Feedback` (concert feedback forms, mounted at `/feedback`, backed by its own `FEEDBACK_DB` — see `src/models/feedback/`: public submission flow, admin CRUD, reporting, and a Salesforce newsletter-sync integration), `Tickets` (mounted at `/tickets`), and `Admin` (identity and permissions, mounted at `/admin`, backed by `ADMIN_DB` — see below).
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
USE nachklang_feedback;
|
USE nachklang_feedback;
|
||||||
SOURCE /migrations/feedback/001_init.sql;
|
SOURCE /migrations/feedback/001_init.sql;
|
||||||
SOURCE /migrations/feedback/002_add_poster_image_url.sql;
|
SOURCE /migrations/feedback/002_add_poster_image_url.sql;
|
||||||
|
SOURCE /migrations/feedback/003_add_submission_client_token.sql;
|
||||||
@@ -0,0 +1,116 @@
|
|||||||
|
# Deployment
|
||||||
|
|
||||||
|
The API runs on the Plesk server as a Node.js app (Phusion Passenger) and is deployed by **Gitea
|
||||||
|
Actions** (`.gitea/workflows/deploy.yml`), which replaced the Jenkins job on 2026-11-08. Same
|
||||||
|
pattern as the calendar frontend; the reusable how-to (server facts, one-time setup, gotchas) is in
|
||||||
|
`Calendar_Frontend/docs/deployment.md` and in Patrick's PKM ("Jenkins to Gitea Actions for a Plesk
|
||||||
|
Node.js App").
|
||||||
|
|
||||||
|
```
|
||||||
|
push to master ──▶ Gitea ──▶ runner (container on the server)
|
||||||
|
└─ one job: npm ci, tsc --noEmit, npm test (unit tests)
|
||||||
|
└─ (master only) build, prune dev deps ─ rsync over SSH ─▶
|
||||||
|
plesk-nachklang@nachklang.art:<app root> + tmp/restart.txt
|
||||||
|
```
|
||||||
|
|
||||||
|
Pull requests run the same job up to the tests; the deploy steps only run for pushes to master. It
|
||||||
|
used to be two jobs, which ran `npm ci` twice (~2 min each); merged into one on 2026-11-08.
|
||||||
|
|
||||||
|
## Plesk (as configured, 2026-11-08)
|
||||||
|
|
||||||
|
*Websites & Domains → api.nachklang.art → Node.js*:
|
||||||
|
|
||||||
|
| Setting | Value |
|
||||||
|
|---|---|
|
||||||
|
| Node.js version | 26.13.0 |
|
||||||
|
| Application root | `/api.nachklang.art` (= `/var/www/vhosts/nachklang.art/api.nachklang.art`) |
|
||||||
|
| Document root | `/api.nachklang.art/public` |
|
||||||
|
| Application startup file | `dist/app.js` |
|
||||||
|
| Application mode | production |
|
||||||
|
| Environment variable | `PORT=443` (Passenger takes over the port; `app.ts` exits without `PORT`) |
|
||||||
|
|
||||||
|
## What the deploy touches - and what it must not
|
||||||
|
|
||||||
|
The app root holds more than the build, so the workflow syncs **only the app's own parts**:
|
||||||
|
|
||||||
|
| Path | How | Why it's needed at runtime |
|
||||||
|
|---|---|---|
|
||||||
|
| `dist/` | mirrored (`--delete` inside) | the compiled app |
|
||||||
|
| `src/` | mirrored | swagger-jsdoc reads the route docs from `src/models/**/*.router.ts` / `*.interface.ts` for `/docs` |
|
||||||
|
| `public/` | mirrored | Passenger's document root |
|
||||||
|
| `node_modules/` | mirrored, production dependencies only (`npm prune --omit=dev`) | runtime dependencies |
|
||||||
|
| `package.json`, `package-lock.json` | copied, no delete | `"type": "module"` makes Node load `dist/` as ES modules |
|
||||||
|
|
||||||
|
**Never touched** (nothing is deleted at the top level): `.env` (the secrets; `dotenv` reads it from
|
||||||
|
the app root), `logs/` (Winston writes there, relative to the app root), `tmp/` (Passenger's
|
||||||
|
`restart.txt`), and anything else in that folder.
|
||||||
|
|
||||||
|
The Jenkins job copied `dist/`, `src/` and `node_modules/` with `cp` (never deleting, so stale files
|
||||||
|
piled up) and never `package.json` or `public/`; the first rsync deploy cleans that up.
|
||||||
|
|
||||||
|
**SQL migrations are not part of the deploy.** Files under `sql/` are still applied by hand, before
|
||||||
|
the deploy that needs them.
|
||||||
|
|
||||||
|
## Gitea settings
|
||||||
|
|
||||||
|
Shared by all Nachklang repos, on the organisation (*Nachklang → Settings → Actions*): secrets
|
||||||
|
`DEPLOY_SSH_KEY`, `DEPLOY_KNOWN_HOSTS`; variables `DEPLOY_HOST=nachklang.art`, `DEPLOY_PORT=42069`,
|
||||||
|
`DEPLOY_USER=plesk-nachklang`.
|
||||||
|
|
||||||
|
On this repository (*API → Settings → Actions → Variables*):
|
||||||
|
|
||||||
|
| Variable | Value |
|
||||||
|
|---|---|
|
||||||
|
| `DEPLOY_PATH` | `/var/www/vhosts/nachklang.art/api.nachklang.art` |
|
||||||
|
| `DEPLOY_SMOKE_URL` | `https://api.nachklang.art/calendar/events/public/json` |
|
||||||
|
|
||||||
|
The smoke test only needs an endpoint that answers 200 without a session; the public calendar feed
|
||||||
|
is the one nachklang.art itself depends on.
|
||||||
|
|
||||||
|
## Switchover (done once)
|
||||||
|
|
||||||
|
1. Pause the Jenkins API job (done 2026-11-08).
|
||||||
|
1a. **Fix file ownership** (as root): Jenkins deployed as **root**, so `dist/`, `src/` and
|
||||||
|
`node_modules/` were `root:root`, and the first Gitea deploy failed with rsync "Operation not
|
||||||
|
permitted" / "Permission denied" - the subscription user can't change root's files. Fixed with
|
||||||
|
`chown -R plesk-nachklang:psacln dist src node_modules` in the app root (the group of the files
|
||||||
|
the app creates itself, e.g. `.env`, `logs/`); then re-run the failed job.
|
||||||
|
Check: `find . ! -user plesk-nachklang` prints nothing.
|
||||||
|
2. Set `DEPLOY_PATH` and `DEPLOY_SMOKE_URL`.
|
||||||
|
3. Open a PR → green run → merge → watch the deploy steps. Unlike the calendar there is no gap:
|
||||||
|
the folder keeps working while files are replaced, and Passenger restarts on the next request.
|
||||||
|
4. Check `https://api.nachklang.art/docs` and the calendar/feedback/tickets apps.
|
||||||
|
|
||||||
|
Rollback: revert the commit on master; the workflow deploys the previous state.
|
||||||
|
|
||||||
|
## Checked locally (2026-11-08)
|
||||||
|
|
||||||
|
- `actionlint`: no findings.
|
||||||
|
- In a clean `node:26` container (26.13.0, no `.env`): `npm ci`, `tsc --noEmit`, all 233 unit tests,
|
||||||
|
build, `npm prune --omit=dev`.
|
||||||
|
- The pruned bundle, laid out like the server folder with a test `.env`, started with
|
||||||
|
`node dist/app.js` against a throwaway MariaDB: public JSON 200, iCal `text/calendar`, `/docs` 200
|
||||||
|
including the subscriptions route (so `src/` is read), `/admin/me` 401, `logs/` created in the app
|
||||||
|
root.
|
||||||
|
- The workflow's upload step against a throwaway SSH server with a folder like the real one: `.env`,
|
||||||
|
`logs/`, `tmp/` and an unrelated top-level file kept; a stale package in `node_modules/` and a stale
|
||||||
|
file in `dist/` removed; `package.json` updated.
|
||||||
|
|
||||||
|
Not checked: the workflow on the real runner.
|
||||||
|
|
||||||
|
## Notes
|
||||||
|
|
||||||
|
- There was **no `package.json` on the server** before the first rsync deploy (Jenkins never copied
|
||||||
|
it); `dist/app.js` still ran as ES modules, probably because Node ≥ 22 detects ES module syntax on
|
||||||
|
its own [inference, not checked]. The deploy now ships `package.json`, so it doesn't depend on that.
|
||||||
|
- A failed upload leaves new and old files mixed in `dist/`, but the running app is unaffected:
|
||||||
|
the restart step is skipped, so Passenger keeps the old code in memory until the next deploy (or an
|
||||||
|
unplanned restart - fix and re-run soon).
|
||||||
|
|
||||||
|
- `bcrypt` was removed on 2026-11-08: nothing imported it any more (passwords moved to better-auth,
|
||||||
|
which hashes with its own scrypt). It was the only production dependency with a native build step.
|
||||||
|
- `FEEDBACK_IP_SALT`, which the Jenkins test step exported, isn't needed in CI: `vitest.config.ts`
|
||||||
|
sets one for the test run.
|
||||||
|
- SonarQube isn't used any more; `sonar-project.properties`, the `vitest-sonar-reporter` and its
|
||||||
|
`testResults/sonar-report.xml` were removed on 2026-11-08 (the Jenkins job ran the tests only to
|
||||||
|
feed Sonar's coverage).
|
||||||
Generated
+6
-757
File diff suppressed because it is too large.
Load diff
+1
-4
@@ -23,7 +23,6 @@
|
|||||||
"@better-auth/passkey": "^1.7.2",
|
"@better-auth/passkey": "^1.7.2",
|
||||||
"app-root-path": "^3.0.0",
|
"app-root-path": "^3.0.0",
|
||||||
"axios": "^1.20.0",
|
"axios": "^1.20.0",
|
||||||
"bcrypt": "^5.0.1",
|
|
||||||
"better-auth": "^1.7.2",
|
"better-auth": "^1.7.2",
|
||||||
"cors": "^2.8.5",
|
"cors": "^2.8.5",
|
||||||
"debug": "^4.3.1",
|
"debug": "^4.3.1",
|
||||||
@@ -41,7 +40,6 @@
|
|||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/app-root-path": "^1.2.4",
|
"@types/app-root-path": "^1.2.4",
|
||||||
"@types/bcrypt": "^3.0.1",
|
|
||||||
"@types/cors": "^2.8.19",
|
"@types/cors": "^2.8.19",
|
||||||
"@types/debug": "^4.1.5",
|
"@types/debug": "^4.1.5",
|
||||||
"@types/express": "^4.17.15",
|
"@types/express": "^4.17.15",
|
||||||
@@ -56,8 +54,7 @@
|
|||||||
"source-map-support": "^0.5.19",
|
"source-map-support": "^0.5.19",
|
||||||
"supertest": "^7.2.2",
|
"supertest": "^7.2.2",
|
||||||
"typescript": "^5.9.3",
|
"typescript": "^5.9.3",
|
||||||
"vitest": "^5.0.0",
|
"vitest": "^5.0.0"
|
||||||
"vitest-sonar-reporter": "^3.0.0"
|
|
||||||
},
|
},
|
||||||
"overrides": {
|
"overrides": {
|
||||||
"better-auth": {
|
"better-auth": {
|
||||||
|
|||||||
@@ -1,6 +0,0 @@
|
|||||||
sonar.projectKey=nk-api
|
|
||||||
sonar.sources=src
|
|
||||||
sonar.tests=test
|
|
||||||
sonar.language=ts
|
|
||||||
sonar.javascript.lcov.reportPaths=coverage/lcov.info
|
|
||||||
sonar.testExecutionReportPaths=testResults/sonar-report.xml
|
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
-- Nachklang e.V. Feedback module — makes submitting idempotent per form visit.
|
||||||
|
-- Apply manually against the FEEDBACK_DB database, after 002_add_poster_image_url.sql:
|
||||||
|
-- mysql -h <DB_HOST> -u <DB_USER> -p <FEEDBACK_DB> < 003_add_submission_client_token.sql
|
||||||
|
--
|
||||||
|
-- The form generates one UUID per visit and resends it on every retry. When
|
||||||
|
-- a submission saved but its response never reached the phone, the visitor
|
||||||
|
-- sees an error and taps "absenden" again; the API now finds the stored token
|
||||||
|
-- and answers with the original submission instead of saving a copy.
|
||||||
|
--
|
||||||
|
-- Unique per event, not globally: one visit can switch to another concert's
|
||||||
|
-- form in the same tab, and that event's submission must still save.
|
||||||
|
--
|
||||||
|
-- NULL for every row written before this migration and for any client that
|
||||||
|
-- sends no token; a UNIQUE index allows any number of NULLs.
|
||||||
|
ALTER TABLE submissions
|
||||||
|
ADD COLUMN client_token CHAR(36) NULL AFTER ip_hash,
|
||||||
|
ADD UNIQUE KEY uq_sub_event_client_token (event_id, client_token);
|
||||||
@@ -56,6 +56,10 @@
|
|||||||
* website:
|
* website:
|
||||||
* type: string
|
* type: string
|
||||||
* description: Honeypot field. Must stay empty; a real visitor never fills it in.
|
* description: Honeypot field. Must stay empty; a real visitor never fills it in.
|
||||||
|
* clientToken:
|
||||||
|
* type: string
|
||||||
|
* format: uuid
|
||||||
|
* description: Generated once per form and resent on every retry. A retry whose token is already stored for this event returns the original submissionId instead of saving a duplicate. Optional; a value that isn't a UUID is ignored.
|
||||||
* SubmissionResponse:
|
* SubmissionResponse:
|
||||||
* type: object
|
* type: object
|
||||||
* properties:
|
* properties:
|
||||||
@@ -95,4 +99,5 @@ export interface SubmissionRequestBody {
|
|||||||
guestBook?: GuestBookInput;
|
guestBook?: GuestBookInput;
|
||||||
newsletter?: NewsletterInput;
|
newsletter?: NewsletterInput;
|
||||||
website?: string;
|
website?: string;
|
||||||
|
clientToken?: string;
|
||||||
}
|
}
|
||||||
@@ -11,6 +11,8 @@ const CONSENT_TEXT_VERSION = '2026-08-02';
|
|||||||
|
|
||||||
const EMAIL_RE = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
|
const EMAIL_RE = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
|
||||||
|
|
||||||
|
const CLIENT_TOKEN_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
|
||||||
|
|
||||||
// A real setlist tops out around a few dozen songs and a handful of
|
// A real setlist tops out around a few dozen songs and a handful of
|
||||||
// questions, so a legitimate submission never comes close to this. Caps
|
// questions, so a legitimate submission never comes close to this. Caps
|
||||||
// total generated rows regardless of how large the client's answers/ratings
|
// total generated rows regardless of how large the client's answers/ratings
|
||||||
@@ -136,6 +138,33 @@ export const validateNewsletter = (input?: NewsletterInput): ValidatedNewsletter
|
|||||||
return {firstName, lastName, email};
|
return {firstName, lastName, email};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The form generates one UUID per visit and resends it on every retry, so a
|
||||||
|
* request whose response was lost (the row saved, but the phone never heard
|
||||||
|
* back) can be told apart from a genuinely new submission. Anything that
|
||||||
|
* isn't a UUID is treated as "no token" rather than rejected - an old cached
|
||||||
|
* copy of the form must still be able to submit.
|
||||||
|
*/
|
||||||
|
export const normalizeClientToken = (token: unknown): string | null => {
|
||||||
|
return typeof token === 'string' && CLIENT_TOKEN_RE.test(token) ? token.toLowerCase() : null;
|
||||||
|
};
|
||||||
|
|
||||||
|
// Scoped to the event: the token is per form visit, and one visit can move
|
||||||
|
// on to another concert's form, so a match for a different event is not a
|
||||||
|
// retry of this one.
|
||||||
|
const findSubmissionIdByClientToken = async (clientToken: string, slug: string): Promise<number | null> => {
|
||||||
|
const conn = await NachklangFeedbackDB.getConnection();
|
||||||
|
try {
|
||||||
|
const rows = await conn.query(
|
||||||
|
'SELECT s.submission_id FROM submissions s JOIN events e ON e.event_id = s.event_id WHERE s.client_token = ? AND e.slug = ?',
|
||||||
|
[clientToken, slug]
|
||||||
|
);
|
||||||
|
return rows.length > 0 ? rows[0].submission_id : null;
|
||||||
|
} finally {
|
||||||
|
await conn.end();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
export type SubmitResult =
|
export type SubmitResult =
|
||||||
| { status: 'OK'; submissionId: number; newsletterDropped: boolean }
|
| { status: 'OK'; submissionId: number; newsletterDropped: boolean }
|
||||||
| { status: 'NOT_FOUND' }
|
| { status: 'NOT_FOUND' }
|
||||||
@@ -146,9 +175,29 @@ export type SubmitResult =
|
|||||||
* Validates and persists one feedback submission. Re-checks event
|
* Validates and persists one feedback submission. Re-checks event
|
||||||
* eligibility (the window may have closed between page load and submit),
|
* eligibility (the window may have closed between page load and submit),
|
||||||
* validates every answer against the event's live questions/songs, then
|
* validates every answer against the event's live questions/songs, then
|
||||||
* inserts everything in a single transaction.
|
* inserts everything in a single transaction. A retry carrying an already
|
||||||
|
* stored client token gets the original submission back instead of a copy.
|
||||||
*/
|
*/
|
||||||
export const submitFeedback = async (slug: string, body: SubmissionRequestBody, ipHash: string | null): Promise<SubmitResult> => {
|
export const submitFeedback = async (slug: string, body: SubmissionRequestBody, ipHash: string | null): Promise<SubmitResult> => {
|
||||||
|
const clientToken = normalizeClientToken(body.clientToken);
|
||||||
|
const newsletter = validateNewsletter(body.newsletter);
|
||||||
|
// body.newsletter is only sent at all when the visitor had the opt-in
|
||||||
|
// checkbox on (see FeedbackForm.tsx), so a present-but-invalid block
|
||||||
|
// (e.g. a mistyped email) is distinguishable from "didn't opt in" - the
|
||||||
|
// rest of the submission still saves, but the client can tell the
|
||||||
|
// visitor their newsletter signup specifically didn't go through.
|
||||||
|
const newsletterDropped = !!body.newsletter && !newsletter;
|
||||||
|
|
||||||
|
// Checked before eligibility, so a retry still succeeds if the feedback
|
||||||
|
// window closed in the seconds after the original saved.
|
||||||
|
if (clientToken) {
|
||||||
|
const existingId = await findSubmissionIdByClientToken(clientToken, slug);
|
||||||
|
if (existingId !== null) {
|
||||||
|
logger.info('Feedback submission retry answered with the stored submission', {submissionId: existingId});
|
||||||
|
return {status: 'OK', submissionId: existingId, newsletterDropped};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
const lookup = await getEventConfigBySlug(slug);
|
const lookup = await getEventConfigBySlug(slug);
|
||||||
if (lookup.status === 'NOT_FOUND') return {status: 'NOT_FOUND'};
|
if (lookup.status === 'NOT_FOUND') return {status: 'NOT_FOUND'};
|
||||||
if (lookup.status === 'CLOSED') return {status: 'CLOSED'};
|
if (lookup.status === 'CLOSED') return {status: 'CLOSED'};
|
||||||
@@ -159,13 +208,6 @@ export const submitFeedback = async (slug: string, body: SubmissionRequestBody,
|
|||||||
|
|
||||||
const answerRows = validateAnswers(body.answers || [], questionsById, songTitleById);
|
const answerRows = validateAnswers(body.answers || [], questionsById, songTitleById);
|
||||||
const guestBook = validateGuestBook(body.guestBook);
|
const guestBook = validateGuestBook(body.guestBook);
|
||||||
const newsletter = validateNewsletter(body.newsletter);
|
|
||||||
// body.newsletter is only sent at all when the visitor had the opt-in
|
|
||||||
// checkbox on (see FeedbackForm.tsx), so a present-but-invalid block
|
|
||||||
// (e.g. a mistyped email) is distinguishable from "didn't opt in" - the
|
|
||||||
// rest of the submission still saves, but the client can tell the
|
|
||||||
// visitor their newsletter signup specifically didn't go through.
|
|
||||||
const newsletterDropped = !!body.newsletter && !newsletter;
|
|
||||||
|
|
||||||
if (answerRows.length === 0 && !guestBook && !newsletter) {
|
if (answerRows.length === 0 && !guestBook && !newsletter) {
|
||||||
return {status: 'EMPTY'};
|
return {status: 'EMPTY'};
|
||||||
@@ -175,8 +217,8 @@ export const submitFeedback = async (slug: string, body: SubmissionRequestBody,
|
|||||||
try {
|
try {
|
||||||
await conn.beginTransaction();
|
await conn.beginTransaction();
|
||||||
|
|
||||||
const subQuery = 'INSERT INTO submissions (event_id, ip_hash, has_guestbook, has_newsletter) VALUES (?,?,?,?) RETURNING submission_id';
|
const subQuery = 'INSERT INTO submissions (event_id, ip_hash, has_guestbook, has_newsletter, client_token) VALUES (?,?,?,?,?) RETURNING submission_id';
|
||||||
const subRes = await conn.query(subQuery, [eventId, ipHash, guestBook ? 1 : 0, newsletter ? 1 : 0]);
|
const subRes = await conn.query(subQuery, [eventId, ipHash, guestBook ? 1 : 0, newsletter ? 1 : 0, clientToken]);
|
||||||
const submissionId = subRes[0].submission_id;
|
const submissionId = subRes[0].submission_id;
|
||||||
|
|
||||||
for (const row of answerRows) {
|
for (const row of answerRows) {
|
||||||
@@ -220,8 +262,16 @@ export const submitFeedback = async (slug: string, body: SubmissionRequestBody,
|
|||||||
}
|
}
|
||||||
|
|
||||||
return {status: 'OK', submissionId, newsletterDropped};
|
return {status: 'OK', submissionId, newsletterDropped};
|
||||||
} catch (err) {
|
} catch (err: any) {
|
||||||
await conn.rollback();
|
await conn.rollback();
|
||||||
|
// Two copies of the same retry both got past the lookup above; the
|
||||||
|
// unique index on (event_id, client_token) let only one of them commit.
|
||||||
|
if (clientToken && err?.code === 'ER_DUP_ENTRY') {
|
||||||
|
const existingId = await findSubmissionIdByClientToken(clientToken, slug);
|
||||||
|
if (existingId !== null) {
|
||||||
|
return {status: 'OK', submissionId: existingId, newsletterDropped};
|
||||||
|
}
|
||||||
|
}
|
||||||
throw err;
|
throw err;
|
||||||
} finally {
|
} finally {
|
||||||
await conn.end();
|
await conn.end();
|
||||||
|
|||||||
@@ -0,0 +1,143 @@
|
|||||||
|
import {vi, describe, it, expect, beforeEach, type Mock} from 'vitest';
|
||||||
|
vi.mock('../../src/models/feedback/Feedback.db.js', () => ({
|
||||||
|
NachklangFeedbackDB: {getConnection: vi.fn()}
|
||||||
|
}));
|
||||||
|
vi.mock('../../src/models/feedback/public/events.public.service.js', () => ({
|
||||||
|
getEventConfigBySlug: vi.fn()
|
||||||
|
}));
|
||||||
|
vi.mock('../../src/models/feedback/integrations/salesforce.service.js', () => ({
|
||||||
|
syncNewsletterSignup: vi.fn().mockResolvedValue(undefined)
|
||||||
|
}));
|
||||||
|
vi.mock('../../src/middleware/logger.js', () => ({
|
||||||
|
__esModule: true,
|
||||||
|
default: {info: vi.fn(), error: vi.fn()}
|
||||||
|
}));
|
||||||
|
|
||||||
|
import {NachklangFeedbackDB} from '../../src/models/feedback/Feedback.db.js';
|
||||||
|
import {getEventConfigBySlug} from '../../src/models/feedback/public/events.public.service.js';
|
||||||
|
import {submitFeedback} from '../../src/models/feedback/public/submissions.service.js';
|
||||||
|
|
||||||
|
const mockGetConnection = NachklangFeedbackDB.getConnection as Mock;
|
||||||
|
const mockGetEventConfigBySlug = getEventConfigBySlug as Mock;
|
||||||
|
|
||||||
|
const TOKEN = '3f2b8c1e-4d5a-4b6c-9e7f-0a1b2c3d4e5f';
|
||||||
|
const BODY = {answers: [{eventQuestionId: 26, text: 'Danke!'}], clientToken: TOKEN};
|
||||||
|
|
||||||
|
const SLUG = 'sommerkonzert-2026';
|
||||||
|
const LOOKUP_SQL = 'SELECT s.submission_id FROM submissions s';
|
||||||
|
|
||||||
|
// One fake connection serves every query; `existingId` is what a lookup by
|
||||||
|
// client_token finds when it was stored for `existingSlug`, and
|
||||||
|
// `insertError` makes the submissions INSERT throw.
|
||||||
|
const makeConn = ({existingId = null, existingSlug = SLUG, insertError = null}: {existingId?: number | null; existingSlug?: string; insertError?: any} = {}) => ({
|
||||||
|
query: vi.fn(async (sql: string, params: any[] = []) => {
|
||||||
|
if (sql.startsWith(LOOKUP_SQL)) {
|
||||||
|
return existingId === null || params[1] !== existingSlug ? [] : [{submission_id: existingId}];
|
||||||
|
}
|
||||||
|
if (sql.startsWith('INSERT INTO submissions')) {
|
||||||
|
if (insertError) throw insertError;
|
||||||
|
return [{submission_id: 90}];
|
||||||
|
}
|
||||||
|
return [];
|
||||||
|
}),
|
||||||
|
beginTransaction: vi.fn().mockResolvedValue(undefined),
|
||||||
|
commit: vi.fn().mockResolvedValue(undefined),
|
||||||
|
rollback: vi.fn().mockResolvedValue(undefined),
|
||||||
|
end: vi.fn().mockResolvedValue(undefined)
|
||||||
|
});
|
||||||
|
|
||||||
|
const allQueries = (conn: ReturnType<typeof makeConn>): [string, any[]][] => conn.query.mock.calls as any;
|
||||||
|
|
||||||
|
describe('submitFeedback - client token idempotency', () => {
|
||||||
|
beforeEach(() => {
|
||||||
|
mockGetConnection.mockReset();
|
||||||
|
mockGetEventConfigBySlug.mockReset();
|
||||||
|
mockGetEventConfigBySlug.mockResolvedValue({
|
||||||
|
status: 'OK',
|
||||||
|
eventId: 22,
|
||||||
|
event: {
|
||||||
|
questions: [{eventQuestionId: 26, questionId: 4, type: 'FREE_TEXT', label: 'Sonstiges', position: 0}],
|
||||||
|
songs: []
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('returns the already-saved submission for a repeated token without inserting again', async () => {
|
||||||
|
const conn = makeConn({existingId: 82});
|
||||||
|
mockGetConnection.mockResolvedValue(conn);
|
||||||
|
|
||||||
|
const result = await submitFeedback('sommerkonzert-2026', BODY, 'hash');
|
||||||
|
|
||||||
|
expect(result).toEqual({status: 'OK', submissionId: 82, newsletterDropped: false});
|
||||||
|
expect(allQueries(conn).some(([sql]) => sql.startsWith('INSERT'))).toBe(false);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('still answers a retry with the saved submission after the feedback window closed', async () => {
|
||||||
|
mockGetConnection.mockResolvedValue(makeConn({existingId: 82}));
|
||||||
|
mockGetEventConfigBySlug.mockResolvedValue({status: 'CLOSED'});
|
||||||
|
|
||||||
|
const result = await submitFeedback('sommerkonzert-2026', BODY, 'hash');
|
||||||
|
|
||||||
|
expect(result).toEqual({status: 'OK', submissionId: 82, newsletterDropped: false});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('stores a new token, lowercased, on the submissions row', async () => {
|
||||||
|
const conn = makeConn();
|
||||||
|
mockGetConnection.mockResolvedValue(conn);
|
||||||
|
|
||||||
|
const result = await submitFeedback('sommerkonzert-2026', {...BODY, clientToken: TOKEN.toUpperCase()}, 'hash');
|
||||||
|
|
||||||
|
expect(result).toEqual({status: 'OK', submissionId: 90, newsletterDropped: false});
|
||||||
|
const insert = allQueries(conn).find(([sql]) => sql.startsWith('INSERT INTO submissions'))!;
|
||||||
|
expect(insert[1]).toContain(TOKEN);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('saves a new submission when the token was only ever used for a different event', async () => {
|
||||||
|
// Same browser tab, two concerts: the token must not make the second
|
||||||
|
// event's feedback come back as the first event's submission.
|
||||||
|
const conn = makeConn({existingId: 82, existingSlug: 'winterkonzert-2026'});
|
||||||
|
mockGetConnection.mockResolvedValue(conn);
|
||||||
|
|
||||||
|
const result = await submitFeedback(SLUG, BODY, 'hash');
|
||||||
|
|
||||||
|
expect(result).toEqual({status: 'OK', submissionId: 90, newsletterDropped: false});
|
||||||
|
expect(allQueries(conn).find(([sql]) => sql.startsWith(LOOKUP_SQL))![1]).toEqual([TOKEN, SLUG]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('ignores a malformed token: no lookup, and the row is stored without one', async () => {
|
||||||
|
const conn = makeConn();
|
||||||
|
mockGetConnection.mockResolvedValue(conn);
|
||||||
|
|
||||||
|
await submitFeedback('sommerkonzert-2026', {...BODY, clientToken: 'not-a-uuid'}, 'hash');
|
||||||
|
|
||||||
|
expect(allQueries(conn).some(([sql]) => sql.startsWith(LOOKUP_SQL))).toBe(false);
|
||||||
|
const insert = allQueries(conn).find(([sql]) => sql.startsWith('INSERT INTO submissions'))!;
|
||||||
|
expect(insert[1]).not.toContain('not-a-uuid');
|
||||||
|
expect(insert[1][insert[1].length - 1]).toBeNull();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('resolves a concurrent duplicate that loses the race on the unique index to the winning submission', async () => {
|
||||||
|
const dupError = Object.assign(new Error('Duplicate entry'), {code: 'ER_DUP_ENTRY', errno: 1062});
|
||||||
|
const racingConn = makeConn({insertError: dupError});
|
||||||
|
// First lookup (before the INSERT) finds nothing; the one after the
|
||||||
|
// duplicate-key error finds the row the other request committed.
|
||||||
|
const lookupAfterRace = makeConn({existingId: 83});
|
||||||
|
mockGetConnection
|
||||||
|
.mockResolvedValueOnce(makeConn())
|
||||||
|
.mockResolvedValueOnce(racingConn)
|
||||||
|
.mockResolvedValueOnce(lookupAfterRace);
|
||||||
|
|
||||||
|
const result = await submitFeedback('sommerkonzert-2026', BODY, 'hash');
|
||||||
|
|
||||||
|
expect(result).toEqual({status: 'OK', submissionId: 83, newsletterDropped: false});
|
||||||
|
expect(racingConn.rollback).toHaveBeenCalled();
|
||||||
|
expect(racingConn.commit).not.toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('rethrows a duplicate-key error when the request carried no token', async () => {
|
||||||
|
const dupError = Object.assign(new Error('Duplicate entry'), {code: 'ER_DUP_ENTRY', errno: 1062});
|
||||||
|
mockGetConnection.mockResolvedValue(makeConn({insertError: dupError}));
|
||||||
|
|
||||||
|
await expect(submitFeedback('sommerkonzert-2026', {answers: BODY.answers}, 'hash')).rejects.toThrow('Duplicate entry');
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -14,10 +14,6 @@ export default defineConfig({
|
|||||||
env: {
|
env: {
|
||||||
FEEDBACK_IP_SALT: 'vitest-salt'
|
FEEDBACK_IP_SALT: 'vitest-salt'
|
||||||
},
|
},
|
||||||
reporters: [
|
|
||||||
'default',
|
|
||||||
['vitest-sonar-reporter', {outputFile: 'testResults/sonar-report.xml'}]
|
|
||||||
],
|
|
||||||
coverage: {
|
coverage: {
|
||||||
provider: 'v8',
|
provider: 'v8',
|
||||||
reporter: ['text-summary', 'lcov'],
|
reporter: ['text-summary', 'lcov'],
|
||||||
|
|||||||
Reference in new issue
Block a user