Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: 110268 111686 get questionnaire order periodically #7153

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/app/.env.development
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ ELASTICSEARCH_REJECT_UNAUTHORIZED=true
HACKMD_URI="http://localhost:3010"
HACKMD_URI_FOR_SERVER="http://hackmd:3000"
OGP_URI="http://ogp:8088"
GROWI_QUESTIONNAIRE_SERVER_ORIGIN="http://host.docker.internal:3003"
# DRAWIO_URI="http://localhost:8080/?offline=1&https=0"
# S2SMSG_PUBSUB_SERVER_TYPE=nchan
# PUBLISH_OPEN_API=true
Expand Down
1 change: 1 addition & 0 deletions packages/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@
"next-superjson": "^0.0.4",
"next-themes": "^0.2.0",
"nocache": "^3.0.1",
"node-cron": "^3.0.2",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

node 内の cron job 実行のために追加しました。
LICENSE 的に使って大丈夫だと思っています。

THIRD-PARTY-NOTICES はほぼ武井さんしかいじっていなかったので一旦いじりませんでした。

"nodemailer": "^6.6.2",
"nodemailer-ses-transport": "~1.5.0",
"openid-client": "^5.1.2",
Expand Down
7 changes: 7 additions & 0 deletions packages/app/src/server/crowi/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,13 @@ 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';
import { initMongooseGlobalSettings, getMongoUri, mongoOptions } from '../util/mongoose-utils';


const logger = loggerFactory('growi:crowi');
const httpErrorHandler = require('../middlewares/http-error-handler');
const models = require('../models');
Expand Down Expand Up @@ -105,6 +107,7 @@ Crowi.prototype.init = async function() {
await this.setupModels();
await this.setupConfigManager();
await this.setupSessionConfig();
this.setupCron();

// setup messaging services
await this.setupS2sMessagingService();
Expand Down Expand Up @@ -304,6 +307,10 @@ Crowi.prototype.setupModels = async function() {
});
};

Crowi.prototype.setupCron = function() {
new QuestionnaireCronService(this).setUpCron();
};

Crowi.prototype.scanRuntimeVersions = async function() {
const self = this;

Expand Down
18 changes: 18 additions & 0 deletions packages/app/src/server/service/config-loader.ts
Original file line number Diff line number Diff line change
Expand Up @@ -646,6 +646,24 @@ const ENV_VAR_NAME_TO_CONFIG_INFO = {
type: ValueType.STRING,
default: null,
},
GROWI_QUESTIONNAIRE_SERVER_ORIGIN: {
ns: 'crowi',
key: 'app:growiQuestionnaireServerOrigin',
type: ValueType.STRING,
default: null,
},
QUESTIONNAIRE_CRON_SCHEDULE: {
ns: 'crowi',
key: 'app:questionnaireCronSchedule',
type: ValueType.STRING,
default: '0 22 * * *',
},
QUESTIONNAIRE_CRON_MAX_HOURS_UNTIL_REQUEST: {
ns: 'crowi',
key: 'app:questionnaireCronMaxHoursUntilRequest',
type: ValueType.NUMBER,
default: 4,
},
};


Expand Down
48 changes: 48 additions & 0 deletions packages/app/src/server/service/questionnaire-cron.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
import axiosRetry from 'axios-retry';

import { getRandomIntInRange } from '~/utils/rand';
import { sleep } from '~/utils/sleep';

const axios = require('axios').default;
const nodeCron = require('node-cron');

axiosRetry(axios, { retries: 3 });

class QuestionnaireCronService {

crowi: any;

// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
constructor(crowi) {
this.crowi = crowi;
}

setUpCron(): void {
const cronSchedule = this.crowi.configManager?.getConfig('crowi', 'app:questionnaireCronSchedule');
const maxHoursUntilRequest = this.crowi.configManager?.getConfig('crowi', 'app:questionnaireCronMaxHoursUntilRequest');

const maxSecondsUntilRequest = maxHoursUntilRequest * 60 * 60;
this.questionnaireOrderGetCron(cronSchedule, maxSecondsUntilRequest);
}

questionnaireOrderGetCron(cronSchedule: string, maxSecondsUntilRequest: number): void {
const growiQuestionnaireServerOrigin = this.crowi.configManager?.getConfig('crowi', 'app:growiQuestionnaireServerOrigin');
nodeCron.schedule(cronSchedule, async() => {
const secToSleep = getRandomIntInRange(0, maxSecondsUntilRequest);

await sleep(secToSleep * 1000);

try {
const response = await axios.get(`${growiQuestionnaireServerOrigin}/questionnaire-order/index`);
console.log(response.data);
}
catch (e) {
console.log(e);
}

}).start();
}

}

export default QuestionnaireCronService;
5 changes: 5 additions & 0 deletions packages/app/src/utils/rand.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
export const getRandomIntInRange = (min: number, max: number): number => {
const minInt = Math.ceil(min);
const maxInt = Math.floor(max);
return Math.floor(Math.random() * (maxInt - minInt) + minInt);
};
1 change: 1 addition & 0 deletions packages/app/src/utils/sleep.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export const sleep = (msec: number): Promise<void> => new Promise(resolve => setTimeout(resolve, msec));
7 changes: 7 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -15954,6 +15954,13 @@ nocache@^3.0.1:
resolved "https://registry.yarnpkg.com/nocache/-/nocache-3.0.1.tgz#54d8b53a7e0a0aa1a288cfceab8a3cefbcde67d4"
integrity sha512-Gh39xwJwBKy0OvFmWfBs/vDO4Nl7JhnJtkqNP76OUinQz7BiMoszHYrIDHHAaqVl/QKVxCEy4ZxC/XZninu7nQ==

node-cron@^3.0.2:
version "3.0.2"
resolved "https://registry.yarnpkg.com/node-cron/-/node-cron-3.0.2.tgz#bb0681342bd2dfb568f28e464031280e7f06bd01"
integrity sha512-iP8l0yGlNpE0e6q1o185yOApANRe47UPbLf4YxfbiNHt/RU5eBcGB/e0oudruheSf+LQeDMezqC5BVAb5wwRcQ==
dependencies:
uuid "8.3.2"

node-emoji@^1.11.0:
version "1.11.0"
resolved "https://registry.yarnpkg.com/node-emoji/-/node-emoji-1.11.0.tgz#69a0150e6946e2f115e9d7ea4df7971e2628301c"
Expand Down