@stamhoofd/models 2.79.7 → 2.80.0

package/dist/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"root":["../src/index.ts","../src/factories/addressfactory.ts","../src/factories/balanceitemfactory.ts","../src/factories/emergencycontactfactory.ts","../src/factories/groupfactory.ts","../src/factories/memberfactory.ts","../src/factories/memberresponsibilityrecordfactory.ts","../src/factories/organizationfactory.ts","../src/factories/organizationregistrationperiodfactory.ts","../src/factories/organizationtagfactory.ts","../src/factories/parentfactory.ts","../src/factories/platformresponsibilityfactory.ts","../src/factories/recordfactory.ts","../src/factories/registercodefactory.ts","../src/factories/registrationfactory.ts","../src/factories/registrationperiodfactory.ts","../src/factories/userfactory.ts","../src/factories/webshopfactory.ts","../src/factories/index.ts","../src/helpers/dnsvalidator.ts","../src/helpers/emailbuilder.ts","../src/helpers/groupbuilder.ts","../src/helpers/handlebars.ts","../src/helpers/membermerger.test.ts","../src/helpers/membermerger.ts","../src/helpers/ratelimiter.ts","../src/helpers/webshopcounter.ts","../src/migrations/1605262045-import-postcodes.ts","../src/migrations/1605262046-import-postcodes-nl.ts","../src/models/auditlog.ts","../src/models/balanceitem.ts","../src/models/balanceitempayment.ts","../src/models/buckaroopayment.ts","../src/models/cachedbalance.ts","../src/models/document.ts","../src/models/documenttemplate.ts","../src/models/email.test.ts","../src/models/email.ts","../src/models/emailrecipient.ts","../src/models/emailtemplate.ts","../src/models/emailverificationcode.ts","../src/models/event.ts","../src/models/eventnotification.ts","../src/models/group.ts","../src/models/image.ts","../src/models/member.ts","../src/models/memberplatformmembership.ts","../src/models/memberresponsibilityrecord.ts","../src/models/memberuser.ts","../src/models/mergedmember.ts","../src/models/molliepayment.ts","../src/models/mollietoken.ts","../src/models/onetimetoken.ts","../src/models/order.ts","../src/models/organization.ts","../src/models/organizationregistrationperiod.ts","../src/models/passwordtoken.ts","../src/models/payconiqpayment.ts","../src/models/payment.ts","../src/models/platform.test.ts","../src/models/platform.ts","../src/models/registercode.ts","../src/models/registration.ts","../src/models/registrationperiod.ts","../src/models/stcredit.ts","../src/models/stinvoice.ts","../src/models/stpackage.ts","../src/models/stpendinginvoice.ts","../src/models/stripeaccount.ts","../src/models/stripecheckoutsession.ts","../src/models/stripepaymentintent.ts","../src/models/ticket.ts","../src/models/token.test.ts","../src/models/token.ts","../src/models/usedregistercode.ts","../src/models/user.ts","../src/models/userpermissions.ts","../src/models/webshop.ts","../src/models/webshopdiscountcode.ts","../src/models/index.ts","../src/models/addresses/city.ts","../src/models/addresses/postalcode.test.ts","../src/models/addresses/postalcode.ts","../src/models/addresses/province.ts","../src/models/addresses/street.ts","../src/structures/organizationservermetadata.ts","../tests/jest.global.setup.ts","../tests/jest.setup.ts","../../../../environment.d.ts","../../../../jest-extended.d.ts","../../../stamhoofd.d.ts"],"version":"5.6.2"}
+{"root":["../src/index.ts","../src/factories/addressfactory.ts","../src/factories/balanceitemfactory.ts","../src/factories/emailtemplatefactory.ts","../src/factories/emergencycontactfactory.ts","../src/factories/eventfactory.ts","../src/factories/eventnotificationfactory.ts","../src/factories/eventnotificationtypefactory.ts","../src/factories/groupfactory.ts","../src/factories/memberfactory.ts","../src/factories/memberresponsibilityrecordfactory.ts","../src/factories/organizationfactory.ts","../src/factories/organizationregistrationperiodfactory.ts","../src/factories/organizationtagfactory.ts","../src/factories/parentfactory.ts","../src/factories/platformeventtypefactory.ts","../src/factories/platformresponsibilityfactory.ts","../src/factories/recordanswerfactory.ts","../src/factories/recordcategoryfactory.ts","../src/factories/recordfactory.ts","../src/factories/registercodefactory.ts","../src/factories/registrationfactory.ts","../src/factories/registrationperiodfactory.ts","../src/factories/userfactory.ts","../src/factories/webshopfactory.ts","../src/factories/index.ts","../src/helpers/dnsvalidator.ts","../src/helpers/emailbuilder.ts","../src/helpers/groupbuilder.ts","../src/helpers/handlebars.ts","../src/helpers/membermerger.test.ts","../src/helpers/membermerger.ts","../src/helpers/ratelimiter.ts","../src/helpers/webshopcounter.ts","../src/migrations/1605262045-import-postcodes.ts","../src/migrations/1605262046-import-postcodes-nl.ts","../src/models/auditlog.ts","../src/models/balanceitem.ts","../src/models/balanceitempayment.ts","../src/models/buckaroopayment.ts","../src/models/cachedbalance.ts","../src/models/document.ts","../src/models/documenttemplate.ts","../src/models/email.test.ts","../src/models/email.ts","../src/models/emailrecipient.ts","../src/models/emailtemplate.ts","../src/models/emailverificationcode.ts","../src/models/event.ts","../src/models/eventnotification.ts","../src/models/group.ts","../src/models/image.ts","../src/models/member.ts","../src/models/memberplatformmembership.ts","../src/models/memberresponsibilityrecord.ts","../src/models/memberuser.ts","../src/models/mergedmember.ts","../src/models/molliepayment.ts","../src/models/mollietoken.ts","../src/models/onetimetoken.ts","../src/models/order.ts","../src/models/organization.ts","../src/models/organizationregistrationperiod.ts","../src/models/passwordtoken.ts","../src/models/payconiqpayment.ts","../src/models/payment.ts","../src/models/platform.test.ts","../src/models/platform.ts","../src/models/registercode.ts","../src/models/registration.ts","../src/models/registrationperiod.ts","../src/models/stcredit.ts","../src/models/stinvoice.ts","../src/models/stpackage.ts","../src/models/stpendinginvoice.ts","../src/models/stripeaccount.ts","../src/models/stripecheckoutsession.ts","../src/models/stripepaymentintent.ts","../src/models/ticket.ts","../src/models/token.test.ts","../src/models/token.ts","../src/models/usedregistercode.ts","../src/models/user.ts","../src/models/userpermissions.ts","../src/models/webshop.ts","../src/models/webshopdiscountcode.ts","../src/models/index.ts","../src/models/addresses/city.ts","../src/models/addresses/postalcode.test.ts","../src/models/addresses/postalcode.ts","../src/models/addresses/province.ts","../src/models/addresses/street.ts","../src/structures/organizationservermetadata.ts","../tests/jest.global.setup.ts","../tests/jest.setup.ts","../../../../environment.d.ts","../../../../jest-extended.d.ts","../../../stamhoofd.d.ts"],"version":"5.6.2"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stamhoofd/models",
-    "version": "2.79.7",
+    "version": "2.80.0",
     "main": "./dist/src/index.js",
     "types": "./dist/src/index.d.ts",
     "license": "UNLICENCED",
@@ -30,5 +30,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "d8675cbc91c2fcdcc6bbd3b3925ccd8063b15522"
+    "gitHead": "252faf1dbd8ebdd8469810e9c51e510d93f21fc2"
 }

