From d773c849a493de4aa5c942bab3c698eef30de142 Mon Sep 17 00:00:00 2001
From: Jim Laurie <j.laurie6993@gmail.com>
Date: Tue, 19 Dec 2017 14:47:48 +0100
Subject: [PATCH 1/2] Fix before and after remove data life cycle functions

---
 packages/strapi-bookshelf/package.json           | 2 +-
 packages/strapi-ejs/package.json                 | 2 +-
 packages/strapi-generate-api/package.json        | 2 +-
 packages/strapi-generate-controller/package.json | 2 +-
 packages/strapi-generate-model/package.json      | 2 +-
 packages/strapi-generate-new/package.json        | 2 +-
 packages/strapi-generate-plugin/package.json     | 2 +-
 packages/strapi-generate-policy/package.json     | 2 +-
 packages/strapi-generate-service/package.json    | 2 +-
 packages/strapi-mongoose/lib/index.js            | 4 ++--
 10 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/strapi-bookshelf/package.json b/packages/strapi-bookshelf/package.json
index 48a948fec4..a63c20c03b 100755
--- a/packages/strapi-bookshelf/package.json
+++ b/packages/strapi-bookshelf/package.json
@@ -55,4 +55,4 @@
     "npm": ">= 5.3.0"
   },
   "license": "MIT"
-}
+}
\ No newline at end of file
diff --git a/packages/strapi-ejs/package.json b/packages/strapi-ejs/package.json
index eb46cdcf70..54b89d459c 100755
--- a/packages/strapi-ejs/package.json
+++ b/packages/strapi-ejs/package.json
@@ -46,4 +46,4 @@
     "npm": ">= 5.3.0"
   },
   "license": "MIT"
-}
+}
\ No newline at end of file
diff --git a/packages/strapi-generate-api/package.json b/packages/strapi-generate-api/package.json
index 9739e698f4..fca7adfe5f 100755
--- a/packages/strapi-generate-api/package.json
+++ b/packages/strapi-generate-api/package.json
@@ -43,4 +43,4 @@
     "npm": ">= 5.3.0"
   },
   "license": "MIT"
-}
+}
\ No newline at end of file
diff --git a/packages/strapi-generate-controller/package.json b/packages/strapi-generate-controller/package.json
index 15b7db6b45..2ecb92b1a0 100755
--- a/packages/strapi-generate-controller/package.json
+++ b/packages/strapi-generate-controller/package.json
@@ -43,4 +43,4 @@
     "npm": ">= 5.3.0"
   },
   "license": "MIT"
-}
+}
\ No newline at end of file
diff --git a/packages/strapi-generate-model/package.json b/packages/strapi-generate-model/package.json
index 6079bc6a71..b77f611b6c 100755
--- a/packages/strapi-generate-model/package.json
+++ b/packages/strapi-generate-model/package.json
@@ -43,4 +43,4 @@
     "npm": ">= 5.3.0"
   },
   "license": "MIT"
-}
+}
\ No newline at end of file
diff --git a/packages/strapi-generate-new/package.json b/packages/strapi-generate-new/package.json
index db840ebf48..a603d75183 100755
--- a/packages/strapi-generate-new/package.json
+++ b/packages/strapi-generate-new/package.json
@@ -47,4 +47,4 @@
     "npm": ">= 5.3.0"
   },
   "license": "MIT"
-}
+}
\ No newline at end of file
diff --git a/packages/strapi-generate-plugin/package.json b/packages/strapi-generate-plugin/package.json
index b4720fff9f..9adf219729 100755
--- a/packages/strapi-generate-plugin/package.json
+++ b/packages/strapi-generate-plugin/package.json
@@ -44,4 +44,4 @@
     "npm": ">= 5.3.0"
   },
   "license": "MIT"
-}
+}
\ No newline at end of file
diff --git a/packages/strapi-generate-policy/package.json b/packages/strapi-generate-policy/package.json
index 9e68e494f0..4888efd965 100755
--- a/packages/strapi-generate-policy/package.json
+++ b/packages/strapi-generate-policy/package.json
@@ -43,4 +43,4 @@
     "npm": ">= 5.3.0"
   },
   "license": "MIT"
-}
+}
\ No newline at end of file
diff --git a/packages/strapi-generate-service/package.json b/packages/strapi-generate-service/package.json
index 30ebde3fa6..745845dddc 100755
--- a/packages/strapi-generate-service/package.json
+++ b/packages/strapi-generate-service/package.json
@@ -43,4 +43,4 @@
     "npm": ">= 5.3.0"
   },
   "license": "MIT"
-}
+}
\ No newline at end of file
diff --git a/packages/strapi-mongoose/lib/index.js b/packages/strapi-mongoose/lib/index.js
index f5a0a0a3ff..af997bbaf8 100755
--- a/packages/strapi-mongoose/lib/index.js
+++ b/packages/strapi-mongoose/lib/index.js
@@ -87,7 +87,7 @@ module.exports = function (strapi) {
                   // Initialize lifecycle callbacks.
                   const preLifecycle = {
                     validate: 'beforeCreate',
-                    remove: 'beforeDestroy',
+                    findOneAndRemove: 'beforeDestroy',
                     update: 'beforeUpdate',
                     find: 'beforeFetchAll',
                     findOne: 'beforeFetch',
@@ -104,7 +104,7 @@ module.exports = function (strapi) {
 
                   const postLifecycle = {
                     validate: 'afterCreate',
-                    remove: 'afterDestroy',
+                    findOneAndRemove: 'afterDestroy',
                     update: 'afterUpdate',
                     find: 'afterFetchAll',
                     findOne: 'afterFetch',

From 987fbcffa725285194ef78c62d09b536667edfee Mon Sep 17 00:00:00 2001
From: Jim Laurie <j.laurie6993@gmail.com>
Date: Tue, 19 Dec 2017 14:52:13 +0100
Subject: [PATCH 2/2] Also restore remove function

---
 packages/strapi-mongoose/lib/index.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/strapi-mongoose/lib/index.js b/packages/strapi-mongoose/lib/index.js
index af997bbaf8..7a8d9541cd 100755
--- a/packages/strapi-mongoose/lib/index.js
+++ b/packages/strapi-mongoose/lib/index.js
@@ -88,6 +88,7 @@ module.exports = function (strapi) {
                   const preLifecycle = {
                     validate: 'beforeCreate',
                     findOneAndRemove: 'beforeDestroy',
+                    remove: 'beforeDestroy',
                     update: 'beforeUpdate',
                     find: 'beforeFetchAll',
                     findOne: 'beforeFetch',
@@ -105,6 +106,7 @@ module.exports = function (strapi) {
                   const postLifecycle = {
                     validate: 'afterCreate',
                     findOneAndRemove: 'afterDestroy',
+                    remove: 'afterDestroy',
                     update: 'afterUpdate',
                     find: 'afterFetchAll',
                     findOne: 'afterFetch',