@stamhoofd/models 2.39.1 → 2.40.1

package/src/models/Email.ts

@@ -1,11 +1,11 @@
 import { column, Model } from '@simonbackx/simple-database';
 import { EditorSmartButton, EditorSmartVariable, EmailAttachment, EmailPreview, EmailRecipientFilter, EmailRecipientFilterType, EmailRecipientsStatus, EmailRecipient as EmailRecipientStruct, EmailStatus, Email as EmailStruct, getExampleRecipient, LimitedFilteredRequest, PaginatedResponse, Recipient, SortItemDirection } from '@stamhoofd/structures';
-import { v4 as uuidv4 } from "uuid";
+import { v4 as uuidv4 } from 'uuid';
 
 import { AnyDecoder, ArrayDecoder } from '@simonbackx/simple-encoding';
 import { SimpleError } from '@simonbackx/simple-errors';
 import { I18n } from '@stamhoofd/backend-i18n';
-import { Email as EmailClass } from "@stamhoofd/email";
+import { Email as EmailClass } from '@stamhoofd/email';
 import { QueueHandler } from '@stamhoofd/queues';
 import { SQL, SQLWhereSign } from '@stamhoofd/sql';
 import { Formatter } from '@stamhoofd/utility';
@@ -14,201 +14,198 @@ import { EmailRecipient } from './EmailRecipient';
 import { Organization } from './Organization';
 
 export class Email extends Model {
-    static table = "emails";
+    static table = 'emails';
 
     @column({
-        primary: true, type: "string", beforeSave(value) {
+        primary: true, type: 'string', beforeSave(value) {
             return value ?? uuidv4();
-        }
+        },
     })
     id!: string;
 
-    @column({ type: "string", nullable: true })
-    organizationId: string|null = null;
+    @column({ type: 'string', nullable: true })
+    organizationId: string | null = null;
 
-    @column({ type: "string", nullable: true})
-    userId: string|null = null;
+    @column({ type: 'string', nullable: true })
+    userId: string | null = null;
 
-    @column({ type: "json", decoder: EmailRecipientFilter })
-    recipientFilter: EmailRecipientFilter = EmailRecipientFilter.create({})
+    @column({ type: 'json', decoder: EmailRecipientFilter })
+    recipientFilter: EmailRecipientFilter = EmailRecipientFilter.create({});
 
-    @column({ type: "string", nullable: true })
-    subject: string|null
+    @column({ type: 'string', nullable: true })
+    subject: string | null;
 
-    /** Raw json structure to edit the template */ 
-    @column({ type: "json", decoder: AnyDecoder })
+    /** Raw json structure to edit the template */
+    @column({ type: 'json', decoder: AnyDecoder })
     json: any = {};
 
-    @column({ type: "string", nullable: true })
-    html: string|null = null
+    @column({ type: 'string', nullable: true })
+    html: string | null = null;
 
-    @column({ type: "string", nullable: true})
-    text: string|null = null
+    @column({ type: 'string', nullable: true })
+    text: string | null = null;
 
-    @column({ type: "string", nullable: true})
-    fromAddress: string|null = null
+    @column({ type: 'string', nullable: true })
+    fromAddress: string | null = null;
 
-    @column({ type: "string", nullable: true})
-    fromName: string|null = null
+    @column({ type: 'string', nullable: true })
+    fromName: string | null = null;
 
-    @column({ type: "integer", nullable: true})
-    recipientCount: number|null = null
+    @column({ type: 'integer', nullable: true })
+    recipientCount: number | null = null;
 
-    @column({ type: "string" })
+    @column({ type: 'string' })
     status = EmailStatus.Draft;
 
-    @column({ type: "string" })
+    @column({ type: 'string' })
     recipientsStatus = EmailRecipientsStatus.NotCreated;
 
     /**
      * todo: ignore automatically
      */
-    @column({ type: "json", decoder: new ArrayDecoder(EmailAttachment) })
-    attachments: EmailAttachment[] = []
+    @column({ type: 'json', decoder: new ArrayDecoder(EmailAttachment) })
+    attachments: EmailAttachment[] = [];
 
-    
     @column({
-        type: "datetime",
-        nullable: true
+        type: 'datetime',
+        nullable: true,
     })
-    sentAt: Date|null = null
+    sentAt: Date | null = null;
 
     @column({
-        type: "datetime", beforeSave(old?: any) {
+        type: 'datetime', beforeSave(old?: any) {
             if (old !== undefined) {
                 return old;
             }
-            const date = new Date()
-            date.setMilliseconds(0)
-            return date
-        }
+            const date = new Date();
+            date.setMilliseconds(0);
+            return date;
+        },
     })
-    createdAt: Date
+    createdAt: Date;
 
     @column({
-        type: "datetime", beforeSave() {
-            const date = new Date()
-            date.setMilliseconds(0)
-            return date
+        type: 'datetime', beforeSave() {
+            const date = new Date();
+            date.setMilliseconds(0);
+            return date;
         },
-        skipUpdate: true
+        skipUpdate: true,
     })
-    updatedAt: Date
+    updatedAt: Date;
 
     static recipientLoaders: Map<EmailRecipientFilterType, {
-        fetch(request: LimitedFilteredRequest): Promise<PaginatedResponse<EmailRecipientStruct[], LimitedFilteredRequest>>
-        count(request: LimitedFilteredRequest): Promise<number>
-    }> = new Map()
+        fetch(request: LimitedFilteredRequest): Promise<PaginatedResponse<EmailRecipientStruct[], LimitedFilteredRequest>>;
+        count(request: LimitedFilteredRequest): Promise<number>;
+    }> = new Map();
 
     throwIfNotReadyToSend() {
         if (this.subject == null || this.subject.length == 0) {
             throw new SimpleError({
                 code: 'invalid_field',
                 message: 'Missing subject',
-                human: 'Vul een onderwerp in voor je een e-mail verstuurt'
-            })
+                human: 'Vul een onderwerp in voor je een e-mail verstuurt',
+            });
         }
 
         if (this.text == null || this.text.length == 0) {
             throw new SimpleError({
                 code: 'invalid_field',
                 message: 'Missing text',
-                human: 'Vul een tekst in voor je een e-mail verstuurt'
-            })
+                human: 'Vul een tekst in voor je een e-mail verstuurt',
+            });
         }
 
         if (this.html == null || this.html.length == 0) {
             throw new SimpleError({
                 code: 'invalid_field',
                 message: 'Missing html',
-                human: 'Vul een tekst in voor je een e-mail verstuurt'
-            })
+                human: 'Vul een tekst in voor je een e-mail verstuurt',
+            });
         }
 
         if (this.fromAddress == null || this.fromAddress.length == 0) {
             throw new SimpleError({
                 code: 'invalid_field',
                 message: 'Missing from',
-                human: 'Vul een afzender in voor je een e-mail verstuurt'
-            })
+                human: 'Vul een afzender in voor je een e-mail verstuurt',
+            });
         }
 
