@stamhoofd/backend 2.137.0 → 2.137.2

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stamhoofd/backend",
-    "version": "2.137.0",
+    "version": "2.137.2",
     "type": "module",
     "main": "./dist/index.js",
     "exports": {
@@ -51,29 +51,29 @@
         "@aws-sdk/client-sesv2": "3.1090.0",
         "@aws-sdk/client-sqs": "3.1090.0",
         "@aws-sdk/s3-request-presigner": "3.1090.0",
-        "@bwip-js/node": "4.11.1",
+        "@bwip-js/node": "4.11.2",
         "@mollie/api-client": "4.6.0",
         "@simonbackx/simple-database": "1.37.1",
         "@simonbackx/simple-encoding": "2.26.11",
         "@simonbackx/simple-endpoints": "1.21.1",
         "@simonbackx/simple-errors": "1.5.0",
         "@simonbackx/simple-logging": "1.0.1",
-        "@stamhoofd/backend-env": "2.137.0",
-        "@stamhoofd/backend-i18n": "2.137.0",
-        "@stamhoofd/backend-middleware": "2.137.0",
-        "@stamhoofd/crons": "2.137.0",
-        "@stamhoofd/email": "2.137.0",
-        "@stamhoofd/excel-writer": "2.137.0",
-        "@stamhoofd/logging": "2.137.0",
-        "@stamhoofd/models": "2.137.0",
-        "@stamhoofd/object-differ": "2.137.0",
-        "@stamhoofd/queues": "2.137.0",
-        "@stamhoofd/sql": "2.137.0",
-        "@stamhoofd/structures": "2.137.0",
-        "@stamhoofd/types": "2.137.0",
-        "@stamhoofd/utility": "2.137.0",
+        "@stamhoofd/backend-env": "2.137.2",
+        "@stamhoofd/backend-i18n": "2.137.2",
+        "@stamhoofd/backend-middleware": "2.137.2",
+        "@stamhoofd/crons": "2.137.2",
+        "@stamhoofd/email": "2.137.2",
+        "@stamhoofd/excel-writer": "2.137.2",
+        "@stamhoofd/logging": "2.137.2",
+        "@stamhoofd/models": "2.137.2",
+        "@stamhoofd/object-differ": "2.137.2",
+        "@stamhoofd/queues": "2.137.2",
+        "@stamhoofd/sql": "2.137.2",
+        "@stamhoofd/structures": "2.137.2",
+        "@stamhoofd/types": "2.137.2",
+        "@stamhoofd/utility": "2.137.2",
         "archiver": "7.0.1",
-        "axios": "1.18.0",
+        "axios": "1.18.1",
         "base-x": "3.0.11",
         "chalk": "5.6.2",
         "cookie": "0.7.2",
@@ -82,31 +82,31 @@
         "jose": "5.10.0",
         "jsonwebtoken": "9.0.3",
         "jsvat-next": "3.0.4",
-        "libphonenumber-js": "1.13.6",
+        "libphonenumber-js": "1.13.9",
         "luxon": "3.7.2",
-        "mailparser": "3.9.9",
+        "mailparser": "3.9.14",
         "mockdate": "3.0.5",
         "mysql2": "3.23.1",
         "node-rsa": "2.0.0",
         "openid-client": "5.7.1",
         "stripe": "16.12.0",
-        "uuid": "14.0.0"
+        "uuid": "14.0.1"
     },
     "devDependencies": {
-        "@stamhoofd/test-utils": "2.137.0",
+        "@stamhoofd/test-utils": "2.137.2",
         "@types/cookie": "0.6.0",
-        "@types/luxon": "3.7.1",
+        "@types/luxon": "3.7.2",
         "@types/mailparser": "3.4.6",
         "@types/node": "22.20.1",
         "@types/uuid": "8.3.4",
-        "nock": "14.0.15",
-        "qs": "6.15.2",
+        "nock": "14.0.16",
+        "qs": "6.15.3",
         "sinon": "18.0.1",
-        "vitest": "4.1.8"
+        "vitest": "4.1.10"
     },
     "license": "UNLICENCED",
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "f327bce84bd0c5ca7160e3e71ad03700d520b086"
+    "gitHead": "e0a970fd52c4f5a57f1e5a41cf40940859277ddf"
 }

