Просмотр исходного кода

Merge branch 'feat/110268-111686-get-questionnaire-order-periodically' into feat/110280-112131-questionnaire-order-save

Futa Arai 3 лет назад
Родитель
Сommit
0526e0e4e1

+ 1 - 1
packages/app/src/server/crowi/index.js

@@ -29,6 +29,7 @@ import PageGrantService from '../service/page-grant';
 import PageOperationService from '../service/page-operation';
 // eslint-disable-next-line import/no-cycle
 import { PluginService } from '../service/plugin';
+import QuestionnaireCronService from '../service/questionnaire-cron';
 import SearchService from '../service/search';
 import { SlackIntegrationService } from '../service/slack-integration';
 import { UserNotificationService } from '../service/user-notification';
@@ -307,7 +308,6 @@ Crowi.prototype.setupModels = async function() {
 };
 
 Crowi.prototype.setupCron = function() {
-  const QuestionnaireCronService = require('../service/questionnaire-cron');
   new QuestionnaireCronService(this).setUpCron();
 };
 

+ 2 - 2
packages/app/src/server/service/questionnaire-cron.ts

@@ -1,6 +1,5 @@
 import axios from '~/utils/axios';
 
-import Crowi from '../crowi';
 import { QuestionnaireOrderDocument } from '../models/questionnaire/questionnaire-order';
 
 const nodeCron = require('node-cron');
@@ -21,7 +20,8 @@ class QuestionnaireCronService {
 
   maxHoursUntilRequest: number;
 
-  constructor(crowi: Crowi) {
+  // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
+  constructor(crowi) {
     this.growiQuestionnaireUri = crowi.configManager?.getConfig('crowi', 'app:growiQuestionnaireUri');
     this.cronSchedule = crowi.configManager?.getConfig('crowi', 'app:questionnaireCronSchedule');
     this.maxHoursUntilRequest = crowi.configManager?.getConfig('crowi', 'app:questionnaireCronMaxHoursUntilRequest');