-        this.validateAttachments()
+        this.validateAttachments();
     }
-    
+
     validateAttachments() {
         // Validate attachments
         const size = this.attachments.reduce((value: number, attachment) => {
-            return value + attachment.bytes
-        }, 0)
-        
-        if (size > 9.5*1024*1024) {
+            return value + attachment.bytes;
+        }, 0);
+
+        if (size > 9.5 * 1024 * 1024) {
             throw new SimpleError({
-                code: "too_big_attachments",
-                message: "Too big attachments",
-                human: "Jouw bericht is te groot. Grote bijlages verstuur je beter niet via e-mail, je plaatst dan best een link naar de locatie in bv. Google Drive. De maximale grootte van een e-mail is 10MB, inclusief het bericht. Als je grote bestanden verstuurt kan je ze ook proberen te verkleinen.",
-                field: "attachments"
-            })
+                code: 'too_big_attachments',
+                message: 'Too big attachments',
+                human: 'Jouw bericht is te groot. Grote bijlages verstuur je beter niet via e-mail, je plaatst dan best een link naar de locatie in bv. Google Drive. De maximale grootte van een e-mail is 10MB, inclusief het bericht. Als je grote bestanden verstuurt kan je ze ook proberen te verkleinen.',
+                field: 'attachments',
+            });
         }
 
         const safeContentTypes = [
-            "application/msword",
-            "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
-            "application/vnd.ms-excel",
-            "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
-            "application/pdf",
-            "image/jpeg",
-            "image/png",
-            "image/gif"
-        ]
+            'application/msword',
+            'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+            'application/vnd.ms-excel',
+            'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+            'application/pdf',
+            'image/jpeg',
+            'image/png',
+            'image/gif',
+        ];
 
         for (const attachment of this.attachments) {
             if (attachment.contentType && !safeContentTypes.includes(attachment.contentType)) {
                 throw new SimpleError({
-                    code: "content_type_not_supported",
-                    message: "Content-Type not supported",
-                    human: "Het bestandstype van jouw bijlage wordt niet ondersteund of is onveilig om in een e-mail te plaatsen. Overweeg om je bestand op bv. Google Drive te zetten en de link in jouw e-mail te zetten.",
-                    field: "attachments"
-                })
+                    code: 'content_type_not_supported',
+                    message: 'Content-Type not supported',
+                    human: 'Het bestandstype van jouw bijlage wordt niet ondersteund of is onveilig om in een e-mail te plaatsen. Overweeg om je bestand op bv. Google Drive te zetten en de link in jouw e-mail te zetten.',
+                    field: 'attachments',
+                });
             }
         }
     }
 
     getFromAddress() {
         if (!this.fromName) {
-            return this.fromAddress!
+            return this.fromAddress!;
         }
 
-        const cleanedName = Formatter.emailSenderName(this.fromName)
+        const cleanedName = Formatter.emailSenderName(this.fromName);
         if (cleanedName.length < 2) {
-            return this.fromAddress!
+            return this.fromAddress!;
         }
-        return '"'+cleanedName+'" <'+this.fromAddress+'>'
-
+        return '"' + cleanedName + '" <' + this.fromAddress + '>';
     }
 
