@stamhoofd/models 2.120.6 → 2.122.0

package/src/models/Email.test.ts

@@ -896,7 +896,7 @@ describe('Model.Email', () => {
                     organizationId: organization.id,
                     type: BalanceItemType.Other,
                     amount: 2,
-                    unitPrice: 12_99,
+                    unitPrice: 12_99_00,
                     description: 'Test balance item',
                 }).create();
                 await CachedBalance.updateForUsers(organization.id, [existingUser.id]);
@@ -940,12 +940,12 @@ describe('Model.Email', () => {
                 // Check if the table is correct
                 expect(EmailMocker.getSucceededEmail(0).html).toMatch('<table');
                 expect(EmailMocker.getSucceededEmail(0).html).toMatch('2 x '); // amount
-                expect(EmailMocker.getSucceededEmail(0).html).toMatch(Formatter.price(12_99)); // unit price
+                expect(EmailMocker.getSucceededEmail(0).html).toMatch(Formatter.price(12_99_00)); // unit price
                 expect(EmailMocker.getSucceededEmail(0).html).toMatch('<td>' + expectedAmount); // total price in table
                 expect(EmailMocker.getSucceededEmail(0).html).toMatch('Test balance item'); // description
 
                 expect(EmailMocker.getSucceededEmail(0).text).toMatch('2 x '); // amount
-                expect(EmailMocker.getSucceededEmail(0).text).toMatch(Formatter.price(12_99)); // unit price
+                expect(EmailMocker.getSucceededEmail(0).text).toMatch(Formatter.price(12_99_00)); // unit price
                 expect(EmailMocker.getSucceededEmail(0).text).toMatch(expectedAmount); // total price in table
                 expect(EmailMocker.getSucceededEmail(0).text?.toLowerCase()).toMatch('test balance item'); // description
             }, 15_000);

package/src/models/Email.ts

