diff --git a/src/api/controllers/batch-controller.js b/src/api/controllers/batch-controller.js index 4153abf..8b4b3e9 100644 --- a/src/api/controllers/batch-controller.js +++ b/src/api/controllers/batch-controller.js @@ -96,8 +96,8 @@ async function buendleZugang(clientId, subs, label, zeitSuffix) { } /** Bündelt alle offenen Datensätze (optional nur ein Zugang), gruppiert je Zugang. */ -async function buendleAlle({ clientId = null, label, zeitSuffix = '' }) { - const alle = await fetchBatchPending(clientId); +async function buendleAlle({ clientId = null, ids = null, label, zeitSuffix = '' }) { + const alle = await fetchBatchPending(clientId, ids); const proZugang = new Map(); for (const s of alle) { const k = String(s.api_client); @@ -117,12 +117,13 @@ async function buendleAlle({ clientId = null, label, zeitSuffix = '' }) { async function buildBundles(req, res) { try { const clientId = (req.body && req.body.client_id != null && String(req.body.client_id).trim()) ? String(req.body.client_id).trim() : null; + const ids = (req.body && Array.isArray(req.body.ids) && req.body.ids.length) ? req.body.ids : null; const label = (req.body && req.body.label) ? String(req.body.label) : berlinParts().date; // Manuelle Bündelung mit Uhrzeit-Suffix, damit sie den Cron-Tageslauf (nur Datum) nicht überschreibt. const zeitSuffix = (req.body && req.body.time_suffix !== undefined) ? String(req.body.time_suffix) : `${String(berlinParts().hour).padStart(2, '0')}${String(berlinParts().minute).padStart(2, '0')}`; - const ergebnis = await buendleAlle({ clientId, label, zeitSuffix }); + const ergebnis = await buendleAlle({ clientId, ids, label, zeitSuffix }); return res.json({ ok: true, bundles: ergebnis }); } catch (err) { console.error('[batch] build fehlgeschlagen:', err); diff --git a/src/services/directus-service.js b/src/services/directus-service.js index fdb7653..eb9a046 100644 --- a/src/services/directus-service.js +++ b/src/services/directus-service.js @@ -112,9 +112,10 @@ async function fetchRenderFormats() { /** Offene (pending) Batch-Übermittlungen MIT Druck-PDF, optional je Zugang. * Text-only-Datensätze (ohne PDF) werden bewusst NICHT gebündelt. */ -async function fetchBatchPending(clientId) { - const filter = 'filter[status][_eq]=pending&filter[pdf_file][_nnull]=true' - + (clientId != null ? `&filter[api_client][_eq]=${encodeURIComponent(clientId)}` : ''); +async function fetchBatchPending(clientId, ids) { + let filter = 'filter[status][_eq]=pending&filter[pdf_file][_nnull]=true'; + if (clientId != null) filter += `&filter[api_client][_eq]=${encodeURIComponent(clientId)}`; + if (Array.isArray(ids) && ids.length) filter += `&filter[id][_in]=${ids.map(encodeURIComponent).join(',')}`; const fields = 'id,api_client,firma,vorname,nachname,zeile1,zeile2,zeile3,plz,stadt,land,pdf_file'; return (await directusFetch(`/items/batch_submissions?${filter}&sort=date_created&limit=-1&fields=${fields}`)) || []; }