ryuichi-e пре 6 година
родитељ
комит
40ffd4a06b
1 измењених фајлова са 4 додато и 2 уклоњено
  1. 4 2
      src/migrations/2020040216038-remove-deleteduser-from-relationgroup.js

+ 4 - 2
src/migrations/2020040216038-remove-deleteduser-from-relationgroup.js

@@ -4,13 +4,15 @@ const logger = require('@alias/logger')('growi:migrate:adjust-pages-path');
 const mongoose = require('mongoose');
 const mongoose = require('mongoose');
 const config = require('@root/config/migrate');
 const config = require('@root/config/migrate');
 
 
+const { getModelSafely } = require('@commons/util/mongoose-utils');
+
 module.exports = {
 module.exports = {
   async up(db) {
   async up(db) {
     logger.info('Apply migration');
     logger.info('Apply migration');
     mongoose.connect(config.mongoUri, config.mongodb.options);
     mongoose.connect(config.mongoUri, config.mongodb.options);
 
 
-    const User = require('@server/models/user')();
-    const UserGroupRelation = require('@server/models/user-group-relation')();
+    const User = getModelSafely('User') || require('@server/models/user')();
+    const UserGroupRelation = getModelSafely('UserGroupRelation') || require('@server/models/user-group-relation')();
 
 
     const deletedUsers = await User.find({ status: 4 }); // deleted user
     const deletedUsers = await User.find({ status: 4 }); // deleted user
     await UserGroupRelation.remove({ relatedUser: deletedUsers });
     await UserGroupRelation.remove({ relatedUser: deletedUsers });