From 32bc8ace7e76863e11cc990828c80329522eee2a Mon Sep 17 00:00:00 2001 From: Pavel Gnedov Date: Thu, 9 Feb 2023 16:09:14 +0700 Subject: [PATCH] =?UTF-8?q?RedminePublicUrlConverter=20=D0=BF=D0=B5=D1=80?= =?UTF-8?q?=D0=B5=D0=BD=D0=B5=D1=81=D1=91=D0=BD=20=D0=B2=20=D0=B1=D0=B8?= =?UTF-8?q?=D0=B1=D0=BB=D0=B8=D0=BE=D1=82=D0=B5=D0=BA=D1=83=20event-emitte?= =?UTF-8?q?r?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src}/converters/redmine-public-url.converter.ts | 7 ++----- libs/event-emitter/src/event-emitter.module.ts | 3 +++ src/app.module.ts | 2 -- .../personal-notification.adapter.service.ts | 2 +- src/notifications/status-change-notifications.service.ts | 2 +- src/reports/current-issues-eccm.report.service.ts | 2 +- src/reports/daily-eccm-with-extra-data.service.ts | 2 +- 7 files changed, 9 insertions(+), 11 deletions(-) rename {src => libs/event-emitter/src}/converters/redmine-public-url.converter.ts (91%) diff --git a/src/converters/redmine-public-url.converter.ts b/libs/event-emitter/src/converters/redmine-public-url.converter.ts similarity index 91% rename from src/converters/redmine-public-url.converter.ts rename to libs/event-emitter/src/converters/redmine-public-url.converter.ts index 245d979..596e74d 100644 --- a/src/converters/redmine-public-url.converter.ts +++ b/libs/event-emitter/src/converters/redmine-public-url.converter.ts @@ -2,16 +2,13 @@ import { RedmineTypes } from '@app/event-emitter/models/redmine-types'; import { Injectable } from '@nestjs/common'; import { ConfigService } from '@nestjs/config'; -// TODO: Этот сервис возможно перенести в lib event-emitter - @Injectable() export class RedminePublicUrlConverter { private redminePublicUrlPrefix: string; constructor(private configService: ConfigService) { - this.redminePublicUrlPrefix = this.configService.get( - 'redmineIssueEventEmitterConfig.redmineUrlPublic', - ); + this.redminePublicUrlPrefix = + this.configService.get('redmineUrlPublic'); } convert(issueId: number | string): string { diff --git a/libs/event-emitter/src/event-emitter.module.ts b/libs/event-emitter/src/event-emitter.module.ts index ce4c1cf..d33511c 100644 --- a/libs/event-emitter/src/event-emitter.module.ts +++ b/libs/event-emitter/src/event-emitter.module.ts @@ -21,6 +21,7 @@ import { EnhancerService } from './issue-enhancers/enhancer.service'; import { ProjectDashboardService } from './project-dashboard/project-dashboard.service'; import { RootIssueSubTreesWidgetService } from './project-dashboard/widgets/root-issue-subtrees.widget.service'; import { DynamicLoader } from './configs/dynamic-loader'; +import { RedminePublicUrlConverter } from './converters/redmine-public-url.converter'; @Module({}) export class EventEmitterModule implements OnModuleInit { @@ -46,6 +47,7 @@ export class EventEmitterModule implements OnModuleInit { ProjectDashboardService, RootIssueSubTreesWidgetService, DynamicLoader, + RedminePublicUrlConverter, ], exports: [ EventEmitterService, @@ -63,6 +65,7 @@ export class EventEmitterModule implements OnModuleInit { ProjectDashboardService, RootIssueSubTreesWidgetService, DynamicLoader, + RedminePublicUrlConverter, ], controllers: [MainController, UsersController, IssuesController], }; diff --git a/src/app.module.ts b/src/app.module.ts index 950481f..c7d9adc 100644 --- a/src/app.module.ts +++ b/src/app.module.ts @@ -9,7 +9,6 @@ import { switchMap, tap } from 'rxjs'; import { AppController } from './app.controller'; import { AppService } from './app.service'; import configuration from './configs/app'; -import { RedminePublicUrlConverter } from './converters/redmine-public-url.converter'; import { Changes } from './couchdb-datasources/changes'; import { CurrentUserEnhancer } from './issue-enhancers/current-user-enhancer'; import { CustomFieldsEnhancer } from './issue-enhancers/custom-fields-enhancer'; @@ -63,7 +62,6 @@ import { SimpleKanbanBoardController } from './dashboards/simple-kanban-board.co PersonalNotificationsService, StatusChangeNotificationsService, Changes, - RedminePublicUrlConverter, ChangesCacheWriterService, TelegramBotService, UserMetaInfoService, diff --git a/src/notifications/adapters/personal-notification.adapter/personal-notification.adapter.service.ts b/src/notifications/adapters/personal-notification.adapter/personal-notification.adapter.service.ts index 6d946ea..a581dac 100644 --- a/src/notifications/adapters/personal-notification.adapter/personal-notification.adapter.service.ts +++ b/src/notifications/adapters/personal-notification.adapter/personal-notification.adapter.service.ts @@ -4,7 +4,7 @@ import { ConfigService } from '@nestjs/config'; import { IssueAndPersonalParsedMessageModel } from 'src/models/issue-and-personal-parsed-message.model'; import { TelegramBotService } from 'src/telegram-bot/telegram-bot.service'; import Handlebars from 'handlebars'; -import { RedminePublicUrlConverter } from 'src/converters/redmine-public-url.converter'; +import { RedminePublicUrlConverter } from '@app/event-emitter/converters/redmine-public-url.converter'; @Injectable() export class PersonalNotificationAdapterService { diff --git a/src/notifications/status-change-notifications.service.ts b/src/notifications/status-change-notifications.service.ts index 7c9e525..b1ca1b9 100644 --- a/src/notifications/status-change-notifications.service.ts +++ b/src/notifications/status-change-notifications.service.ts @@ -4,13 +4,13 @@ import { UsersService } from '@app/event-emitter/users/users.service'; import { TimestampConverter } from '@app/event-emitter/utils/timestamp-converter'; import { Injectable, Logger } from '@nestjs/common'; import { ConfigService } from '@nestjs/config'; -import { RedminePublicUrlConverter } from 'src/converters/redmine-public-url.converter'; import { Change } from 'src/models/change.model'; import { StatusChangesConfig } from 'src/models/status-changes-config.model'; import { StatusesConfig } from 'src/models/statuses-config.model'; import Handlebars from 'handlebars'; import { ChangeMessage } from 'src/models/change-message.model'; import { Subject } from 'rxjs'; +import { RedminePublicUrlConverter } from '@app/event-emitter/converters/redmine-public-url.converter'; @Injectable() export class StatusChangeNotificationsService { diff --git a/src/reports/current-issues-eccm.report.service.ts b/src/reports/current-issues-eccm.report.service.ts index 13489ac..ce3b0c7 100644 --- a/src/reports/current-issues-eccm.report.service.ts +++ b/src/reports/current-issues-eccm.report.service.ts @@ -6,9 +6,9 @@ import { UNLIMITED } from '@app/event-emitter/consts/consts'; import { RedmineTypes } from '@app/event-emitter/models/redmine-types'; import nano from 'nano'; import Handlebars from 'handlebars'; -import { RedminePublicUrlConverter } from 'src/converters/redmine-public-url.converter'; import { EccmConfig } from 'src/models/eccm-config.model'; import { IssuesService } from '@app/event-emitter/issues/issues.service'; +import { RedminePublicUrlConverter } from '@app/event-emitter/converters/redmine-public-url.converter'; // eslint-disable-next-line @typescript-eslint/no-namespace export namespace CurrentIssuesEccmReport { diff --git a/src/reports/daily-eccm-with-extra-data.service.ts b/src/reports/daily-eccm-with-extra-data.service.ts index c798a4c..35ebaf7 100644 --- a/src/reports/daily-eccm-with-extra-data.service.ts +++ b/src/reports/daily-eccm-with-extra-data.service.ts @@ -1,7 +1,7 @@ +import { RedminePublicUrlConverter } from '@app/event-emitter/converters/redmine-public-url.converter'; import { Timestamped } from '@app/event-emitter/models/timestamped'; import { Injectable } from '@nestjs/common'; import nano from 'nano'; -import { RedminePublicUrlConverter } from 'src/converters/redmine-public-url.converter'; import { DailyEccmUserCommentsService } from './daily-eccm-user-comments.service'; import { DailyEccmReport,