package/src/factories/EmailTemplateFactory.ts

@@ -0,0 +1,47 @@
+import { Factory } from '@simonbackx/simple-database';
+
+import { EmailTemplate } from '../models';
+import { Organization } from '../models/Organization';
+import { EmailTemplateType, EmailTemplate as EmailTemplateStruct } from '@stamhoofd/structures';
+
+class Options {
+    organization?: Organization;
+    groupId?: string;
+    webshopId?: string;
+    type: EmailTemplateType;
+
+    subject?: string;
+    html?: string;
+    text?: string;
+}
+
+export class EmailTemplateFactory extends Factory<Options, EmailTemplate> {
+    async create(): Promise<EmailTemplate> {
+        const template = new EmailTemplate();
+
+        template.organizationId = this.options.organization?.id ?? null;
+        template.groupId = this.options.groupId ?? null;
+        template.webshopId = this.options.webshopId ?? null;
+        template.type = this.options.type;
+
+        template.subject = this.options.subject ?? this.options.type;
+        template.json = {};
+        template.html = '';
+        template.text = '';
+
+        if (this.options.html || this.options.text) {
+            template.html = this.options.html ?? '<p></p>';
+            template.text = this.options.text ?? 'Text';
+        }
+        else {
+            // Automatically add all replacements in our template email
+            for (const replacement of EmailTemplateStruct.getSupportedReplacementsForType(this.options.type)) {
+                template.html += `<p>${replacement.token}: {{${replacement.token}}}</p>`;
+                template.text += `${replacement.token}: {{${replacement.token}}}\n`;
+            }
+        }
+
+        await template.save();
+        return template;
+    }
+}

package/src/factories/EventFactory.ts

@@ -0,0 +1,31 @@
+import { Factory } from '@simonbackx/simple-database';
+import { EventMeta } from '@stamhoofd/structures';
+
+import { Event } from '../models/Event';
+import { Organization } from '../models/Organization';
+import { PlatformEventTypeFactory } from './PlatformEventTypeFactory';
+
+class Options {
+    organization?: Organization;
+    name?: string;
+    meta?: EventMeta;
+    startDate?: Date;
+    endDate?: Date;
+    typeId?: string;
+}
+
+export class EventFactory extends Factory<Options, Event> {
+    async create(): Promise<Event> {
+        const event = new Event();
+
+        event.organizationId = this.options.organization?.id ?? null;
+        event.typeId = this.options.typeId ?? (await new PlatformEventTypeFactory({}).create()).id;
+        event.startDate = this.options.startDate ?? new Date(Date.now() + 5 * 24 * 60 * 60 * 1000);
+        event.endDate = this.options.endDate ?? new Date(Date.now() + 7 * 24 * 60 * 60 * 1000);
+        event.name = this.options.name ?? 'Event ' + (new Date().getTime() + Math.floor(Math.random() * 999999));
+        event.meta = this.options.meta ?? EventMeta.create({});
+
+        await event.save();
+        return event;
+    }
+}