package/src/endpoints/organization/dashboard/invoices/GetInvoicesEndpoint.ts

@@ -187,16 +187,6 @@ export class GetInvoicesEndpoint extends Endpoint<Params, Query, Body, ResponseB
             }
         }
 
-        for (const invoice of invoices) {
-            if (invoice.number && !invoice.pdf && STAMHOOFD.environment === 'development') {
-                await InvoicePdfService.generatePdf(invoice);
-            }
-
-            if (invoice.number && STAMHOOFD.environment === 'development') {
-                await InvoiceXMlService.generateXml(invoice);
-            }
-        }
-
         return new PaginatedResponse<InvoiceStruct[], LimitedFilteredRequest>({
             results: await AuthenticatedStructures.invoices(invoices, true),
             next,

package/src/endpoints/organization/dashboard/invoices/PatchInvoicesEndpoint.ts

@@ -57,6 +57,24 @@ export class PatchInvoicesEndpoint extends Endpoint<Params, Query, Body, Respons
             invoices.push(model);
         }
 
+        for (const patch of request.body.getPatches()) {
+            const model = await Invoice.getByID(patch.id);
+            if (!model || model.organizationId !== organization.id) {
+                throw Context.auth.notFoundOrNoAccess($t('%ZcE'));
+            }
+
+            if (!model.number) {
+                // ignore
+                continue;
+            }
+
+            // Create PDF
+            if (patch.pdf === null) {
+                await InvoiceService.retryInvoiceGenerationAndSending(model);
+            }
+            invoices.push(model);
+        }
+
         for (const id of request.body.getDeletes()) {
             const model = await Invoice.getByID(id);
             if (!model || model.organizationId !== organization.id) {

package/src/services/InvoicePdfService.ts

@@ -258,26 +258,62 @@ export class InvoicePdfService {
         const timeout = setTimeout(() => controller.abort(), 30_000);
 
         try {
-            // Issue with system trusted CA in development
-            const result = await fetch((STAMHOOFD.environment === 'development' ? 'http://' : 'https://') + STAMHOOFD.domains.rendererApi + '/v' + Version + '/html-to-pdf', {
-                method: 'POST',
-                body: form,
-                signal: controller.signal,
-            });
-            if (result.status === 200) {
-                // todo
-                const buffer = Buffer.from(await result.arrayBuffer());
-                const file = await this.uploadPdf(invoice, buffer);
+            if (STAMHOOFD.environment === 'test') {
+                const file = new File({
+                    id: uuidv4(),
+                    server: 'https://' + STAMHOOFD.SPACES_BUCKET + '.' + STAMHOOFD.SPACES_ENDPOINT,
+                    path: 'test.pdf',
+                    size: 0,
+                    name: (invoice.number ?? invoice.id),
+                    isPrivate: false,
+                    contentType: 'application/pdf',
+                });
                 invoice.pdf = file;
                 await invoice.save();
             } else {
+            // Issue with system trusted CA in development
+                const result = await fetch((STAMHOOFD.environment === 'development' ? 'http://' : 'https://') + STAMHOOFD.domains.rendererApi + '/v' + Version + '/html-to-pdf', {
+                    method: 'POST',
+                    body: form,
+                    signal: controller.signal,
+                });
+                if (result.status === 200) {
                 // todo
+                    const buffer = Buffer.from(await result.arrayBuffer());
+                    const file = await this.uploadPdf(invoice, buffer);
+                    invoice.pdf = file;
+                    await invoice.save();
+                } else {
+                    let txt = '';
+                    try {
+                        txt = await result.text();
+                    } catch (e) {
+                        txt = '<unreadable stream>';
+                        console.error('Could not read response', e);
+                    }
+                    console.error('Failed to generate invoice PDF. Non 200 statuscode: ', result.status, txt);
+                    throw new SimpleError({
+                        code: 'pdf_creation_timeout',
+                        message: 'Failed to generate invoice PDF',
+                        human: $t('Er ging iets mis bij het aanmaken van de factuur'),
+                    });
+                }
             }
         } catch (err) {
+            console.error('Failed to generate invoice PDF', err);
+
             if (err instanceof DOMException && err.name === 'AbortError') {
-                throw new Error('Request timed out after 30s');
+                throw new SimpleError({
+                    code: 'pdf_creation_timeout',
+                    message: 'Failed to generate invoice PDF: timeout',
+                    human: $t('Er ging iets mis bij het aanmaken van de factuur'),
+                });
             }
-            console.error(err);
+            throw new SimpleError({
+                code: 'pdf_creation_failed',
+                message: 'Failed to generate invoice PDF',
+                human: $t('Er ging iets mis bij het aanmaken van de factuur'),
+            });
         } finally {
             clearTimeout(timeout);
         }

package/src/services/InvoiceService.ts

@@ -302,6 +302,28 @@ export class InvoiceService {
         return model;
     }
 
+    static async retryInvoiceGenerationAndSending(model: Invoice) {
+        const hadPdf = !!model.pdf;
+        if (!model.pdf) {
+            // Create PDF
+            await InvoicePdfService.generatePdf(model);
+        }
+
+        if (!model.xml) {
+            await InvoiceXMlService.generateXml(model);
+        }
+
+        const organization = await Organization.getByID(model.organizationId);
+        if (!organization) {
+            console.error('Unexpected missing organization for ' + model.id);
+            return;
+        }
+
+        if (!await this.forwardInvoice(model, organization) && !model.didSendPeppol && !hadPdf) {
+            await this.sendCustomerEmail(model, organization);
+        }
+    }
+
     /**
      * Permanently delete an invoice.
      *

package/src/services/MollieService.ts

@@ -250,11 +250,11 @@ export class MollieService {
 
             details: PaymentMandateDetails.create({
                 name: ('consumerName' in details ? details.consumerName : details.cardHolder) ?? undefined,
-                cardNumber: 'cardNumber' in details ? details.cardNumber : null,
-                iban: 'consumerAccount' in details ? Formatter.iban(details.consumerAccount) : null,
-                bic: ('consumerBic' in details ? details.consumerBic : undefined),
-                expiryDate: ('cardExpiryDate' in details ? DateTime.fromISO(details.cardExpiryDate, { zone: Formatter.timezone }).toJSDate() : null), // todo: parse date correctly in Brussels timezone!
-                brand: ('cardLabel' in details ? details.cardLabel : null),
+                cardNumber: 'cardNumber' in details && details.cardNumber ? details.cardNumber : null,
+                iban: 'consumerAccount' in details && details.consumerAccount ? Formatter.iban(details.consumerAccount) : null,
+                bic: ('consumerBic' in details && details.consumerBic ? details.consumerBic : undefined),
+                expiryDate: ('cardExpiryDate' in details && details.cardExpiryDate ? DateTime.fromISO(details.cardExpiryDate, { zone: Formatter.timezone }).toJSDate() : null), // todo: parse date correctly in Brussels timezone!
+                brand: ('cardLabel' in details && details.cardLabel ? details.cardLabel : null),
             }),
         });
     }

package/src/sql-filters/members.ts

@@ -522,7 +522,9 @@ export const memberFilterCompilers: SQLFilterDefinitions = {
                         throw new SimpleError({
                             code: 'permission_denied',
                             message: 'No permissions to filter on record ' + key,
-                            human: result.record ? $t(`%1Bc`, { recordName: result.record.name }) : $t(`Je hebt niet voldoende toegangsrechten om te filteren op dit gegevensveld`),
+                            human: result.record
+                                ? $t(`%1Bc`, { recordName: result.record.name })
+                                : $t(`%Zg6`),
                             statusCode: 400,
                         });
                     }