@stamhoofd/models 2.92.0 → 2.94.0

package/src/models/EmailRecipient.ts

@@ -4,6 +4,7 @@ import { v4 as uuidv4 } from 'uuid';
 
 import { ArrayDecoder } from '@simonbackx/simple-encoding';
 import { QueryableModel } from '@stamhoofd/sql';
+import { SimpleErrors } from '@simonbackx/simple-errors';
 
 export class EmailRecipient extends QueryableModel {
     static table = 'email_recipients';
@@ -38,15 +39,58 @@ export class EmailRecipient extends QueryableModel {
     @column({ type: 'string', nullable: true })
     lastName: string | null = null;
 
-    @column({ type: 'string' })
-    email: string;
+    @column({ type: 'string', nullable: true })
+    email: string | null = null;
 
     @column({ type: 'json', decoder: new ArrayDecoder(Replacement) })
     replacements: Replacement[] = [];
 
+    /**
+     * @deprecated
+     * Legacy field
+     */
     @column({ type: 'string', nullable: true })
     failErrorMessage: string | null = null;
 
+    @column({ type: 'json', nullable: true, decoder: SimpleErrors })
+    failError: SimpleErrors | null = null;
+
+    @column({ type: 'string', nullable: true })
+    organizationId: string | null = null;
+
+    /**
+     * When set, the member will be ablse to see this message in the member portal.
+     */
+    @column({ type: 'string', nullable: true })
+    memberId: string | null = null;
+
+    /**
+     * When set, the user will be able to see this message in the member portal.
+     */
+    @column({ type: 'string', nullable: true })
+    userId: string | null = null;
+
+    /**
+     * Set when the email was send, but we received a hard bounce for this specific email
+     * Contains the full output we received in the bounce
+     */
+    @column({ type: 'string', nullable: true })
+    hardBounceError: string | null = null;
+
+    /**
+     * Set when the email was send, but we received a soft bounce for this specific email
+     * Contains the full output we received in the bounce
+     */
+    @column({ type: 'string', nullable: true })
+    softBounceError: string | null = null;
+
+    /**
+     * Set when the email was send, but was marked as spam.
+     * The error message contains any relevant info we received from our provider. E.g. type of spam (virus, fraud, abuse...)
+     */
+    @column({ type: 'string', nullable: true })
+    spamComplaintError: string | null = null;
+
     @column({ type: 'integer' })
     failCount = 0;
 

package/src/models/Event.ts

@@ -87,6 +87,8 @@ export class Event extends QueryableModel {
         group.settings.requireGroupIds = this.meta.groups?.map(g => g.id) ?? [];
         group.settings.startDate = this.startDate;
         group.settings.endDate = this.endDate;
+        group.settings.minAge = this.meta.minAge ?? null;
+        group.settings.maxAge = this.meta.maxAge ?? null;
 
         if (group.type === GroupType.EventRegistration) {
             // Don't change the name of the waiting list

package/src/models/Platform.ts

@@ -25,6 +25,9 @@ export class Platform extends QueryableModel {
     @column({ type: 'string', nullable: true })
     previousPeriodId: string | null = null;
 
+    @column({ type: 'string', nullable: true })
+    nextPeriodId: string | null = null;
+
     @column({ type: 'string', nullable: true })
     membershipOrganizationId: string | null = null;
 
@@ -56,6 +59,7 @@ export class Platform extends QueryableModel {
     async setPreviousPeriodId() {
         const period = await RegistrationPeriod.getByID(this.periodId);
         this.previousPeriodId = period?.previousPeriodId ?? null;
+        this.nextPeriodId = period?.nextPeriodId ?? null;
     }
 
     static async getSharedPrivateStruct(): Promise<PlatformStruct & { privateConfig: PlatformPrivateConfig }> {

package/src/models/RegistrationPeriod.ts

@@ -16,6 +16,9 @@ export class RegistrationPeriod extends QueryableModel {
     @column({ type: 'string', nullable: true })
     previousPeriodId: string | null = null;
 
+    @column({ type: 'string', nullable: true })
+    nextPeriodId: string | null = null;
+
     @column({ type: 'string', nullable: true })
     organizationId: string | null = null;
 
@@ -74,12 +77,25 @@ export class RegistrationPeriod extends QueryableModel {
         return RegistrationPeriod.fromRow(result[this.table]) ?? null;
     }
 
-    async setPreviousPeriodId() {
-        const allPeriods = await RegistrationPeriod.where({ organizationId: this.organizationId });
+    async updatePreviousNextPeriods() {
+        return await RegistrationPeriod.updatePreviousNextPeriods(this.organizationId, this);
+    }
+
+    static async updatePreviousNextPeriods(organizationId: string | null, existingReference?: RegistrationPeriod) {
+        const allPeriods = await RegistrationPeriod.select().where('organizationId', organizationId).fetch();
 
         // Include self if not yet in database
-        if (!this.existsInDatabase) {
-            allPeriods.push(this);
+        if (existingReference) {
+            if (!existingReference.existsInDatabase) {
+                allPeriods.push(existingReference);
+            }
+            else {
+            // Replace self with this
+                const index = allPeriods.findIndex(p => p.id === existingReference.id);
+                if (index !== -1) {
+                    allPeriods[index] = existingReference;
+                }
+            }
         }
 
         // Sort by start date
@@ -89,12 +105,18 @@ export class RegistrationPeriod extends QueryableModel {
         let previousPeriod: RegistrationPeriod | null = null;
 
         for (const period of allPeriods) {
-            if (period.id === this.id) {
-                break;
+            period.previousPeriodId = previousPeriod?.id ?? null;
+            period.nextPeriodId = null;
+
+            if (previousPeriod) {
+                previousPeriod.nextPeriodId = period.id;
             }
             previousPeriod = period;
         }
 
-        this.previousPeriodId = previousPeriod?.id ?? null;
+        // Save all
+        for (const period of allPeriods) {
+            await period.save();
+        }
     }
 }