package/src/factories/EventNotificationFactory.ts

@@ -0,0 +1,51 @@
+import { Factory } from '@simonbackx/simple-database';
+import { EventNotificationStatus, RecordAnswer } from '@stamhoofd/structures';
+
+import { EventNotification, User } from '../models';
+import { Event } from '../models/Event';
+import { Organization } from '../models/Organization';
+import { EventFactory } from './EventFactory';
+import { EventNotificationTypeFactory } from './EventNotificationTypeFactory';
+
+class Options {
+    organization: Organization;
+    events?: Event[];
+    typeId?: string;
+    status?: EventNotificationStatus;
+    feedbackText?: string;
+    periodId?: string;
+    recordAnswers?: Map<string, RecordAnswer>;
+    acceptedRecordAnswers?: Map<string, RecordAnswer>;
+    submittedBy?: User | null;
+}
+
+export class EventNotificationFactory extends Factory<Options, EventNotification> {
+    async create(): Promise<EventNotification> {
+        const eventNotification = new EventNotification();
+
+        eventNotification.organizationId = this.options.organization.id;
+        eventNotification.typeId = this.options.typeId ?? (await new EventNotificationTypeFactory({}).create()).id;
+        eventNotification.status = this.options.status ?? EventNotificationStatus.Draft;
+        eventNotification.createdBy = null;
+        eventNotification.feedbackText = this.options.feedbackText ?? null;
+
+        const events = this.options.events ?? [await new EventFactory({ organization: this.options.organization }).create()];
+
+        eventNotification.startDate = events[0].startDate;
+        eventNotification.endDate = events[0].endDate;
+        eventNotification.periodId = this.options.periodId ?? this.options.organization.periodId;
+
+        // Set record answers
+        eventNotification.recordAnswers = this.options.recordAnswers ?? new Map();
+        eventNotification.acceptedRecordAnswers = this.options.acceptedRecordAnswers ?? new Map();
+
+        eventNotification.submittedBy = this.options.submittedBy?.id ?? null;
+        eventNotification.submittedAt = this.options.submittedBy ? new Date() : null;
+
+        await eventNotification.save();
+
+        // Link events
+        await EventNotification.events.link(eventNotification, events);
+        return eventNotification;
+    }
+}

package/src/factories/EventNotificationTypeFactory.ts

@@ -0,0 +1,26 @@
+import { Factory } from '@simonbackx/simple-database';
+import { EventNotificationType, RecordCategory } from '@stamhoofd/structures';
+
+import { Platform } from '../models/Platform';
+
+class Options {
+    title?: string;
+    recordCategories?: RecordCategory[];
+}
+
+export class EventNotificationTypeFactory extends Factory<Options, EventNotificationType> {
+    async create(): Promise<EventNotificationType> {
+        const eventType = EventNotificationType.create({
+            title: this.options.title ?? ('Melding ' + (new Date().getTime() + Math.floor(Math.random() * 999999))),
+        });
+
+        eventType.recordCategories = this.options.recordCategories ?? [];
+
+        // Add to platform
+        const platform = await Platform.getForEditing();
+        platform.config.eventNotificationTypes.push(eventType);
+        await platform.save();
+
+        return eventType;
+    }
+}

package/src/factories/PlatformEventTypeFactory.ts

@@ -0,0 +1,23 @@
+import { Factory } from '@simonbackx/simple-database';
+import { PlatformEventType } from '@stamhoofd/structures';
+
+import { Platform } from '../models/Platform';
+
+class Options {
+    name?: string;
+}
+
+export class PlatformEventTypeFactory extends Factory<Options, PlatformEventType> {
+    async create(): Promise<PlatformEventType> {
+        const eventType = PlatformEventType.create({
+            name: this.options.name ?? ('Responsibility ' + (new Date().getTime() + Math.floor(Math.random() * 999999))),
+        });
+
+        // Add to platform
+        const platform = await Platform.getForEditing();
+        platform.config.eventTypes.push(eventType);
+        await platform.save();
+
+        return eventType;
+    }
+}

package/src/factories/RecordAnswerFactory.ts

