devide setupModels method

apps/app/src/server/crowi/index.js

@@ -18,7 +18,6 @@ import loggerFactory from '~/utils/logger';
 import { projectRoot } from '~/utils/project-dir-utils';
 
 import UserEvent from '../events/user';
-import { modelsDependsOnCrowi } from '../models';
 import { aclService as aclServiceSingletonInstance } from '../service/acl';
 import AppService from '../service/app';
 import AttachmentService from '../service/attachment';
@@ -38,7 +37,9 @@ import { SlackIntegrationService } from '../service/slack-integration';
 import UserGroupService from '../service/user-group';
 import { UserNotificationService } from '../service/user-notification';
 import { initializeYjsService } from '../service/yjs';
-import { getMongoUri, mongoOptions } from '../util/mongoose-utils';
+import { getModelSafely, getMongoUri, mongoOptions } from '../util/mongoose-utils';
+
+import { setupModels } from './setup-models';
 
 
 const logger = loggerFactory('growi:crowi');
@@ -122,7 +123,7 @@ class Crowi {
 
 Crowi.prototype.init = async function() {
   await this.setupDatabase();
-  await this.setupModels();
+  this.models = setupModels(this);
   await this.setupConfigManager();
   await this.setupSessionConfig();
   this.setupCron();
@@ -210,14 +211,13 @@ Crowi.prototype.getEnv = function() {
   return this.env;
 };
 
-// getter/setter of model instance
-//
-Crowi.prototype.model = function(name, model) {
-  if (model != null) {
-    this.models[name] = model;
-  }
-
-  return this.models[name];
+/**
+ * Wrapper function of mongoose.model()
+ * @param {string} modelName
+ * @returns {mongoose.Model}
+ */
+Crowi.prototype.model = function(modelName) {
+  return getModelSafely(modelName);
 };
 
 // getter/setter of event instance
@@ -308,20 +308,6 @@ Crowi.prototype.setupSocketIoService = async function() {
   }
 };
 
-Crowi.prototype.setupModels = async function() {
-  Object.keys(modelsDependsOnCrowi).forEach((key) => {
-    const factory = modelsDependsOnCrowi[key];
-
-    if (!(factory instanceof Function)) {
-      logger.warn(`modelsDependsOnCrowi['${key}'] is not a function. skipped.`);
-      return;
-    }
-
-    return this.model(key, modelsDependsOnCrowi[key](this));
-  });
-
-};
-
 Crowi.prototype.setupCron = function() {
   this.questionnaireCronService = new QuestionnaireCronService(this);
   this.questionnaireCronService.startCron();

apps/app/src/server/crowi/setup-models.ts

@@ -0,0 +1,31 @@
+import type { Model } from 'mongoose';
+
+import loggerFactory from '~/utils/logger';
+
+import { modelsDependsOnCrowi } from '../models';
+
+import type Crowi from '.';
+
+const logger = loggerFactory('growi:crowi:setup-models');
+
+type ModelsMap = {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  [modelName: string]: Model<any>,
+}
+
+export const setupModels = (crowi: Crowi): ModelsMap => {
+  const modelsMap: ModelsMap = {};
+
+  Object.keys(modelsDependsOnCrowi).forEach((modelName) => {
+    const factory = modelsDependsOnCrowi[modelName];
+
+    if (!(factory instanceof Function)) {
+      logger.warn(`modelsDependsOnCrowi['${modelName}'] is not a function. skipped.`);
+      return;
+    }
+
+    modelsMap[modelName] = factory(crowi);
+  });
+
+  return modelsMap;
+};

apps/app/test/integration/crowi/crowi.test.js

@@ -18,12 +18,6 @@ describe('Test for Crowi application context', () => {
       expect(crowi.getConfig()).toEqual({ test: 1 });
     });
 
-    test('model getter, setter', async() => {
-      const crowi = await getInstance();
-      // set
-      crowi.model('hoge', { fuga: 1 });
-      expect(crowi.model('hoge')).toEqual({ fuga: 1 });
-    });
   });
 
 });