@@ -23,11 +23,9 @@ type Attachment = { filename: string; path?: string; href?: string; content?: st
 function errorToSimpleErrors(e: unknown) {
     if (isSimpleErrors(e)) {
         return e;
-    }
-    else if (isSimpleError(e)) {
+    } else if (isSimpleError(e)) {
         return new SimpleErrors(e);
-    }
-    else {
+    } else {
         return new SimpleErrors(
             new SimpleError({
                 code: 'unknown_error',
@@ -471,22 +469,22 @@ export class Email extends QueryableModel {
             case 'hard-bounce': {
                 base.set('hardBouncesCount',
                     SQL.calculation(SQL.column('hardBouncesCount'))
-                        .add(readDynamicSQLExpression(1))
-                    );
+                        .add(readDynamicSQLExpression(1)),
+                );
                 break;
             }
             case 'soft-bounce': {
                 base.set('softBouncesCount',
                     SQL.calculation(SQL.column('softBouncesCount'))
-                        .add(readDynamicSQLExpression(1))
-                    );
+                        .add(readDynamicSQLExpression(1)),
+                );
                 break;
             }
             case 'complaint': {
                 base.set('spamComplaintsCount',
                     SQL.calculation(SQL.column('spamComplaintsCount'))
-                        .add(readDynamicSQLExpression(1))
-                    );
+                        .add(readDynamicSQLExpression(1)),
+                );
                 break;
             }
         }
@@ -604,8 +602,7 @@ export class Email extends QueryableModel {
         });
         if (waitForSending) {
             return await this.resumeSending();
-        }
-        else {
+        } else {
             this.resumeSending().catch(console.error);
         }
         return this;
@@ -642,8 +639,7 @@ export class Email extends QueryableModel {
                     contentType: attachment.contentType ?? undefined,
                     encoding: 'base64',
                 });
-            }
-            else {
+            } else {
                 // Note: because we send lots of emails, we better download the file here so we can reuse it in every email instead of downloading it every time
                 const withSigned = await attachment.file!.withSignedUrl();
                 if (!withSigned || !withSigned.signedUrl) {
@@ -655,12 +651,11 @@ export class Email extends QueryableModel {
                 }
 
                 const filePath = withSigned.signedUrl;
-                let fileBuffer: Buffer | null = null;
+                let fileBuffer: Buffer | null;
                 try {
                     const response = await fetch(filePath);
                     fileBuffer = Buffer.from(await response.arrayBuffer());
-                }
-                catch (e) {
+                } catch (e) {
                     throw new SimpleError({
                         code: 'attachment_not_found',
                         message: 'Attachment not found',
@@ -707,8 +702,7 @@ export class Email extends QueryableModel {
                     // Update repacements that have been generated
                     recipient.replacements = virtualRecipient.replacements;
                     await recipient.save();
-                }
-                else {
+                } else {
                     recipient.failCount += 1;
                     recipient.failErrorMessage = error.message;
                     if (recipient.failError) {
@@ -719,8 +713,7 @@ export class Email extends QueryableModel {
                     recipient.lastFailedAt = new Date();
                     await recipient.save();
                 }
-            }
-            catch (e) {
+            } catch (e) {
                 console.error(e);
             }
             promiseResolve();
@@ -761,8 +754,7 @@ export class Email extends QueryableModel {
                         console.log('Email already sent, skipping...', upToDate.id);
                         return upToDate;
                     }
-                }
-                else {
+                } else {
                     if (singleRecipientId) {
                         // Not possible
                         throw new SimpleError({
@@ -786,8 +778,7 @@ export class Email extends QueryableModel {
                             await upToDate.save();
                             return upToDate;
                         }
-                    }
-                    else if (upToDate.status !== EmailStatus.Queued) {
+                    } else if (upToDate.status !== EmailStatus.Queued) {
                         console.error('Email is not queued or sending, cannot send', upToDate.id, upToDate.status);
                         return upToDate;
                     }
@@ -888,8 +879,7 @@ export class Email extends QueryableModel {
 
                             try {
                                 await upToDate.save();
-                            }
-                            finally {
+                            } finally {
                                 isSavingStatus = false;
                             }
                         }
@@ -938,8 +928,7 @@ export class Email extends QueryableModel {
                                         // Failed or soft-failed
                                         if (recipient.failError && isSoftEmailRecipientError(recipient.failError)) {
                                             softFailedCount += 1;
-                                        }
-                                        else {
+                                        } else {
                                             failedCount += 1;
                                         }
                                         skipped++;
@@ -957,13 +946,11 @@ export class Email extends QueryableModel {
                                     if (recipient.sentAt) {
                                         succeededCount += 1;
                                         await saveStatus();
-                                    }
-                                    else {
+                                    } else {
                                         // Failed or soft-failed
                                         if (recipient.failError && isSoftEmailRecipientError(recipient.failError)) {
                                             softFailedCount += 1;
-                                        }
-                                        else {
+                                        } else {
                                             failedCount += 1;
                                         }
                                         await saveStatus();
@@ -973,14 +960,12 @@ export class Email extends QueryableModel {
 
                             if (sendingPromises.length > 0 || skipped > 0) {
                                 await Promise.all(sendingPromises);
-                            }
-                            else {
+                            } else {
                                 break;
                             }
                         }
                     }
-                }
-                catch (e) {
+                } catch (e) {
                     if (!upToDate) {
                         throw e;
                     }
@@ -1023,8 +1008,7 @@ export class Email extends QueryableModel {
                                 human: $t(`%1EG`),
                             }),
                         );
-                    }
-                    else {
+                    } else {
                         upToDate.status = EmailStatus.Sent;
                         upToDate.emailErrors = null;
                     }
@@ -1115,8 +1099,7 @@ export class Email extends QueryableModel {
                 await upToDate.save();
 
                 console.log('Updated recipient count for email', id, 'to', count);
-            }
-            catch (e) {
+            } catch (e) {
                 if (isAbortedError(e)) {
                     return;
                 }
@@ -1263,8 +1246,7 @@ export class Email extends QueryableModel {
                                         recipient.replacements = merged;
 
                                         break;
-                                    }
-                                    else {
+                                    } else {
                                         console.log('Could not merge duplicate email recipient', item.email, other.id, 'keeping both', other.replacements, item.replacements);
                                     }
                                 }
@@ -1283,8 +1265,7 @@ export class Email extends QueryableModel {
 
                             if (!recipient.email || duplicateOfRecipientId) {
                                 countWithoutEmail += 1;
-                            }
-                            else {
+                            } else {
                                 count += 1;
                             }
                         }
@@ -1299,8 +1280,7 @@ export class Email extends QueryableModel {
                 upToDate.recipientsErrors = null;
                 upToDate.membersCount = membersSet.size;
                 await upToDate.save();
-            }
-            catch (e: unknown) {
+            } catch (e: unknown) {
                 console.error('Failed to build recipients for email', id);
                 console.error(e);
                 upToDate.recipientsStatus = EmailRecipientsStatus.NotCreated;
@@ -1381,8 +1361,7 @@ export class Email extends QueryableModel {
                 }
 
                 console.warn('No example recipient found for email', id);
-            }
-            catch (e) {
+            } catch (e) {
                 console.error('Failed to build example recipient for email', id);
                 console.error(e);
             }

package/src/models/EmailVerificationCode.ts

@@ -1,15 +1,15 @@
 import { column } from '@simonbackx/simple-database';
 import { SimpleError } from '@simonbackx/simple-errors';
-import type {I18n} from '@stamhoofd/backend-i18n';
+import type { I18n } from '@stamhoofd/backend-i18n';
 import { QueryableModel } from '@stamhoofd/sql';
-import { EmailTemplateType, Recipient, Replacement } from '@stamhoofd/structures';
+import { appToUri, EmailTemplateType, getAppHost, Recipient, Replacement } from '@stamhoofd/structures';
 import basex from 'base-x';
 import crypto from 'crypto';
 import { v4 as uuidv4 } from 'uuid';
 import { sendEmailTemplate } from '../helpers/EmailBuilder.js';
 import { Platform } from './Platform.js';
-import type {User} from './User.js';
-import type {Organization} from './Organization.js';
+import type { User } from './User.js';
+import type { Organization } from './Organization.js';
 
 const ALPHABET = '123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz';
 const bs58 = basex(ALPHABET);
@@ -121,20 +121,8 @@ export class EmailVerificationCode extends QueryableModel {
     }
 
     getEmailVerificationUrl(user: User, organization: Organization | null, i18n: I18n) {
-        let host: string;
-        if (user.permissions || !organization || STAMHOOFD.userMode === 'platform') {
-            host = 'https://' + (STAMHOOFD.domains.dashboard ?? 'stamhoofd.app') + '/' + i18n.locale;
-        }
-        else {
-            // Add language if different than default
-            host = 'https://' + organization.getHost();
-
-            if (i18n.language !== organization.i18n.language) {
-                host += '/' + i18n.language;
-            }
-        }
-
-        return host + '/verify-email' + (user.organizationPermissions && this.organizationId ? '/' + encodeURIComponent(this.organizationId) : '') + '?code=' + encodeURIComponent(this.code) + '&token=' + encodeURIComponent(this.token);
+        const host = getAppHost('verify-email', organization, !!user.permissions, i18n);
+        return 'https://' + host + '?code=' + encodeURIComponent(this.code) + '&token=' + encodeURIComponent(this.token) + '&email=' + encodeURIComponent(this.email);
     }
 
     /**
@@ -283,8 +271,7 @@ export class EmailVerificationCode extends QueryableModel {
                 },
                 type: 'transactional',
             });
-        }
-        else {
+        } else {
             await sendEmailTemplate(organization, {
                 recipients: [
                     Recipient.create({
@@ -359,8 +346,7 @@ export class EmailVerificationCode extends QueryableModel {
 
             // Expire in 3 hours
             verificationCode.expiresAt = new Date(new Date().getTime() + 1000 * 60 * 60 * 3);
-        }
-        else {
+        } else {
             verificationCode = verificationCodes[0];
 
             if (verificationCode.email !== email || verificationCode.expiresAt < new Date(new Date().getTime() - 15 * 60 * 1000) || verificationCode.tries >= EmailVerificationCode.MAX_TRIES) {

package/src/models/Event.ts

@@ -68,6 +68,10 @@ export class Event extends QueryableModel {
         });
     }
 
+    get slug() {
+        return this.getStructure().slug;
+    }
+
     /**
      * @deprecated
      */
@@ -101,8 +105,7 @@ export class Event extends QueryableModel {
             group.settings.requireOrganizationIds = [this.organizationId];
             group.settings.requireOrganizationTags = [];
             group.settings.requirePlatformMembershipOn = null;
-        }
-        else {
+        } else {
             group.settings.requireOrganizationTags = this.meta.organizationTagIds ?? [];
 
             // Everyone can register
@@ -118,8 +121,7 @@ export class Event extends QueryableModel {
             if (waitingList) {
                 if (group.settings.allowRegistrationsByOrganization) {
                     waitingList.settings.allowRegistrationsByOrganization = true;
-                }
-                else {
+                } else {
                     waitingList.settings.allowRegistrationsByOrganization = false;
                 }
                 await this.syncGroupRequirements(waitingList);

package/src/models/EventNotification.ts

@@ -1,8 +1,8 @@
 import { column, ManyToManyRelation } from '@simonbackx/simple-database';
-import { MapDecoder, StringDecoder } from '@simonbackx/simple-encoding';
+import { EnumDecoder } from '@simonbackx/simple-encoding';
 import { QueryableModel } from '@stamhoofd/sql';
-import type { RecordAnswer} from '@stamhoofd/structures';
-import { EventNotificationStatus, RecordAnswerDecoder } from '@stamhoofd/structures';
+import type { RecordAnswer } from '@stamhoofd/structures';
+import { EventNotificationStatus, RecordAnswerMapDecoder } from '@stamhoofd/structures';
 import { v4 as uuidv4 } from 'uuid';
 import { Event } from './Event.js';
 
@@ -26,7 +26,7 @@ export class EventNotification extends QueryableModel {
     @column({ type: 'datetime' })
     endDate: Date;
 
-    @column({ type: 'string' })
+    @column({ type: 'string', decoder: new EnumDecoder(EventNotificationStatus) })
     status = EventNotificationStatus.Draft;
 
     /**
@@ -39,13 +39,13 @@ export class EventNotification extends QueryableModel {
     @column({ type: 'string' })
     organizationId: string;
 
-    @column({ type: 'json', decoder: new MapDecoder(StringDecoder, RecordAnswerDecoder) })
+    @column({ type: 'json', decoder: RecordAnswerMapDecoder })
     recordAnswers: Map<string, RecordAnswer> = new Map();
 
     /**
      * Contains the answers of an event notification that were accepted
      */
-    @column({ type: 'json', decoder: new MapDecoder(StringDecoder, RecordAnswerDecoder) })
+    @column({ type: 'json', decoder: RecordAnswerMapDecoder })
     acceptedRecordAnswers: Map<string, RecordAnswer> = new Map();
 
     @column({ type: 'string', nullable: true })

package/src/models/Group.ts

@@ -1,12 +1,12 @@
-import { column, Database, ManyToOneRelation } from '@simonbackx/simple-database';
-import type { GroupCategory} from '@stamhoofd/structures';
+import { column, Database } from '@simonbackx/simple-database';
+import type { GroupCategory } from '@stamhoofd/structures';
 import { GroupPrivateSettings, GroupSettings, GroupStatus, Group as GroupStruct, GroupType, StockReservation } from '@stamhoofd/structures';
 import { v4 as uuidv4 } from 'uuid';
 
 import { ArrayDecoder } from '@simonbackx/simple-encoding';
 import { QueueHandler } from '@stamhoofd/queues';
 import { QueryableModel } from '@stamhoofd/sql';
-import type {OrganizationRegistrationPeriod} from './OrganizationRegistrationPeriod.js';
+import type { OrganizationRegistrationPeriod } from './OrganizationRegistrationPeriod.js';
 import { Registration } from './Registration.js';
 
 if (Registration === undefined) {
@@ -90,6 +90,27 @@ export class Group extends QueryableModel {
     @column({ type: 'json', decoder: new ArrayDecoder(StockReservation) })
     stockReservations: StockReservation[] = [];
 
+    /**
+     * No registrations and waiting list registrations are possible if closed
+     */
+    get closed() {
+        if (this.status !== GroupStatus.Open) {
+            return true;
+        }
+
+        if (this.settings.notYetOpen) {
+            // Start date or pre registration date are in the future
+            return true;
+        }
+
+        const now = new Date();
+        if (this.settings.registrationEndDate && this.settings.registrationEndDate < now) {
+            return true;
+        }
+
+        return false;
+    }
+
     static async getAll(organizationId: string, periodId: string | null, active = true, types: GroupType[] = [GroupType.Membership]): Promise<Group[]> {
         const query = Group.select()
             .where('organizationId', organizationId);

package/src/models/Invoice.ts

@@ -1,10 +1,11 @@
 import { column } from '@simonbackx/simple-database';
-import { Company, File, Invoice as InvoiceStruct, PaymentCustomer, VATSubtotal } from '@stamhoofd/structures';
+import { Company, File, PaymentCustomer, VATSubtotal } from '@stamhoofd/structures';
 import { v4 as uuidv4 } from 'uuid';
 
 import { ArrayDecoder } from '@simonbackx/simple-encoding';
 import { QueryableModel } from '@stamhoofd/sql';
 import { InvoicedBalanceItem } from './InvoicedBalanceItem.js';
+import { Formatter } from '@stamhoofd/utility';
 
 export class Invoice extends QueryableModel {
     static table = 'invoices';
@@ -109,14 +110,6 @@ export class Invoice extends QueryableModel {
     @column({
         type: 'datetime',
         nullable: true,
-        beforeSave(old?: any) {
-            if (old !== undefined || !this.number) {
-                return old;
-            }
-            const date = new Date();
-            date.setMilliseconds(0);
-            return date;
-        },
     })
     invoicedAt: Date | null = null;
 
@@ -161,4 +154,12 @@ export class Invoice extends QueryableModel {
         const invoicedBalanceItems = await InvoicedBalanceItem.select().where('invoiceId', invoices.map(i => i.id)).fetch();
         return { invoicedBalanceItems };
     }
+
+    generateCustomerFilename(ext: 'pdf' | 'xml') {
+        if (!this.number || !this.invoicedAt) {
+            return this.id + '.' + ext;
+        }
+        const date = this.invoicedAt
+        return Formatter.dateIso(date) + ' - ' + (this.totalWithVAT < 0 ? $t('%1aE') : $t('%1Zw')) + ' ' + this.number + ' - ' + Formatter.fileSlug(this.seller.name) + '.' + ext;
+    }
 }

package/src/models/MemberPlatformMembership.test.ts

@@ -0,0 +1,70 @@
+import { PlatformMembershipType, PlatformMembershipTypeBehaviour, PlatformMembershipTypeConfig } from '@stamhoofd/structures';
+
+import { MemberFactory } from '../factories/MemberFactory.js';
+import { OrganizationFactory } from '../factories/OrganizationFactory.js';
+import { RegistrationPeriodFactory } from '../factories/RegistrationPeriodFactory.js';
+import { MemberPlatformMembership } from './MemberPlatformMembership.js';
+import { Platform } from './Platform.js';
+
+describe('MemberPlatformMembership', () => {
+    beforeEach(() => {
+        vitest.useFakeTimers({ toFake: ['Date'] }).setSystemTime(new Date(2024, 4, 1, 0, 0, 0, 0));
+    });
+
+    afterEach(() => {
+        vitest.useRealTimers();
+    });
+
+    async function setupDaysMembership(maximumDays: number) {
+        const period = await new RegistrationPeriodFactory({
+            startDate: new Date(2024, 0, 1, 0, 0, 0, 0),
+            endDate: new Date(2024, 11, 31, 23, 59, 59, 999),
+        }).create();
+        const organization = await new OrganizationFactory({ period }).create();
+        const member = await new MemberFactory({ organization }).create();
+        const membershipType = PlatformMembershipType.create({
+            name: 'Days membership',
+            behaviour: PlatformMembershipTypeBehaviour.Days,
+            periods: new Map([
+                [period.id, PlatformMembershipTypeConfig.create({
+                    startDate: period.startDate,
+                    endDate: period.endDate,
+                    maximumDays,
+                })],
+            ]),
+        });
+
+        const platform = await Platform.getForEditing();
+        platform.periodId = period.id;
+        platform.config.membershipTypes = [membershipType];
+        await platform.save();
+
+        const membership = new MemberPlatformMembership();
+        membership.memberId = member.id;
+        membership.membershipTypeId = membershipType.id;
+        membership.organizationId = organization.id;
+        membership.periodId = period.id;
+
+        return { member, membership };
+    }
+
+    test('allows the inclusive maximum number of days', async () => {
+        const { member, membership } = await setupDaysMembership(2);
+        membership.startDate = new Date(2024, 4, 1, 0, 0, 0, 0);
+        membership.endDate = new Date(2024, 4, 2, 0, 0, 0, 0);
+
+        await expect(membership.calculatePrice(member)).resolves.toBeUndefined();
+        expect(membership.maximumFreeAmount).toBe(2);
+    });
+
+    test('rejects days memberships that exceed maximum days', async () => {
+        const { member, membership } = await setupDaysMembership(2);
+        membership.startDate = new Date(2024, 4, 1, 0, 0, 0, 0);
+        membership.endDate = new Date(2024, 4, 3, 0, 0, 0, 0);
+
+        await expect(membership.calculatePrice(member)).rejects.toMatchObject({
+            code: 'invalid_field',
+            field: 'endDate',
+        });
+    });
+});

package/src/models/MemberPlatformMembership.ts

@@ -207,8 +207,7 @@ export class MemberPlatformMembership extends QueryableModel {
             this.startDate = startBrussels.toJSDate();
             this.endDate = endBrussels.toJSDate();
             this.expireDate = null;
-        }
-        else {
+        } else {
             this.endDate = Formatter.luxon(periodConfig.endDate).set({ hour: 23, minute: 59, second: 59, millisecond: 0 }).toJSDate();
             this.expireDate = periodConfig.expireDate ? Formatter.luxon(periodConfig.expireDate).set({ hour: 23, minute: 59, second: 59, millisecond: 0 }).toJSDate() : null;
 
@@ -222,8 +221,7 @@ export class MemberPlatformMembership extends QueryableModel {
                     startBrussels = startBrussels.set({ hour: 0, minute: 0, second: 0, millisecond: 0 });
                     this.startDate = startBrussels.toJSDate();
                 }
-            }
-            else {
+            } else {
                 // Keep the set date, but make sure it is at 0:00 in CET
                 let startBrussels = Formatter.luxon(this.startDate);
                 startBrussels = startBrussels.set({ hour: 0, minute: 0, second: 0, millisecond: 0 });
@@ -248,6 +246,16 @@ export class MemberPlatformMembership extends QueryableModel {
             this.endDate = Formatter.luxon(this.startDate).set({ hour: 23, minute: 59, second: 59, millisecond: 0 }).toJSDate();
         }
 
+        const maximumEndDate = periodConfig.getMaximumEndDate(this.startDate, membershipType.behaviour);
+        if (this.endDate > maximumEndDate) {
+            throw new SimpleError({
+                code: 'invalid_field',
+                field: 'endDate',
+                message: 'End date is after the maximum allowed end date',
+                human: $t('%15C', { date: Formatter.date(maximumEndDate) }),
+            });
+        }
+
         if (periodConfig.trialDays) {
             // Check whether you are elegible for a trial
             const latestTrialDate = await this.isElegibleForTrial(member);
@@ -267,12 +275,10 @@ export class MemberPlatformMembership extends QueryableModel {
                 }
 
                 this.trialUntil = trialUntil.toJSDate();
-            }
-            else {
+            } else {
                 this.trialUntil = null;
             }
-        }
-        else {
+        } else {
             // No trial
             this.trialUntil = null;
         }
@@ -347,8 +353,7 @@ export class MemberPlatformMembership extends QueryableModel {
             if (alreadyUsed < periodConfig.amountFree) {
                 freeDays = periodConfig.amountFree - alreadyUsed;
                 console.log('Free membership created for ', this.id, periodConfig.amountFree, alreadyUsed);
-            }
-            else {
+            } else {
                 console.log('No free membership created for', this.id, periodConfig.amountFree, alreadyUsed);
             }
         }
@@ -359,8 +364,7 @@ export class MemberPlatformMembership extends QueryableModel {
             this.priceWithoutDiscount = earliestPriceConfig.calculatePrice(tagIds, false, days);
             this.price = priceConfig.calculatePrice(tagIds, shouldApplyReducedPrice, Math.max(0, days - freeDays));
             this.freeAmount = Math.min(days, freeDays);
-        }
-        else {
+        } else {
             this.priceWithoutDiscount = earliestPriceConfig.getBasePrice(tagIds, false);
             this.price = priceConfig.getBasePrice(tagIds, shouldApplyReducedPrice);
             this.maximumFreeAmount = this.price > 0 ? 1 : 0;