From 0830bcb74ee6b41acf95b7c5de11e6cda6ed97ac Mon Sep 17 00:00:00 2001
From: Daniel Lockyer <hi@daniellockyer.com>
Date: Thu, 17 Jun 2021 16:51:25 +0100
Subject: [PATCH] Moved `setId` function to Bookshelf `events` plugin

no issue

- `setId` is only used within the `events` plugin and it makes sense to
  keep code together
- we don't lose anything by putting it here, but it should make it
  easier to test in the future
---
 core/server/models/base/index.js          | 9 ---------
 core/server/models/base/plugins/events.js | 9 +++++++++
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/core/server/models/base/index.js b/core/server/models/base/index.js
index 69aafcf5e4..8e3d6dc42b 100644
--- a/core/server/models/base/index.js
+++ b/core/server/models/base/index.js
@@ -7,7 +7,6 @@
 
 // All other parts of Ghost, including the frontend & admin UI are only allowed to access data via the API.
 const moment = require('moment');
-const ObjectId = require('bson-objectid');
 const schema = require('../../data/schema');
 
 const ghostBookshelf = require('./bookshelf');
@@ -51,14 +50,6 @@ ghostBookshelf.Model = ghostBookshelf.Model.extend({
         return moment(this.get(attr)).diff(moment(this.previous(attr))) !== 0;
     },
 
-    /**
-     * we auto generate a GUID for each resource
-     * no auto increment
-     */
-    setId: function setId() {
-        this.set('id', ObjectId().toHexString());
-    },
-
     wasChanged() {
         /**
          * @NOTE:
diff --git a/core/server/models/base/plugins/events.js b/core/server/models/base/plugins/events.js
index b0f5654ff7..1d7835f037 100644
--- a/core/server/models/base/plugins/events.js
+++ b/core/server/models/base/plugins/events.js
@@ -1,5 +1,6 @@
 const _ = require('lodash');
 const debug = require('@tryghost/debug')('models:base:model-events');
+const ObjectId = require('bson-objectid');
 
 const events = require('../../../lib/common/events');
 const schema = require('../../../data/schema');
@@ -31,6 +32,14 @@ module.exports = function (Bookshelf) {
             this.on('saved', this.onSaved);
         },
 
+        /**
+         * we auto generate a GUID for each resource
+         * no auto increment
+         */
+        setId: function setId() {
+            this.set('id', ObjectId().toHexString());
+        },
+
         /**
          * @NOTE
          * We have to remember the `_previousAttributes` attributes, because when destroying resources