matthias/dashboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
Matthias Hochmeister
2026-03-13 13:29:21 +01:00
parent 1d5122a2cd
commit e36de3199a
1 changed files with 51 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
sync/src/db.ts
View File

@@ -61,6 +61,7 @@ export async function syncToDatabase(
await client.query('BEGIN');
let updated = 0;
let unchanged = 0;
let skipped = 0;
for (const member of members) {
@@ -109,6 +110,23 @@ export async function syncToDatabase(
continue;
}
// Fetch current values to detect what actually changed
const currentResult = await client.query<{
status: string;
dienstgrad: string | null;
eintrittsdatum: string | null;
austrittsdatum: string | null;
geburtsdatum: string | null;
}>(
`SELECT status, dienstgrad,
to_char(eintrittsdatum, 'YYYY-MM-DD') AS eintrittsdatum,
to_char(austrittsdatum, 'YYYY-MM-DD') AS austrittsdatum,
to_char(geburtsdatum, 'YYYY-MM-DD') AS geburtsdatum
FROM mitglieder_profile WHERE user_id = $1`,
[userId]
);
const cur = currentResult.rows[0];
// Update mitglieder_profile with FDISK data
const dienstgrad = mapDienstgrad(member.dienstgrad);
@@ -127,13 +145,32 @@ export async function syncToDatabase(
: [member.standesbuchNr, member.status, member.eintrittsdatum, member.abmeldedatum, member.geburtsdatum, userId]
);
updated++;
// Detect and log what changed
const changes: string[] = [];
if (cur) {
if (cur.status !== member.status)
changes.push(`Status ${cur.status}→${member.status}`);
if (dienstgrad && cur.dienstgrad !== dienstgrad)
changes.push(`Dienstgrad ${cur.dienstgrad ?? '—'}→${dienstgrad}`);
if (member.eintrittsdatum && cur.eintrittsdatum !== member.eintrittsdatum)
changes.push(`Eintrittsdatum ${cur.eintrittsdatum ?? '—'}→${member.eintrittsdatum}`);
if (cur.austrittsdatum !== (member.abmeldedatum ?? null))
changes.push(`Austrittsdatum ${cur.austrittsdatum ?? '—'}→${member.abmeldedatum ?? '—'}`);
}
log(`Members: ${updated} updated, ${skipped} skipped (no dashboard account)`);
if (changes.length > 0) {
log(`Updated ${member.vorname} ${member.zuname} (${member.standesbuchNr}): ${changes.join(', ')}`);
updated++;
} else {
unchanged++;
}
}
log(`Members: ${updated} changed, ${unchanged} unchanged, ${skipped} skipped (no dashboard account)`);
// Upsert Ausbildungen
let ausbildungUpserted = 0;
let ausbildungNew = 0;
let ausbildungUpdated = 0;
let ausbildungSkipped = 0;
for (const ausb of ausbildungen) {
@@ -150,7 +187,8 @@ export async function syncToDatabase(
const userId = result.rows[0].user_id;
await client.query(
// xmax = 0 means a fresh INSERT (not an update of an existing row)
const upsertResult = await client.query<{ was_inserted: boolean }>(
`INSERT INTO ausbildung (user_id, kursname, kurs_datum, ablaufdatum, ort, bemerkung, fdisk_sync_key)
VALUES ($1, $2, $3::date, $4::date, $5, $6, $7)
ON CONFLICT (user_id, fdisk_sync_key) DO UPDATE SET
@@ -159,15 +197,21 @@ export async function syncToDatabase(
ablaufdatum = EXCLUDED.ablaufdatum,
ort = EXCLUDED.ort,
bemerkung = EXCLUDED.bemerkung,
updated_at = NOW()`,
updated_at = NOW()
RETURNING (xmax = 0) AS was_inserted`,
[userId, ausb.kursname, ausb.kursDatum, ausb.ablaufdatum, ausb.ort, ausb.bemerkung, ausb.syncKey]
);
ausbildungUpserted++;
if (upsertResult.rows[0]?.was_inserted) {
log(`New Ausbildung: ${ausb.standesbuchNr} — ${ausb.kursname}${ausb.kursDatum ? ` (${ausb.kursDatum})` : ''}`);
ausbildungNew++;
} else {
ausbildungUpdated++;
}
}
await client.query('COMMIT');
log(`Ausbildungen: ${ausbildungUpserted} upserted, ${ausbildungSkipped} skipped`);
log(`Ausbildungen: ${ausbildungNew} neu, ${ausbildungUpdated} unverändert, ${ausbildungSkipped} übersprungen`);
} catch (err) {
await client.query('ROLLBACK');
throw err;