@@ -0,0 +1,113 @@
+import { Factory } from '@simonbackx/simple-database';
+import { File, Image, RecordAddressAnswer, RecordAnswer, RecordCategory, RecordCheckboxAnswer, RecordChooseOneAnswer, RecordDateAnswer, RecordFileAnswer, RecordImageAnswer, RecordIntegerAnswer, RecordMultipleChoiceAnswer, RecordPriceAnswer, RecordSettings, RecordTextAnswer, RecordType } from '@stamhoofd/structures';
+import { AddressFactory } from './AddressFactory';
+
+type Options = ({
+    records: RecordSettings[];
+} | {
+    recordCategories: RecordCategory[];
+}) & {
+    /**
+     * Defaults to true
+     */
+    complete?: boolean;
+};
+
+export class RecordAnswerFactory extends Factory<Options, Map<string, RecordAnswer>> {
+    async create(): Promise<Map<string, RecordAnswer>> {
+        const records = 'records' in this.options ? this.options.records : this.options.recordCategories.flatMap(c => c.getAllRecords());
+
+        const map: Map<string, RecordAnswer> = new Map();
+
+        for (const record of records) {
+            const answer = RecordAnswer.createDefaultAnswer(record);
+
+            if (this.options.complete !== false) {
+                // Make sure it is filled in
+                answer.markReviewed();
+
+                switch (true) {
+                    case answer instanceof RecordCheckboxAnswer: {
+                        // If it is a checkbox, set the first one to true
+                        answer.selected = true;
+                        break;
+                    }
+                    case answer instanceof RecordTextAnswer: {
+                        answer.value = 'Test ' + Math.floor(Math.random() * 100000);
+
+                        switch (record.type) {
+                            case RecordType.Phone:{
+                                answer.value = '+32 477 77 77 77';
+                                break;
+                            }
+                            case RecordType.Email: {
+                                answer.value = 'example@example.domain';
+                                break;
+                            }
+                            case RecordType.Textarea: {
+                                answer.value = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.\nVivamus lacinia odio vitae vestibulum.';
+                                break;
+                            }
+                        }
+                        break;
+                    }
+
+                    case answer instanceof RecordMultipleChoiceAnswer: {
+                        // If it is a multiple choice, select all
+                        answer.selectedChoices = record.choices.map(c => c.clone());
+                        break;
+                    };
+
+                    case answer instanceof RecordChooseOneAnswer: {
+                        // Select first
+                        answer.selectedChoice = record.choices[0]?.clone() ?? null;
+                        break;
+                    };
+
+                    case answer instanceof RecordAddressAnswer: {
+                        answer.address = await new AddressFactory({}).create();
+                        break;
+                    }
+
+                    case answer instanceof RecordDateAnswer: {
+                        answer.dateValue = new Date();
+                        break;
+                    }
+
+                    case answer instanceof RecordPriceAnswer: {
+                        answer.value = 1234;
+                        break;
+                    }
+
+                    case answer instanceof RecordImageAnswer: {
+                        answer.image = Image.create({});
+                        break;
+                    }
+
+                    case answer instanceof RecordIntegerAnswer: {
+                        answer.value = 5;
+                        break;
+                    }
+
+                    case answer instanceof RecordFileAnswer: {
+                        answer.file = new File({
+                            id: 'example-id',
+                            server: 'https://example.domain',
+                            path: 'example/path/to/file',
+                            size: 1234,
+                            name: 'example.txt',
+                            isPrivate: false,
+                            signedUrl: null,
+                            signature: null,
+                        });
+                        break;
+                    }
+                }
+            }
+
+            map.set(record.id, answer);
+        }
+
+        return map;
+    }
+}

package/src/factories/RecordCategoryFactory.ts

@@ -0,0 +1,23 @@
+import { Factory } from '@simonbackx/simple-database';
+import { RecordCategory, RecordSettings, RecordType } from '@stamhoofd/structures';
+import { RecordFactory, RecordOptions } from './RecordFactory';
+
+class Options {
+    records: RecordOptions[];
+}
+
+export class RecordCategoryFactory extends Factory<Options, RecordCategory> {
+    async create(): Promise<RecordCategory> {
+        const records: RecordSettings[] = [];
+        for (const record of this.options.records) {
+            records.push(
+                await new RecordFactory(record).create(),
+            );
+        }
+
+        return RecordCategory.create({
+            name: 'Record category ' + Math.floor(Math.random() * 10000),
+            records,
+        });
+    }
+}

package/src/factories/RecordFactory.ts

@@ -1,13 +1,19 @@
 import { Factory } from '@simonbackx/simple-database';
-import { LegacyRecord, LegacyRecordType } from '@stamhoofd/structures';
+import { RecordSettings, RecordType } from '@stamhoofd/structures';
 
-type Options = Record<string, never>;
+export class RecordOptions {
+    type: RecordType;
+    required?: boolean;
+}
 