-    getDefaultFromAddress(organization?: Organization|null): string {
-        const i18n = new I18n("nl", "BE")
-        let address = "noreply@" + i18n.localizedDomains.defaultBroadcastEmail()
+    getDefaultFromAddress(organization?: Organization | null): string {
+        const i18n = new I18n('nl', 'BE');
+        let address = 'noreply@' + i18n.localizedDomains.defaultBroadcastEmail();
 
         if (organization) {
             address = organization.getDefaultFrom(organization.i18n, false, 'broadcast');
         }
 
         if (!this.fromName) {
-            return address
+            return address;
         }
 
-        const cleanedName = Formatter.emailSenderName(this.fromName)
+        const cleanedName = Formatter.emailSenderName(this.fromName);
         if (cleanedName.length < 2) {
-            return address
+            return address;
         }
-        return '"'+cleanedName+'" <'+address+'>'
-
+        return '"' + cleanedName + '" <' + address + '>';
     }
 
     async send() {
-        this.throwIfNotReadyToSend()
+        this.throwIfNotReadyToSend();
         await this.save();
 
         const id = this.id;
@@ -218,8 +215,8 @@ export class Email extends Model {
                 throw new SimpleError({
                     code: 'not_found',
                     message: 'Email not found',
-                    human: 'De e-mail die je probeert te versturen bestaat niet meer'
-                })
+                    human: 'De e-mail die je probeert te versturen bestaat niet meer',
+                });
             }
             if (upToDate.status === EmailStatus.Sent) {
                 // Already done
@@ -227,35 +224,36 @@ export class Email extends Model {
                 return;
             }
             const organization = upToDate.organizationId ? await Organization.getByID(upToDate.organizationId) : null;
-            upToDate.throwIfNotReadyToSend()
+            upToDate.throwIfNotReadyToSend();
 
-            let from = upToDate.getDefaultFromAddress(organization)
+            let from = upToDate.getDefaultFromAddress(organization);
             let replyTo: string | null = upToDate.getFromAddress();
 
             if (!from) {
                 throw new SimpleError({
                     code: 'invalid_field',
                     message: 'Missing from',
-                    human: 'Vul een afzender in voor je een e-mail verstuurt'
-                })
+                    human: 'Vul een afzender in voor je een e-mail verstuurt',
+                });
             }
 
             // Can we send from this e-mail or reply-to?
             if (organization) {
-                if (organization.privateMeta.mailDomain && organization.privateMeta.mailDomainActive && upToDate.fromAddress!.endsWith("@"+organization.privateMeta.mailDomain)) {
+                if (organization.privateMeta.mailDomain && organization.privateMeta.mailDomainActive && upToDate.fromAddress!.endsWith('@' + organization.privateMeta.mailDomain)) {
                     from = upToDate.getFromAddress();
                     replyTo = null;
                 }
-            } else {
+            }
+            else {
                 // Platform
                 // Is the platform allowed to send from the provided email address?
                 const domains = [
                     ...Object.values(STAMHOOFD.domains.defaultTransactionalEmail ?? {}),
-                    ...Object.values(STAMHOOFD.domains.defaultBroadcastEmail ?? {})
-                ]
+                    ...Object.values(STAMHOOFD.domains.defaultBroadcastEmail ?? {}),
+                ];
 
                 for (const domain of domains) {
-                    if (upToDate.fromAddress!.endsWith("@"+domain)) {
+                    if (upToDate.fromAddress!.endsWith('@' + domain)) {
                         from = upToDate.getFromAddress();
                         replyTo = null;
                         break;
@@ -263,12 +261,12 @@ export class Email extends Model {
                 }
             }
 
-            upToDate.status = EmailStatus.Sending
-            upToDate.sentAt = upToDate.sentAt ?? new Date()
+            upToDate.status = EmailStatus.Sending;
+            upToDate.sentAt = upToDate.sentAt ?? new Date();
             await upToDate.save();
 
             // Create recipients if not yet created
-            await upToDate.buildRecipients()
+            await upToDate.buildRecipients();
 
             // Refresh model
             upToDate = await Email.getByID(id);
@@ -276,16 +274,16 @@ export class Email extends Model {
                 throw new SimpleError({
                     code: 'not_found',
                     message: 'Email not found',
-                    human: 'De e-mail die je probeert te versturen bestaat niet meer'
-                })
+                    human: 'De e-mail die je probeert te versturen bestaat niet meer',
+                });
             }
 
             if (upToDate.recipientsStatus !== EmailRecipientsStatus.Created) {
                 throw new SimpleError({
                     code: 'recipients_not_created',
                     message: 'Failed to create recipients',
-                    human: 'Er ging iets mis bij het aanmaken van de afzenders.'
-                })
+                    human: 'Er ging iets mis bij het aanmaken van de afzenders.',
+                });
             }
 
             // Start actually sending in batches of recipients that are not yet sent
@@ -294,27 +292,26 @@ export class Email extends Model {
             const recipientsSet = new Set<string>();
 
             const attachments = upToDate.attachments.map((attachment, index) => {
-                let filename = "bijlage-"+index;
-                
-                if (attachment.contentType == "application/pdf") {
+                let filename = 'bijlage-' + index;
+
+                if (attachment.contentType == 'application/pdf') {
                     // tmp solution for pdf only
-                    filename += ".pdf"
+                    filename += '.pdf';
                 }
-    
+
                 // Correct file name if needed
                 if (attachment.filename) {
-                    filename = attachment.filename.toLowerCase().replace(/[^a-z0-9.]+/g, "-").replace(/^-+/, "").replace(/-+$/, "")
+                    filename = attachment.filename.toLowerCase().replace(/[^a-z0-9.]+/g, '-').replace(/^-+/, '').replace(/-+$/, '');
                 }
-    
+
                 return {
                     filename: filename,
                     content: attachment.content,
                     contentType: attachment.contentType ?? undefined,
-                    encoding: "base64"
-                }
-            })
+                    encoding: 'base64',
+                };
+            });
 
-            // eslint-disable-next-line no-constant-condition
             while (true) {
                 const data = await SQL.select()
                     .from('email_recipients')
@@ -324,7 +321,7 @@ export class Email extends Model {
                     .orderBy(SQL.column('id'), 'ASC')
                     .limit(batchSize)
                     .fetch();
-                
+
                 const recipients = EmailRecipient.fromRows(data, 'email_recipients');
 
                 if (recipients.length == 0) {
@@ -335,54 +332,55 @@ export class Email extends Model {
 
                 for (const recipient of recipients) {
                     if (recipientsSet.has(recipient.id)) {
-                        console.error('Found duplicate recipient while sending email', recipient.id)
+                        console.error('Found duplicate recipient while sending email', recipient.id);
                         continue;
                     }
 
                     recipientsSet.add(recipient.email);
                     idPointer = recipient.id;
 
-                    let promiseResolve: (value: void | PromiseLike<void>) => void
+                    let promiseResolve: (value: void | PromiseLike<void>) => void;
                     const promise = new Promise<void>((resolve) => {
                         promiseResolve = resolve;
                     });
-                    sendingPromises.push(promise)
+                    sendingPromises.push(promise);
 
-                    const callback = async (error: Error|null) => {
+                    const callback = async (error: Error | null) => {
                         if (error === null) {
                             // Mark saved
                             recipient.sentAt = new Date();
-                            await recipient.save()
-                        } else {
+                            await recipient.save();
+                        }
+                        else {
                             recipient.failCount += 1;
                             recipient.failErrorMessage = error.message;
                             recipient.firstFailedAt = recipient.firstFailedAt ?? new Date();
                             recipient.lastFailedAt = new Date();
-                            await recipient.save()
+                            await recipient.save();
                         }
-                        promiseResolve()
-                    }
+                        promiseResolve();
+                    };
 
                     // Do send the email
                     // Create e-mail builder
                     const builder = await getEmailBuilder(organization ?? null, {
                         recipients: [
                             Recipient.create({
-                                ...recipient
-                            })
+                                ...recipient,
+                            }),
                         ],
-                        from, 
+                        from,
                         replyTo,
-                        subject: upToDate.subject!, 
+                        subject: upToDate.subject!,
                         html: upToDate.html!,
-                        type: "broadcast",
+                        type: 'broadcast',
                         attachments,
-                        callback(error: Error|null ) {
-                            callback(error).catch(console.error)
+                        callback(error: Error | null) {
+                            callback(error).catch(console.error);
                         },
-                    })
+                    });
 
-                    EmailClass.schedule(builder)
+                    EmailClass.schedule(builder);
                 }
 
                 await Promise.all(sendingPromises);
@@ -398,7 +396,7 @@ export class Email extends Model {
 
     updateCount() {
         const id = this.id;
-        QueueHandler.schedule('email-count-'+this.id, async function () {
+        QueueHandler.schedule('email-count-' + this.id, async function () {
             let upToDate = await Email.getByID(id);
 
             if (!upToDate || upToDate.sentAt || !upToDate.id || upToDate.status !== EmailStatus.Draft) {
@@ -413,24 +411,23 @@ export class Email extends Model {
 
             try {
                 for (const subfilter of upToDate.recipientFilter.filters) {
-
                     // Create recipients
                     const loader = Email.recipientLoaders.get(subfilter.type);
 
                     if (!loader) {
-                        throw new Error('Loader for type ' + subfilter.type+' has not been initialised on the Email model')
+                        throw new Error('Loader for type ' + subfilter.type + ' has not been initialised on the Email model');
                     }
 
                     const request = new LimitedFilteredRequest({
                         filter: subfilter.filter,
-                        sort: [{key: 'id', order: SortItemDirection.ASC}],
+                        sort: [{ key: 'id', order: SortItemDirection.ASC }],
                         limit: 1,
                         search: subfilter.search,
-                    })
+                    });
 
                     const c = await loader.count(request);
-                    
-                    count += c
+
+                    count += c;
                 }
 
                 // Check if we have a more reliable recipientCount in the meantime
@@ -444,8 +441,9 @@ export class Email extends Model {
                 }
                 upToDate.recipientCount = count;
                 await upToDate.save();
-            } catch (e) {
-                console.error("Failed to update count for email", id);
+            }
+            catch (e) {
+                console.error('Failed to update count for email', id);
                 console.error(e);
             }
         }).catch(console.error);
@@ -453,7 +451,7 @@ export class Email extends Model {
 
     async buildRecipients() {
         const id = this.id;
-        await QueueHandler.schedule('email-build-recipients-'+this.id, async function () {
+        await QueueHandler.schedule('email-build-recipients-' + this.id, async function () {
             const upToDate = await Email.getByID(id);
 
             if (!upToDate || !upToDate.id) {
@@ -480,28 +478,27 @@ export class Email extends Model {
                 await SQL
                     .delete()
                     .from(
-                        SQL.table('email_recipients')
+                        SQL.table('email_recipients'),
                     )
                     .where(SQL.column('emailId'), upToDate.id);
 
                 for (const subfilter of upToDate.recipientFilter.filters) {
-
                     // Create recipients
                     const loader = Email.recipientLoaders.get(subfilter.type);
 
                     if (!loader) {
-                        throw new Error('Loader for type ' + subfilter.type+' has not been initialised on the Email model')
+                        throw new Error('Loader for type ' + subfilter.type + ' has not been initialised on the Email model');
                     }
 
-                    let request: LimitedFilteredRequest|null = new LimitedFilteredRequest({
+                    let request: LimitedFilteredRequest | null = new LimitedFilteredRequest({
                         filter: subfilter.filter,
-                        sort: [{key: 'id', order: SortItemDirection.ASC}],
+                        sort: [{ key: 'id', order: SortItemDirection.ASC }],
                         limit: 1000,
                         search: subfilter.search,
-                    })
+                    });
 
                     while (request) {
-                        console.log('Loading email page', subfilter.type, request)
+                        console.log('Loading email page', subfilter.type, request);
                         const response = await loader.fetch(request);
 
                         count += response.results.length;
@@ -509,10 +506,10 @@ export class Email extends Model {
                         for (const item of response.results) {
                             const recipient = new EmailRecipient();
                             recipient.emailId = upToDate.id;
-                            recipient.email = item.email
-                            recipient.firstName = item.firstName
-                            recipient.lastName = item.lastName
-                            recipient.replacements = item.replacements
+                            recipient.email = item.email;
+                            recipient.firstName = item.firstName;
+                            recipient.lastName = item.lastName;
+                            recipient.replacements = item.replacements;
 
                             await recipient.save();
                         }
@@ -528,8 +525,9 @@ export class Email extends Model {
                 upToDate.recipientsStatus = EmailRecipientsStatus.Created;
                 upToDate.recipientCount = count;
                 await upToDate.save();
-            } catch (e) {
-                console.error("Failed to build recipients for email", id);
+            }
+            catch (e) {
+                console.error('Failed to build recipients for email', id);
                 console.error(e);
                 upToDate.recipientsStatus = EmailRecipientsStatus.NotCreated;
                 await upToDate.save();
@@ -539,7 +537,7 @@ export class Email extends Model {
 
     async buildExampleRecipient() {
         const id = this.id;
-        await QueueHandler.schedule('email-build-recipients-'+this.id, async function () {
+        await QueueHandler.schedule('email-build-recipients-' + this.id, async function () {
             const upToDate = await Email.getByID(id);
 
             if (!upToDate || upToDate.sentAt || !upToDate.id) {
@@ -555,28 +553,27 @@ export class Email extends Model {
                 await SQL
                     .delete()
                     .from(
-                        SQL.table('email_recipients')
+                        SQL.table('email_recipients'),
                     )
                     .where(SQL.column('emailId'), upToDate.id);
 
                 for (const subfilter of upToDate.recipientFilter.filters) {
-
                     // Create recipients
                     const loader = Email.recipientLoaders.get(subfilter.type);
 
                     if (!loader) {
-                        throw new Error('Loader for type ' + subfilter.type+' has not been initialised on the Email model')
+                        throw new Error('Loader for type ' + subfilter.type + ' has not been initialised on the Email model');
                     }
 
-                    let request: LimitedFilteredRequest|null = new LimitedFilteredRequest({
+                    let request: LimitedFilteredRequest | null = new LimitedFilteredRequest({
                         filter: subfilter.filter,
-                        sort: [{key: 'id', order: SortItemDirection.ASC}],
+                        sort: [{ key: 'id', order: SortItemDirection.ASC }],
                         limit: 10,
                         search: subfilter.search,
-                    })
+                    });
 
                     while (request) {
-                        console.log('Loading email page', subfilter.type, request)
+                        console.log('Loading email page', subfilter.type, request);
                         const response = await loader.fetch(request);
 
                         // Note: it is possible that a result in the database doesn't return a recipient (in memory filtering)
@@ -585,10 +582,10 @@ export class Email extends Model {
                         for (const item of response.results) {
                             const recipient = new EmailRecipient();
                             recipient.emailId = upToDate.id;
-                            recipient.email = item.email
-                            recipient.firstName = item.firstName
-                            recipient.lastName = item.lastName
-                            recipient.replacements = item.replacements
+                            recipient.email = item.email;
+                            recipient.firstName = item.firstName;
+                            recipient.lastName = item.lastName;
+                            recipient.replacements = item.replacements;
                             await recipient.save();
                             return;
                         }
@@ -597,16 +594,17 @@ export class Email extends Model {
                     }
                 }
 
-                console.warn('No example recipient found for email', id)
-            } catch (e) {
-                console.error("Failed to build example recipient for email", id);
+                console.warn('No example recipient found for email', id);
+            }
+            catch (e) {
+                console.error('Failed to build example recipient for email', id);
                 console.error(e);
             }
         }).catch(console.error);
     }
 
     getStructure() {
-        return EmailStruct.create(this)
+        return EmailStruct.create(this);
     }
 
     async getPreviewStructure() {
@@ -615,27 +613,27 @@ export class Email extends Model {
             .where(SQL.column('emailId'), this.id)
             .first(false);
 
-            let recipientRow: EmailRecipientStruct | undefined;
+        let recipientRow: EmailRecipientStruct | undefined;
 
-            if(recipient) {
-                const emailRecipient = EmailRecipient.fromRow(recipient[EmailRecipient.table]);
-                if(emailRecipient) {
-                    recipientRow = emailRecipient.getStructure();
-                }
+        if (recipient) {
+            const emailRecipient = EmailRecipient.fromRow(recipient[EmailRecipient.table]);
+            if (emailRecipient) {
+                recipientRow = emailRecipient.getStructure();
             }
+        }
 
-            if(!recipientRow) {
-                recipientRow = getExampleRecipient();
-            }
+        if (!recipientRow) {
+            recipientRow = getExampleRecipient();
+        }
 
-            const smartVariables = recipientRow ? EditorSmartVariable.forRecipient(recipientRow) : []
-            const smartButtons = recipientRow ? EditorSmartButton.forRecipient(recipientRow) : []
-            
-            return EmailPreview.create({
-                ...this,
-                exampleRecipient: recipientRow,
-                smartVariables,
-                smartButtons
-            })
+        const smartVariables = recipientRow ? EditorSmartVariable.forRecipient(recipientRow) : [];
+        const smartButtons = recipientRow ? EditorSmartButton.forRecipient(recipientRow) : [];
+
+        return EmailPreview.create({
+            ...this,
+            exampleRecipient: recipientRow,
+            smartVariables,
+            smartButtons,
+        });
     }
 }