From 147e0cc0d55f17049fd858dcb84564f5af7ee4a7 Mon Sep 17 00:00:00 2001
From: Simon Backx <simon@ghost.org>
Date: Tue, 28 Mar 2023 11:42:30 +0200
Subject: [PATCH] Renamed newsletter to newsletter_name in post metrics export

no issue
---
 ghost/posts-service/lib/PostsExporter.js       | 4 ++--
 ghost/posts-service/test/PostsExporter.test.js | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ghost/posts-service/lib/PostsExporter.js b/ghost/posts-service/lib/PostsExporter.js
index a0123bbdf8..8c81d67685 100644
--- a/ghost/posts-service/lib/PostsExporter.js
+++ b/ghost/posts-service/lib/PostsExporter.js
@@ -83,7 +83,7 @@ class PostsExporter {
                 tags: post.related('tags').map(tag => tag.get('name')).join(', '),
                 post_access: this.postAccessToString(post),
                 email_recipients: email ? this.humanReadableEmailRecipientFilter(email?.get('recipient_filter'), labels) : null,
-                newsletter: newsletters.length > 1 && post.get('newsletter_id') && email ? newsletters.find(newsletter => newsletter.get('id') === post.get('newsletter_id'))?.get('name') : null,
+                newsletter_name: newsletters.length > 1 && post.get('newsletter_id') && email ? newsletters.find(newsletter => newsletter.get('id') === post.get('newsletter_id'))?.get('name') : null,
                 sends: email?.get('email_count') ?? null,
                 opens: trackOpens ? (email?.get('opened_count') ?? null) : null,
                 clicks: showEmailClickAnalytics ? (post.get('count__clicks') ?? 0) : null,
@@ -99,7 +99,7 @@ class PostsExporter {
             const removeableColumns = [];
 
             if (newsletters.length <= 1) {
-                removeableColumns.push('newsletter');
+                removeableColumns.push('newsletter_name');
             }
 
             if (!membersEnabled) {
diff --git a/ghost/posts-service/test/PostsExporter.test.js b/ghost/posts-service/test/PostsExporter.test.js
index 16be9e3f50..0d3eed30d5 100644
--- a/ghost/posts-service/test/PostsExporter.test.js
+++ b/ghost/posts-service/test/PostsExporter.test.js
@@ -116,7 +116,7 @@ describe('PostsExporter', function () {
             assert.equal(posts.length, 1);
 
             // Hides newsletter column
-            assert.equal(posts[0].newsletter, undefined);
+            assert.equal(posts[0].newsletter_name, undefined);
         });
 
         it('Adds newsletter columns if multiple newsletters', async function () {
@@ -134,8 +134,8 @@ describe('PostsExporter', function () {
             assert.equal(posts.length, 2);
 
             // Shows newsletter column
-            assert.equal(posts[0].newsletter, 'Daily Newsletter');
-            assert.equal(posts[1].newsletter, 'Weekly Newsletter');
+            assert.equal(posts[0].newsletter_name, 'Daily Newsletter');
+            assert.equal(posts[1].newsletter_name, 'Weekly Newsletter');
 
             // Shows feedback columns
             assert.equal(posts[0].reacted_with_more_like_this, post.count__positive_feedback);
@@ -169,7 +169,7 @@ describe('PostsExporter', function () {
             assert.equal(posts[0].sends, undefined);
             assert.equal(posts[0].opens, undefined);
             assert.equal(posts[0].clicks, undefined);
-            assert.equal(posts[0].newsletter, undefined);
+            assert.equal(posts[0].newsletter_name, undefined);
 
             // Signups
             assert.equal(posts[0].free_signups, undefined);