@stamhoofd/models 2.91.0 → 2.93.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/WebshopUitpasNumber.ts

@@ -54,8 +54,28 @@ export class WebshopUitpasNumber extends QueryableModel {
     @column({ type: 'integer', nullable: true })
     reducedPriceUitpas: number | null = null;
 
-    static async areUitpasNumbersUsed(webshopId: string, productId: string, uitpasNumbers: string[]): Promise<boolean> {
-        const hasBeenUsed = !!(await WebshopUitpasNumber.select().where('webshopId', webshopId).andWhere('productId', productId).andWhere('uitpasNumber', uitpasNumbers).first(false));
-        return hasBeenUsed;
+    static async areUitpasNumbersUsed(webshopId: string, productId: string, uitpasNumbers: string[], uitpasEventUrl?: string, existingOrderId?: string): Promise<boolean> {
+        let query = WebshopUitpasNumber
+            .select()
+            .where('webshopId', webshopId)
+            .andWhere('uitpasNumber', uitpasNumbers);
+
+        if (uitpasEventUrl) {
+            query = query.andWhere(SQL.where('productId', productId).or('uitpasEventUrl', uitpasEventUrl));
+        }
+        else {
+            query = query.andWhere('productId', productId);
+        }
+
+        if (existingOrderId !== undefined) {
+            query = query.andWhereNot('orderId', existingOrderId);
+        }
+
+        return !!await query.first(false); ;
+    }
+
+    static async areThereRegisteredTicketSales(webshopId: string): Promise<boolean> {
+        const query = WebshopUitpasNumber.select().where('webshopId', webshopId).andWhereNot('ticketSaleId', null);
+        return !!await query.first(false);
     }
 }