diff --git a/src/app.module.ts b/src/app.module.ts index bde342a..2931078 100644 --- a/src/app.module.ts +++ b/src/app.module.ts @@ -22,6 +22,7 @@ import { TelegramBotService } from './telegram-bot/telegram-bot.service'; import { UserMetaInfoService } from './user-meta-info/user-meta-info.service'; import { UserMetaInfo } from './couchdb-datasources/user-meta-info'; import { PersonalNotificationAdapterService } from './notifications/adapters/personal-notification.adapter/personal-notification.adapter.service'; +import { PublicUrlAdapterService } from './notifications/adapters/public-url.adapter.service'; @Module({ imports: [ @@ -47,6 +48,7 @@ import { PersonalNotificationAdapterService } from './notifications/adapters/per UserMetaInfoService, UserMetaInfo, PersonalNotificationAdapterService, + PublicUrlAdapterService, ], }) export class AppModule implements OnModuleInit { 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 b9bc214..83c645a 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,21 +4,20 @@ 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 { PublicUrlAdapterService } from '../public-url.adapter.service'; @Injectable() export class PersonalNotificationAdapterService { private personalMessageTemplate: HandlebarsTemplateDelegate; - private redminePublicUrlPrefix: string; constructor( private telegramBotService: TelegramBotService, private configService: ConfigService, private usersService: UsersService, + private publicUrlAdapterService: PublicUrlAdapterService, ) { const template = this.configService.get('personalMessageTemplate'); this.personalMessageTemplate = Handlebars.compile(template); - this.redminePublicUrlPrefix = - this.configService.get('redmineUrlPublic'); } async send( @@ -27,9 +26,9 @@ export class PersonalNotificationAdapterService { const promises = issueAndMessages.personalParsedMessage.recipients.map( async (recipient) => { const redmineId = recipient; - const issueUrl = `${this.redminePublicUrlPrefix}/issues/${issueAndMessages.issue.id}`; - const issue = issueAndMessages.issue; - const issueUrlHtml = `${issue.tracker.name} #${issue.id}`; + const issueUrlHtml = this.publicUrlAdapterService.getHtmlHref( + issueAndMessages.issue, + ); const sender = await this.usersService.getUser( issueAndMessages.personalParsedMessage.sender, ); diff --git a/src/notifications/adapters/public-url.adapter.service.ts b/src/notifications/adapters/public-url.adapter.service.ts new file mode 100644 index 0000000..fe2b4de --- /dev/null +++ b/src/notifications/adapters/public-url.adapter.service.ts @@ -0,0 +1,21 @@ +import { RedmineTypes } from '@app/event-emitter/models/redmine-types'; +import { Injectable } from '@nestjs/common'; +import { ConfigService } from '@nestjs/config'; + +@Injectable() +export class PublicUrlAdapterService { + private publicUrl: string; + + constructor(private configService: ConfigService) { + this.publicUrl = this.configService.get('redmineUrlPublic'); + } + + getUrl(issueId: number): string { + return `${this.publicUrl}/issues/${issueId}`; + } + + getHtmlHref(issue: RedmineTypes.Issue): string { + const url = this.getUrl(issue.id); + return `${issue.tracker.name} #${issue.id}`; + } +}