-export class RecordFactory extends Factory<Options, LegacyRecord> {
-    LegacyRecordLegacyRecord;
-    create(): Promise<LegacyRecord> {
-        return Promise.resolve(LegacyRecord.create({
-            type: this.randomArray(Object.values(LegacyRecordType)),
-        }));
+export class RecordFactory extends Factory<RecordOptions, RecordSettings> {
+    create(): Promise<RecordSettings> {
+        return Promise.resolve(
+            RecordSettings.create({
+                name: 'Record name ' + Math.floor(Math.random() * 10000),
+                type: this.options.type,
+                required: this.options.required ?? (this.options.type !== RecordType.Checkbox),
+            }),
+        );
     }
 }

package/src/factories/RegistrationPeriodFactory.ts

@@ -7,6 +7,7 @@ class Options {
     startDate?: Date;
     endDate?: Date;
     previousPeriodId?: string;
+    locked?: boolean;
 }
 
 export class RegistrationPeriodFactory extends Factory<Options, RegistrationPeriod> {
@@ -20,6 +21,7 @@ export class RegistrationPeriodFactory extends Factory<Options, RegistrationPeri
             period.previousPeriodId = this.options.previousPeriodId;
         }
         period.settings = RegistrationPeriodSettings.create({});
+        period.locked = this.options.locked ?? false;
 
         await period.save();
         return period;

package/src/factories/index.ts

@@ -15,3 +15,10 @@ export * from './OrganizationTagFactory';
 export * from './OrganizationRegistrationPeriodFactory';
 export * from './MemberResponsibilityRecordFactory';
 export * from './PlatformResponsibilityFactory';
+export * from './PlatformEventTypeFactory';
+export * from './EventFactory';
+export * from './EventNotificationTypeFactory';
+export * from './EventNotificationFactory';
+export * from './EmailTemplateFactory';
+export * from './RecordCategoryFactory';
+export * from './RecordAnswerFactory';

package/src/helpers/DNSValidator.ts

@@ -20,16 +20,19 @@ export async function validateDNSRecords(dnsRecords: DNSRecord[], didRetry = fal
                     const addresses: string[] = await resolver.resolveCname(record.name.substr(0, record.name.length - 1));
                     record.errors = null;
 
-                    if (addresses.length == 0) {
+                    if (addresses.length === 0) {
                         record.status = DNSRecordStatus.Pending;
-                        allValid = false;
-                        hasAllNonTXT = false;
 
-                        record.errors = new SimpleErrors(new SimpleError({
-                            code: 'not_found',
-                            message: '',
-                            human: 'We konden de CNAME-record ' + record.name + ' nog niet vinden. Hou er rekening mee dat het even (tot 24u) kan duren voor we deze kunnen zien.',
-                        }));
+                        if (!record.optional) {
+                            allValid = false;
+                            hasAllNonTXT = false;
+
+                            record.errors = new SimpleErrors(new SimpleError({
+                                code: 'not_found',
+                                message: '',
+                                human: 'We konden de CNAME-record ' + record.name + ' nog niet vinden. Hou er rekening mee dat het even (tot 24u) kan duren voor we deze kunnen zien.',
+                            }));
+                        }
                     }
                     else if (addresses.length > 1) {
                         record.status = DNSRecordStatus.Failed;
@@ -39,7 +42,7 @@ export async function validateDNSRecords(dnsRecords: DNSRecord[], didRetry = fal
                         record.errors = new SimpleErrors(new SimpleError({
                             code: 'too_many_fields',
                             message: '',
-                            human: 'Er zijn meerdere CNAME records ingesteld voor ' + record.name + ', kijk na of je er geen moet verwijderen of per ongeluk meerder hebt aangemaakt',
+                            human: 'Er zijn meerdere CNAME records ingesteld voor ' + record.name + ', kijk na of je er geen moet verwijderen of per ongeluk meerdere hebt aangemaakt',
                         }));
                     }
                     else {
@@ -48,14 +51,17 @@ export async function validateDNSRecords(dnsRecords: DNSRecord[], didRetry = fal
                         }
                         else {
                             record.status = DNSRecordStatus.Failed;
-                            allValid = false;
-                            hasAllNonTXT = false;
 
-                            record.errors = new SimpleErrors(new SimpleError({
-                                code: 'wrong_value',
-                                message: '',
-                                human: 'Er is een andere waarde ingesteld voor de CNAME-record ' + record.name + ', kijk na of je geen typfout hebt gemaakt. Gevonden: ' + addresses[0] + '.',
-                            }));
+                            if (!record.optional) {
+                                allValid = false;
+                                hasAllNonTXT = false;
+
+                                record.errors = new SimpleErrors(new SimpleError({
+                                    code: 'wrong_value',
+                                    message: '',
+                                    human: 'Er is een andere waarde ingesteld voor de CNAME-record ' + record.name + ', kijk na of je geen typfout hebt gemaakt. Gevonden: ' + addresses[0] + '.',
+                                }));
+                            }
                         }
                     }
 
@@ -67,15 +73,18 @@ export async function validateDNSRecords(dnsRecords: DNSRecord[], didRetry = fal
 
                     record.errors = null;
 
-                    if (records.length == 0) {
+                    if (records.length === 0) {
                         record.status = DNSRecordStatus.Pending;
-                        allValid = false;
 
-                        record.errors = new SimpleErrors(new SimpleError({
-                            code: 'not_found',
-                            message: '',
-                            human: 'We konden de TXT-record ' + record.name + ' nog niet vinden. Hou er rekening mee dat het even (tot 24u) kan duren voor we deze kunnen zien.',
-                        }));
+                        if (!record.optional) {
+                            allValid = false;
+
+                            record.errors = new SimpleErrors(new SimpleError({
+                                code: 'not_found',
+                                message: '',
+                                human: 'We konden de TXT-record ' + record.name + ' nog niet vinden. Hou er rekening mee dat het even (tot 24u) kan duren voor we deze kunnen zien.',
+                            }));
+                        }
                     }
                     else if (records.length > 1) {
                         record.status = DNSRecordStatus.Failed;
@@ -89,29 +98,20 @@ export async function validateDNSRecords(dnsRecords: DNSRecord[], didRetry = fal
                     else {
                         const val = records[0].join('').trim();
                         if (val === record.value.trim()) {
-                            /* if (records[0].length > 1 && val.length <= 255) {
-                                // Split was not needed and is not supported by SES
-                                record.status = DNSRecordStatus.Failed
-                                allValid = false
-
-                                record.errors = new SimpleErrors(new SimpleError({
-                                    code: "wrong_value",
-                                    message: "",
-                                    human: "De waarde komt overeen maar is op één of andere manier opgesplitst in meerdere stukken, terwijl dat niet nodig is. Dit wordt niet ondersteund door onze e-mailprovider. Contacteer ons als je de oorzaak niet kan achterhalen."
-                                }))
-                            } else { */
                             record.status = DNSRecordStatus.Valid;
-                            // }
                         }
                         else {
                             record.status = DNSRecordStatus.Failed;
-                            allValid = false;
 
-                            record.errors = new SimpleErrors(new SimpleError({
-                                code: 'wrong_value',
-                                message: '',
-                                human: 'Er is een andere waarde ingesteld voor de TXT-record ' + record.name + ', kijk na of je geen typfout hebt gemaakt. Gevonden: ' + records[0].join(''),
-                            }));
+                            if (!record.optional) {
+                                allValid = false;
+
+                                record.errors = new SimpleErrors(new SimpleError({
+                                    code: 'wrong_value',
+                                    message: '',
+                                    human: 'Er is een andere waarde ingesteld voor de TXT-record ' + record.name + ', kijk na of je geen typfout hebt gemaakt. Gevonden: ' + records[0].join(''),
+                                }));
+                            }
                         }
                     }
                     break;
@@ -121,26 +121,32 @@ export async function validateDNSRecords(dnsRecords: DNSRecord[], didRetry = fal
         catch (e) {
             record.status = DNSRecordStatus.Pending;
 
-            if (e.code && (e.code == 'ENOTFOUND' || e.code == 'ENODATA')) {
-                record.errors = new SimpleErrors(new SimpleError({
-                    code: 'not_found',
-                    message: '',
-                    human: 'We konden de record ' + record.name + ' nog niet vinden. Hou er rekening mee dat het even (tot 24u) kan duren voor we deze kunnen zien.',
-                }));
+            if (e.code && (e.code === 'ENOTFOUND' || e.code === 'ENODATA')) {
+                if (!record.optional) {
+                    record.errors = new SimpleErrors(new SimpleError({
+                        code: 'not_found',
+                        message: '',
+                        human: 'We konden de record ' + record.name + ' nog niet vinden. Hou er rekening mee dat het even (tot 24u) kan duren voor we deze kunnen zien.',
+                    }));
+                }
             }
             else {
                 console.error(e);
-
-                record.errors = new SimpleErrors(new SimpleError({
-                    code: 'not_found',
-                    message: '',
-                    human: 'Er ging iets mis. Deze record lijkt niet goed ingesteld te zijn.',
-                }));
+                if (!record.optional) {
+                    record.errors = new SimpleErrors(new SimpleError({
+                        code: 'not_found',
+                        message: '',
+                        human: 'Er ging iets mis. Deze record lijkt niet goed ingesteld te zijn.',
+                    }));
+                }
             }
-            allValid = false;
 
-            if (record.type !== DNSRecordType.TXT) {
-                hasAllNonTXT = false;
+            if (!record.optional) {
+                allValid = false;
+
+                if (record.type !== DNSRecordType.TXT) {
+                    hasAllNonTXT = false;
+                }
             }
         }
     }

package/src/helpers/EmailBuilder.ts

@@ -209,6 +209,7 @@ async function getEmailBuilderForTemplate(organization: Organization | null, opt
     });
 
     if (!template) {
+        console.warn('No email template found for ' + options.template.type);
         return undefined;
     }
 
@@ -318,7 +319,7 @@ export async function getEmailBuilder(organization: Organization | null, email:
 
             // Override headers
             recipient.headers = {
-                'List-Unsubscribe': `<${unsubscribeUrl}>`,
+                'List-Unsubscribe': STAMHOOFD.domains.defaultBroadcastEmail !== undefined ? '<mailto:unsubscribe+' + unsubscribe.id + '@' + STAMHOOFD.domains.defaultBroadcastEmail![''] + `>, <${unsubscribeUrl}>` : `<${unsubscribeUrl}>`,
                 'List-Unsubscribe-Post': 'List-Unsubscribe=One-Click',
             };
             cleaned.push(recipient);

package/src/migrations/1741954610-event-notifications-accepted-record-answers.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `event_notifications`
+ADD COLUMN `acceptedRecordAnswers` json NOT NULL DEFAULT ('{"value": {}, "version": 0}') AFTER `recordAnswers`;

package/src/migrations/1742393831-default-template-partially-accepted-event-notification.sql

@@ -0,0 +1,2 @@
+INSERT INTO `email_templates` (`id`, `subject`, `groupId`, `webshopId`, `organizationId`, `type`, `text`, `html`, `json`, `updatedAt`, `createdAt`) VALUES
+('7b28fe12-d06e-49d0-9acf-102a1873253a', 'Kampmelding voor {{eventName}} ({{dateRange}}) werd voorlopig goedgekeurd', NULL, NULL, NULL, 'EventNotificationPartiallyAccepted', '{{greeting}}Goed nieuws! Jullie kampmelding voor  {{eventName}} ({{dateRange}}) van {{organizationName}} werd voorlopig goedgekeurd. Deze werd ingediend door {{submitterName}}.\n\n    \n        \n            \n                \n                Kampmelding bekijken\n                \n            \n        \n    \n\nOpmerkingen{{feedbackText}}', '<!DOCTYPE html>\n<html>\n\n<head>\n<meta charset=\"utf-8\" />\n<meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge\" />\n<meta name=\"viewport\" content=\"width=device-width,initial-scale=1.0\" />\n<title>Kampmelding voor {{eventName}} ({{dateRange}}) werd voorlopig goedgekeurd</title>\n<style type=\"text/css\">body {\n  color: #000716;\n  color: var(--color-dark, #000716);\n  font-family: -apple-system-body, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Roboto, Helvetica, Arial, sans-serif, \"Apple Color Emoji\", \"Segoe UI Emoji\", \"Segoe UI Symbol\";\n  font-size: 12pt;\n  line-height: 1.4;\n}\n\np {\n  margin: 0;\n  padding: 0;\n  line-height: 1.4;\n}\n\np.description {\n  color: var(--color-gray-4, #5e5e5e);\n}\np.description a, p.description a:link, p.description a:visited, p.description a:active, p.description a:hover {\n  text-decoration: underline;\n  color: var(--color-gray-4, #5e5e5e);\n}\n\nstrong {\n  font-weight: bold;\n}\n\nem {\n  font-style: italic;\n}\n\nh1 {\n  font-size: 30px;\n  font-weight: bold;\n  line-height: 1.2;\n  margin: 0;\n  padding: 0;\n}\n@media (max-width: 350px) {\n  h1 {\n    font-size: 24px;\n  }\n}\n\nh2 {\n  font-size: 20px;\n  line-height: 1.2;\n  font-weight: bold;\n  margin: 0;\n  padding: 0;\n}\n\nh3 {\n  font-size: 16px;\n  line-height: 1.2;\n  font-weight: bold;\n  margin: 0;\n  padding: 0;\n}\n\nh4 {\n  line-height: 1.2;\n  font-weight: 500;\n  margin: 0;\n  padding: 0;\n}\n\nol, ul {\n  list-style-position: outside;\n  padding-left: 30px;\n}\n\nhr {\n  height: 1px;\n  background: var(--color-border, var(--color-gray-2, #dcdcdc));\n  border-radius: 1px;\n  padding: 0;\n  margin: 20px 0;\n  outline: none;\n  border: 0;\n}\n\n.button {\n  touch-action: inherit;\n  user-select: auto;\n  cursor: pointer;\n  display: inline-block !important;\n  line-height: 42px;\n  font-size: 16px;\n  font-weight: bold;\n}\n.button:active {\n  transform: none;\n}\n\nimg {\n  max-width: 100%;\n  height: auto;\n}\n\na, a:link, a:visited, a:active, a:hover {\n  text-decoration: underline;\n  color: blue;\n}\n\n.email-data-table {\n  width: 100%;\n  border-collapse: collapse;\n}\n.email-data-table th, .email-data-table td {\n  text-align: left;\n  padding: 10px 10px 10px 0;\n  border-bottom: 1px solid var(--color-border, var(--color-gray-2, #dcdcdc));\n  vertical-align: middle;\n}\n.email-data-table th:last-child, .email-data-table td:last-child {\n  text-align: right;\n  padding-right: 0;\n}\n.email-data-table thead {\n  font-weight: bold;\n}\n.email-data-table thead th {\n  font-size: 10pt;\n}\n.email-data-table h4 ~ p {\n  padding-top: 3px;\n  opacity: 0.8;\n  font-size: 11pt;\n}\n\n.email-style-inline-code {\n  font-family: monospace;\n  white-space: pre-wrap;\n  display: inline-block;\n}\n\n.email-style-description-small {\n  font-size: 14px;\n  line-height: 1.5;\n  font-weight: normal;\n  color: var(--color-gray-4, #5e5e5e);\n  font-variation-settings: \"opsz\" 19;\n}\n\n.email-style-title-list {\n  font-size: 16px;\n  line-height: 1.3;\n  font-weight: 500;\n}\n.email-style-title-list + p {\n  padding-top: 3px;\n}\n\n.email-style-title-prefix-list {\n  font-size: 11px;\n  line-height: 1.5;\n  font-weight: bold;\n  color: {{primaryColor}};\n  text-transform: uppercase;\n  margin-bottom: 3px;\n}\n.email-style-title-prefix-list.error {\n  color: #f0153d;\n}\n\n.email-style-price-base, .email-style-discount-price, .email-style-discount-old-price, .email-style-price {\n  font-size: 15px;\n  line-height: 1.4;\n  font-weight: 500;\n  font-variant-numeric: tabular-nums;\n}\n.email-style-price-base.disabled, .disabled.email-style-discount-price, .disabled.email-style-discount-old-price, .disabled.email-style-price {\n  opacity: 0.6;\n}\n.email-style-price-base.negative, .negative.email-style-discount-price, .negative.email-style-discount-old-price, .negative.email-style-price {\n  color: #f0153d;\n}\n\n.email-style-price {\n  font-weight: bold;\n  color: {{primaryColor}};\n}\n\n.email-style-discount-old-price {\n  text-decoration: line-through;\n  color: var(--color-gray-4, #5e5e5e);\n}\n\n.email-style-discount-price {\n  font-weight: bold;\n  color: #ff4747;\n  margin-left: 5px;\n}\n\n.pre-wrap {\n  white-space: pre-wrap;\n} hr {height: 2px;background: #e7e7e7; border-radius: 1px; padding: 0; margin: 20px 0; outline: none; border: 0;} .button.primary { margin: 0; text-decoration: none; font-size: 16px; font-weight: bold; color: {{primaryColorContrast}}; padding: 0 27px; line-height: 42px; background: {{primaryColor}}; text-align: center; border-radius: 7px; touch-action: manipulation; display: inline-block; transition: 0.2s transform, 0.2s opacity; } .button.primary:active { transform: scale(0.95, 0.95); }  .inline-link, .inline-link:link, .inline-link:visited, .inline-link:active, .inline-link:hover { margin: 0; text-decoration: underline; font-size: inherit; font-weight: inherit; color: inherit; touch-action: manipulation; } .inline-link:active { opacity: 0.5; }  .description { color: #5e5e5e; } </style>\n</head>\n\n<body>\n<p style=\"margin: 0; padding: 0; line-height: 1.4;\">{{greeting}}</p><p style=\"margin: 0; padding: 0; line-height: 1.4;\"><br></p><p style=\"margin: 0; padding: 0; line-height: 1.4;\">Goed nieuws! Jullie kampmelding voor  <strong>{{eventName}}</strong> ({{dateRange}}) van <strong>{{organizationName}}</strong> werd voorlopig goedgekeurd. Deze werd ingediend door {{submitterName}}.</p><p style=\"margin: 0; padding: 0; line-height: 1.4;\"><br></p><div data-type=\"smartButton\" data-id=\"reviewUrl\"><table width=\"100%\" cellspacing=\"0\" cellpadding=\"0\" style=\"margin: 5px 0;\">\n<tbody><tr>\n    <td>\n        <table cellspacing=\"0\" cellpadding=\"0\">\n            <tbody><tr>\n                <td style=\"border-radius: 7px;\" bgcolor=\"{{primaryColor}}\">\n                <a class=\"button primary\" href=\"{{reviewUrl}}\" target=\"\" style=\"margin: 0; text-decoration: none; font-size: 16px; font-weight: bold; color: {{primaryColorContrast}}; padding: 0 27px; line-height: 42px; background: {{primaryColor}}; text-align: center; border-radius: 7px; touch-action: manipulation; display: inline-block; transition: 0.2s transform, 0.2s opacity;\">Kampmelding bekijken</a>\n                </td>\n            </tr>\n        </tbody></table>\n    </td>\n</tr>\n</tbody></table></div><p style=\"margin: 0; padding: 0; line-height: 1.4;\"><br></p><hr style=\"height: 2px;background: #e7e7e7; border-radius: 1px; padding: 0; margin: 20px 0; outline: none; border: 0;\"><h2 style=\"margin: 0; padding: 0;\">Opmerkingen</h2><p style=\"margin: 0; padding: 0; line-height: 1.4;\"><br></p><div data-type=\"smartVariableBlock\" data-id=\"feedbackText\">{{feedbackText}}</div><p style=\"margin: 0; padding: 0; line-height: 1.4;\"><br></p>\n</body>\n\n</html>', '{\"value\": {\"type\": \"doc\", \"content\": [{\"type\": \"paragraph\", \"content\": [{\"type\": \"smartVariable\", \"attrs\": {\"id\": \"greeting\"}}]}, {\"type\": \"paragraph\"}, {\"type\": \"paragraph\", \"content\": [{\"text\": \"Goed nieuws! Jullie kampmelding voor  \", \"type\": \"text\"}, {\"type\": \"smartVariable\", \"attrs\": {\"id\": \"eventName\"}, \"marks\": [{\"type\": \"bold\"}]}, {\"text\": \" (\", \"type\": \"text\"}, {\"type\": \"smartVariable\", \"attrs\": {\"id\": \"dateRange\"}}, {\"text\": \") van \", \"type\": \"text\"}, {\"type\": \"smartVariable\", \"attrs\": {\"id\": \"organizationName\"}, \"marks\": [{\"type\": \"bold\"}]}, {\"text\": \" werd voorlopig goedgekeurd. Deze werd ingediend door \", \"type\": \"text\"}, {\"type\": \"smartVariable\", \"attrs\": {\"id\": \"submitterName\"}}, {\"text\": \".\", \"type\": \"text\"}]}, {\"type\": \"paragraph\"}, {\"type\": \"smartButton\", \"attrs\": {\"id\": \"reviewUrl\"}, \"content\": [{\"text\": \"Kampmelding bekijken\", \"type\": \"text\"}]}, {\"type\": \"paragraph\"}, {\"type\": \"horizontalRule\"}, {\"type\": \"heading\", \"attrs\": {\"level\": 2}, \"content\": [{\"text\": \"Opmerkingen\", \"type\": \"text\"}]}, {\"type\": \"paragraph\"}, {\"type\": \"smartVariableBlock\", \"attrs\": {\"id\": \"feedbackText\"}}, {\"type\": \"paragraph\"}]}, \"version\": 367}', '2025-03-19 14:16:02', '2025-03-19 14:16:02');

package/src/migrations/1742579832-audit-log-longer-object-size.sql

@@ -0,0 +1,3 @@
+ALTER TABLE `audit_logs`
+CHANGE `externalId` `externalId` varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL,
+CHANGE `objectId` `objectId` varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL;