From a7284aa1284936550afc339f8b4aa7d3f1f30ead Mon Sep 17 00:00:00 2001 From: Pavel Gnedov Date: Mon, 25 Jul 2022 01:42:08 +0700 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=20=D0=B7=D0=B0=D0=B3=D1=80=D1=83=D0=B7=D1=87=D0=B8=D0=BA?= =?UTF-8?q?=20=D0=BA=D0=BE=D0=BD=D1=84=D0=B8=D0=B3=D1=83=D1=80=D0=B0=D1=86?= =?UTF-8?q?=D0=B8=D0=B8=20=D1=81=D0=BE=20=D1=81=D1=82=D0=B0=D1=82=D1=83?= =?UTF-8?q?=D1=81=D0=B0=D0=BC=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- configs/redmine-statuses-config.jsonc.dist | 34 ++++++++++------------ src/configs/app.ts | 3 ++ src/configs/statuses.config.ts | 23 +++++++++++++++ src/models/app-config.model.ts | 2 ++ src/models/statuses-config.model.ts | 5 ++++ 5 files changed, 49 insertions(+), 18 deletions(-) create mode 100644 src/configs/statuses.config.ts create mode 100644 src/models/statuses-config.model.ts diff --git a/configs/redmine-statuses-config.jsonc.dist b/configs/redmine-statuses-config.jsonc.dist index 8c067f5..a8804fc 100644 --- a/configs/redmine-statuses-config.jsonc.dist +++ b/configs/redmine-statuses-config.jsonc.dist @@ -1,18 +1,16 @@ -{ - "redmine_statuses": [ - { - "id": 1, - "name": "New" - }, - { - "id": 2, - "name": "In Progress" - }, - { - "id": 3, - "name": "Closed", - "is_closed": true - } - // ... - ] -} \ No newline at end of file +[ + { + "id": 1, + "name": "New" + }, + { + "id": 2, + "name": "In Progress" + }, + { + "id": 3, + "name": "Closed", + "is_closed": true + } + // ... +] \ No newline at end of file diff --git a/src/configs/app.ts b/src/configs/app.ts index ca49fd1..ae976fb 100644 --- a/src/configs/app.ts +++ b/src/configs/app.ts @@ -3,8 +3,10 @@ import { readFileSync } from 'fs'; import { join } from 'path'; import { parse } from 'jsonc-parser'; import { AppConfig } from 'src/models/app-config.model'; +import RedmineStatusesConfigLoader from './statuses.config'; const redmineIssueEventEmitterConfig = RedmineIssueEventEmitterConfigLoader(); +const redmineStatusesConfig = RedmineStatusesConfigLoader(); let appConfig: AppConfig; @@ -23,6 +25,7 @@ export default (): AppConfig => { appConfig = { ...data, + redmineStatuses: redmineStatusesConfig, redmineIssueEventEmitterConfig: redmineIssueEventEmitterConfig, }; diff --git a/src/configs/statuses.config.ts b/src/configs/statuses.config.ts new file mode 100644 index 0000000..b01d7d9 --- /dev/null +++ b/src/configs/statuses.config.ts @@ -0,0 +1,23 @@ +import { StatusesConfig } from 'src/models/statuses-config.model'; +import { parse } from 'jsonc-parser'; +import { join } from 'path'; +import { readFileSync } from 'fs'; + +let redmineStatues: StatusesConfig; + +export default (): StatusesConfig => { + if (redmineStatues) { + return redmineStatues; + } + + const userDefinedConfigPath = + process.env['ELTEX_REDMINE_HELPER_STATUSES_CONFIG_PATH']; + const defaultConfigPath = join('configs', 'redmine-statuses-config.jsonc'); + const configPath = userDefinedConfigPath || defaultConfigPath; + + const rawData = readFileSync(configPath, { encoding: 'utf-8' }); + + redmineStatues = parse(rawData); + + return redmineStatues; +}; diff --git a/src/models/app-config.model.ts b/src/models/app-config.model.ts index e0a9fb1..f5d9aba 100644 --- a/src/models/app-config.model.ts +++ b/src/models/app-config.model.ts @@ -1,7 +1,9 @@ import { MainConfigModel } from '@app/event-emitter/models/main-config-model'; +import { StatusesConfig } from './statuses-config.model'; export type AppConfig = { redmineIssueEventEmitterConfig: MainConfigModel; + redmineStatuses: StatusesConfig; couchDb: { dbs: { changes: string; diff --git a/src/models/statuses-config.model.ts b/src/models/statuses-config.model.ts new file mode 100644 index 0000000..9366352 --- /dev/null +++ b/src/models/statuses-config.model.ts @@ -0,0 +1,5 @@ +export type StatusesConfig = { + id: number; + name: string; + is_closed?: boolean; +}[];