refactor model setup

apps/app/src/server/models/index.ts

@@ -1,15 +1,20 @@
-import GlobalNotificationSettingFactory from './GlobalNotificationSetting';
+import GlobalNotificationSetting from './GlobalNotificationSetting';
+import GlobalNotificationMailSetting from './GlobalNotificationSetting/GlobalNotificationMailSetting';
+import GlobalNotificationSlackSetting from './GlobalNotificationSetting/GlobalNotificationSlackSetting';
 import Page from './page';
+import PageTagRelation from './page-tag-relation';
+import SlackAppIntegration from './slack-app-integration';
+import User from './user';
 
 export const modelsDependsOnCrowi = {
   Page,
-  PageTagRelation: require('./page-tag-relation'),
-  User: require('./user'),
+  PageTagRelation,
+  User,
   Bookmark: require('./bookmark'),
-  GlobalNotificationSetting: GlobalNotificationSettingFactory,
-  GlobalNotificationMailSetting: require('./GlobalNotificationSetting/GlobalNotificationMailSetting'),
-  GlobalNotificationSlackSetting: require('./GlobalNotificationSetting/GlobalNotificationSlackSetting'),
-  SlackAppIntegration: require('./slack-app-integration'),
+  GlobalNotificationSetting,
+  GlobalNotificationMailSetting,
+  GlobalNotificationSlackSetting,
+  SlackAppIntegration,
 };
 
 // setup models that independent from crowi

apps/app/src/server/models/serializers/bookmark-serializer.js

@@ -1,4 +1,4 @@
-const { serializePageSecurely } = require('./page-serializer');
+import { serializePageSecurely } from './page-serializer';
 
 function serializeInsecurePageAttributes(bookmark) {
   if (bookmark.page != null && bookmark.page._id != null) {

apps/app/src/server/models/serializers/page-serializer.js

@@ -1,4 +1,4 @@
-const { serializeUserSecurely } = require('./user-serializer');
+import { serializeUserSecurely } from './user-serializer';
 
 function depopulate(page, attributeName) {
   // revert the ObjectID

apps/app/src/server/models/serializers/revision-serializer.js

@@ -1,4 +1,4 @@
-const { serializeUserSecurely } = require('./user-serializer');
+import { serializeUserSecurely } from './user-serializer';
 
 function serializeInsecureUserAttributes(revision) {
   if (revision.author != null && revision.author._id != null) {

apps/app/src/server/models/serializers/user-group-relation-serializer.js

@@ -1,4 +1,4 @@
-const { serializeUserSecurely } = require('./user-serializer');
+import { serializeUserSecurely } from './user-serializer';
 
 function serializeInsecureUserAttributes(userGroupRelation) {
   if (userGroupRelation.relatedUser != null && userGroupRelation.relatedUser._id != null) {

apps/app/src/server/models/user.js

@@ -7,6 +7,7 @@ import { generateGravatarSrc } from '~/utils/gravatar';
 import loggerFactory from '~/utils/logger';
 
 import { Attachment } from './attachment';
+import { omitInsecureAttributes } from './serializers/user-serializer';
 
 
 const crypto = require('crypto');
@@ -17,8 +18,6 @@ const uniqueValidator = require('mongoose-unique-validator');
 
 const ObjectId = mongoose.Schema.Types.ObjectId;
 
-const { omitInsecureAttributes } = require('./serializers/user-serializer');
-
 const logger = loggerFactory('growi:models:user');
 
 module.exports = function(crowi) {