From 96e7187e8de448dc8bc659a7568d50f1cdb8ab1b Mon Sep 17 00:00:00 2001
From: Simon Backx <simon@ghost.org>
Date: Mon, 9 May 2022 10:56:36 +0200
Subject: [PATCH] Fixed members CSV export not filtering on subscribed (#14721)

refs https://ghost.slack.com/archives/C02G9E68C/p1651851268912299?thread_ts=1651848216.832419&cid=C02G9E68C

- When exporting members to CSV the subscribed filter was not working correctly
- Fixed by also applying the NQL mapping to the export endpoint
- This also changes the order of the members in the CSV export to match the order in admin/browse endpoint
---
 core/server/api/canary/utils/serializers/input/members.js | 6 ++++++
 test/e2e-api/admin/members.test.js                        | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/core/server/api/canary/utils/serializers/input/members.js b/core/server/api/canary/utils/serializers/input/members.js
index 42e342d781..b90638fab4 100644
--- a/core/server/api/canary/utils/serializers/input/members.js
+++ b/core/server/api/canary/utils/serializers/input/members.js
@@ -47,6 +47,12 @@ module.exports = {
         this.browse(...arguments);
     },
 
+    exportCSV() {
+        debug('exportCSV');
+
+        this.browse(...arguments);
+    },
+
     add(apiConfig, frame) {
         debug('add');
         if (frame.data.members[0].labels) {
diff --git a/test/e2e-api/admin/members.test.js b/test/e2e-api/admin/members.test.js
index 3b63bcd202..526e8dbe6e 100644
--- a/test/e2e-api/admin/members.test.js
+++ b/test/e2e-api/admin/members.test.js
@@ -1543,7 +1543,7 @@ describe('Members API', function () {
 
     it('Can export CSV', async function () {
         const res = await agent
-            .get(`/members/upload/`)
+            .get(`/members/upload/?limit=all`)
             .expectStatus(200)
             .expectEmptyBody() // express-test body parsing doesn't support CSV
             .matchHeaderSnapshot({