From 6540fd0cd0b59ab5c44b849f54ce1437658f8ae8 Mon Sep 17 00:00:00 2001
From: Fabien O'Carroll <fabien@allou.is>
Date: Fri, 13 Aug 2021 13:23:01 +0200
Subject: [PATCH] Updated bulkDestroy method to handle model updates

refs https://github.com/TryGhost/Ghost/commit/1dd52075

- Fixes bulkDestroy being passed the context
- Fixes passing options.search to the model layer
- Updates return value since the changes in referenced commit
---
 ghost/members-api/lib/repositories/member.js | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/ghost/members-api/lib/repositories/member.js b/ghost/members-api/lib/repositories/member.js
index c18c36f749..e4e349603f 100644
--- a/ghost/members-api/lib/repositories/member.js
+++ b/ghost/members-api/lib/repositories/member.js
@@ -305,12 +305,16 @@ module.exports = class MemberRepository {
             filterOptions.transacting = options.transacting;
         }
 
+        if (options.context) {
+            filterOptions.context = options.context;
+        }
+
         if (all !== true) {
             if (filter) {
                 filterOptions.filter = filter;
             }
 
-            if (filter) {
+            if (search) {
                 filterOptions.search = search;
             }
         }
@@ -321,7 +325,13 @@ module.exports = class MemberRepository {
 
         const memberIds = memberRows.map(row => row.id);
 
-        return this._Member.bulkDestroy(memberIds);
+        const bulkDestroyResult = await this._Member.bulkDestroy(memberIds);
+
+        bulkDestroyResult.unsuccessfulIds = bulkDestroyResult.unsuccessfulData;
+
+        delete bulkDestroyResult.unsuccessfulData;
+
+        return bulkDestroyResult;
     }
 
     async upsertCustomer(data) {