From de0dc7a9a0d3cd9f7960003cec02322c2abeb1ed Mon Sep 17 00:00:00 2001
From: Thibaut Patel <thibaut@ghost.org>
Date: Wed, 19 Jan 2022 11:47:35 +0100
Subject: [PATCH] Added the full related email in email recipient events

refs https://github.com/TryGhost/Team/issues/1277

- Prevents the admin from doing extra api calls to retrieve the email records
---
 ghost/members-api/lib/repositories/event.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/ghost/members-api/lib/repositories/event.js b/ghost/members-api/lib/repositories/event.js
index 95a417655b..ff75d98be8 100644
--- a/ghost/members-api/lib/repositories/event.js
+++ b/ghost/members-api/lib/repositories/event.js
@@ -111,7 +111,7 @@ module.exports = class EventRepository {
     }
 
     async getEmailDelieveredEvents(options = {}) {
-        options.withRelated = ['member'];
+        options.withRelated = ['member', 'email'];
         options.filter = 'delivered_at:-null';
         const {data: models, meta} = await this._EmailRecipient.findPage(
             options
@@ -123,8 +123,8 @@ module.exports = class EventRepository {
                 data: {
                     member_id: data.get('member_id'),
                     created_at: data.get('delivered_at'),
-                    email_id: data.get('email_id'),
-                    member: data.related('member').toJSON()
+                    member: data.related('member').toJSON(),
+                    email: data.related('email').toJSON()
                 }
             };
         });
@@ -136,7 +136,7 @@ module.exports = class EventRepository {
     }
 
     async getEmailOpenedEvents(options = {}) {
-        options.withRelated = ['member'];
+        options.withRelated = ['member', 'email'];
         options.filter = 'opened_at:-null';
         const {data: models, meta} = await this._EmailRecipient.findPage(
             options
@@ -148,8 +148,8 @@ module.exports = class EventRepository {
                 data: {
                     member_id: data.get('member_id'),
                     created_at: data.get('opened_at'),
-                    email_id: data.get('email_id'),
-                    member: data.related('member').toJSON()
+                    member: data.related('member').toJSON(),
+                    email: data.related('email').toJSON()
                 }
             };
         });
@@ -161,7 +161,7 @@ module.exports = class EventRepository {
     }
 
     async getEmailFailedEvents(options = {}) {
-        options.withRelated = ['member'];
+        options.withRelated = ['member', 'email'];
         options.filter = 'failed_at:-null';
         const {data: models, meta} = await this._EmailRecipient.findPage(
             options
@@ -173,8 +173,8 @@ module.exports = class EventRepository {
                 data: {
                     member_id: data.get('member_id'),
                     created_at: data.get('failed_at'),
-                    email_id: data.get('email_id'),
-                    member: data.related('member').toJSON()
+                    member: data.related('member').toJSON(),
+                    email: data.related('email').toJSON()
                 }
             };
         });