diff --git a/.gitignore b/.gitignore index d364377..8072991 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,4 @@ tmp/* configs/redmine-statuses-config.jsonc configs/redmine-status-changes-config.jsonc configs/eccm-versions-config.jsonc +configs/eccm-config.jsonc diff --git a/configs/eccm-config.jsonc.dist b/configs/eccm-config.jsonc.dist new file mode 100644 index 0000000..79d322b --- /dev/null +++ b/configs/eccm-config.jsonc.dist @@ -0,0 +1,5 @@ +{ + "currentVersions": [], + "projectName": "", + "currentIssuesStatuses": [] +} \ No newline at end of file diff --git a/configs/eccm-versions-config.jsonc.dist b/configs/eccm-versions-config.jsonc.dist deleted file mode 100644 index fb1a17b..0000000 --- a/configs/eccm-versions-config.jsonc.dist +++ /dev/null @@ -1 +0,0 @@ -[] // string[] \ No newline at end of file diff --git a/src/configs/app.ts b/src/configs/app.ts index ba66f48..8d5659e 100644 --- a/src/configs/app.ts +++ b/src/configs/app.ts @@ -5,12 +5,12 @@ import { parse } from 'jsonc-parser'; import { AppConfig } from 'src/models/app-config.model'; import RedmineStatusesConfigLoader from './statuses.config'; import RedmineStatusChangesConfigLoader from './status-changes.config'; -import RedmineEccmVersionsConfig from './eccm-versions.config'; +import RedmineEccmConfig from './eccm.config'; const redmineIssueEventEmitterConfig = RedmineIssueEventEmitterConfigLoader(); const redmineStatusesConfig = RedmineStatusesConfigLoader(); const redmineStatusChanges = RedmineStatusChangesConfigLoader(); -const redmineEccmVersions = RedmineEccmVersionsConfig(); +const redmineEccm = RedmineEccmConfig(); let appConfig: AppConfig; @@ -32,7 +32,7 @@ export default (): AppConfig => { redmineStatuses: redmineStatusesConfig, redmineIssueEventEmitterConfig: redmineIssueEventEmitterConfig, redmineStatusChanges: redmineStatusChanges, - redmineEccmVersions: redmineEccmVersions, + redmineEccm: redmineEccm, }; return appConfig; diff --git a/src/configs/eccm-versions.config.ts b/src/configs/eccm.config.ts similarity index 64% rename from src/configs/eccm-versions.config.ts rename to src/configs/eccm.config.ts index daa7d29..838efbb 100644 --- a/src/configs/eccm-versions.config.ts +++ b/src/configs/eccm.config.ts @@ -1,18 +1,18 @@ import { readFileSync } from 'fs'; import { join } from 'path'; -import { EccmVersionsConfig } from 'src/models/eccm-versions-config.model'; +import { EccmConfig } from 'src/models/eccm-config.model'; import { parse } from 'jsonc-parser'; -let eccmVersion: EccmVersionsConfig.Config; +let eccmVersion: EccmConfig.Config; -export default (): EccmVersionsConfig.Config => { +export default (): EccmConfig.Config => { if (eccmVersion) { return eccmVersion; } const userDefinedConfigPath = process.env['ELTEX_REDMINE_HELPER_ECCM_VERSIONS_CONFIG_PATH']; - const defaultConfigPath = join('configs', 'eccm-versions-config.jsonc'); + const defaultConfigPath = join('configs', 'eccm-config.jsonc'); const configPath = userDefinedConfigPath || defaultConfigPath; diff --git a/src/models/app-config.model.ts b/src/models/app-config.model.ts index 5378116..3ade525 100644 --- a/src/models/app-config.model.ts +++ b/src/models/app-config.model.ts @@ -1,5 +1,5 @@ import { MainConfigModel } from '@app/event-emitter/models/main-config-model'; -import { EccmVersionsConfig } from './eccm-versions-config.model'; +import { EccmConfig } from './eccm-config.model'; import { StatusChangesConfig } from './status-changes-config.model'; import { StatusesConfig } from './statuses-config.model'; @@ -7,7 +7,7 @@ export type AppConfig = { redmineIssueEventEmitterConfig: MainConfigModel; redmineStatuses: StatusesConfig.Config; redmineStatusChanges: StatusChangesConfig.Config; - redmineEccmVersions: EccmVersionsConfig.Config; + redmineEccm: EccmConfig.Config; couchDb: { dbs: { changes: string; diff --git a/src/models/eccm-config.model.ts b/src/models/eccm-config.model.ts new file mode 100644 index 0000000..93c3eb2 --- /dev/null +++ b/src/models/eccm-config.model.ts @@ -0,0 +1,8 @@ +/* eslint-disable @typescript-eslint/no-namespace */ +export namespace EccmConfig { + export type Config = { + currentVersions: string[]; + projectName: string; + currentIssuesStatuses: string[]; + }; +} diff --git a/src/models/eccm-versions-config.model.ts b/src/models/eccm-versions-config.model.ts deleted file mode 100644 index 932345b..0000000 --- a/src/models/eccm-versions-config.model.ts +++ /dev/null @@ -1,4 +0,0 @@ -/* eslint-disable @typescript-eslint/no-namespace */ -export namespace EccmVersionsConfig { - export type Config = string[]; -}