diff --git a/src/app.module.ts b/src/app.module.ts index 443884e..40d7251 100755 --- a/src/app.module.ts +++ b/src/app.module.ts @@ -7,13 +7,13 @@ import { ConfigModule } from "@nestjs/config"; import { ThrottlerModule } from "@nestjs/throttler"; import { TypeOrmModule } from "@nestjs/typeorm"; import { MailerModule } from "@nestjs-modules/mailer"; -import { TelegrafModule } from "nestjs-telegraf"; +// import { TelegrafModule } from "nestjs-telegraf"; import { bullMqConfig } from "./configs/bullmq.config"; import { cacheConfig } from "./configs/cache.config"; import { mailerConfig } from "./configs/mailer.config"; import { rateLimitConfig } from "./configs/rateLimit.config"; -import { telegrafConfig } from "./configs/telegraf.config"; +// import { telegrafConfig } from "./configs/telegraf.config"; import { databaseConfigs } from "./configs/typeorm.config"; import { HTTPLogger } from "./core/middlewares/logger.middleware"; import { AddressModule } from "./modules/address/address.module"; @@ -43,7 +43,7 @@ import { MonitoringModule } from "./monitoring/monitoring.module"; @Module({ imports: [ - TelegrafModule.forRootAsync(telegrafConfig()), + // TelegrafModule.forRootAsync(telegrafConfig()), MailerModule.forRootAsync(mailerConfig()), BullModule.forRootAsync(bullMqConfig()), ThrottlerModule.forRootAsync(rateLimitConfig()), diff --git a/src/modules/auth/providers/auth.service.ts b/src/modules/auth/providers/auth.service.ts index d8f6aad..d1369f4 100755 --- a/src/modules/auth/providers/auth.service.ts +++ b/src/modules/auth/providers/auth.service.ts @@ -79,7 +79,8 @@ export class AuthService { await this.notificationService.createNewCustomerNotification( admin.id, { - userPhone: user.phone, + userPhone: admin.phone, + userEmail: admin.email, fullName: `${user.firstName} ${user.lastName}`, mobile: user.phone, }, diff --git a/src/modules/blogs/providers/blogs.service.ts b/src/modules/blogs/providers/blogs.service.ts index b5957a6..2e53c8d 100755 --- a/src/modules/blogs/providers/blogs.service.ts +++ b/src/modules/blogs/providers/blogs.service.ts @@ -264,8 +264,8 @@ export class BlogsService { await this.notificationsService.createNewBlogCommentNotification( admin.id, { - userPhone: user.phone, - userEmail: user.email, + userPhone: admin.phone, + userEmail: admin.email, blogTitle: blog.title, fullName: `${user.firstName} ${user.lastName}`, }, diff --git a/src/modules/criticisms/providers/criticisms.service.ts b/src/modules/criticisms/providers/criticisms.service.ts index 1b01554..584583c 100755 --- a/src/modules/criticisms/providers/criticisms.service.ts +++ b/src/modules/criticisms/providers/criticisms.service.ts @@ -23,6 +23,9 @@ export class CriticismsService { async create(createDto: CreateCriticismDto, userId: string) { const queryRunner = this.dataSource.createQueryRunner(); try { + await queryRunner.connect(); + await queryRunner.startTransaction(); + const user = await this.usersService.findOneByIdWithQueryRunner(userId, queryRunner); const files = createDto.files?.map((file) => { @@ -102,8 +105,8 @@ export class CriticismsService { admin.id, { fullName: `${criticism.user.firstName} ${criticism.user.lastName}`, - userPhone: criticism.user.phone, - userEmail: criticism.user.email, + userPhone: admin.phone, + userEmail: admin.email, title: criticism.title, }, queryRunner, diff --git a/src/modules/danak-services/providers/danak-services.service.ts b/src/modules/danak-services/providers/danak-services.service.ts index 94d1caa..94e131f 100755 --- a/src/modules/danak-services/providers/danak-services.service.ts +++ b/src/modules/danak-services/providers/danak-services.service.ts @@ -529,8 +529,8 @@ export class DanakServicesService { admin.id, { serviceName: service.name, - userPhone: user.phone, - userEmail: user.email, + userPhone: admin.phone, + userEmail: admin.email, fullName: `${user.firstName} ${user.lastName}`, }, queryRunner, diff --git a/src/modules/invoices/queue/invoice.processor.ts b/src/modules/invoices/queue/invoice.processor.ts index c516def..edd230e 100755 --- a/src/modules/invoices/queue/invoice.processor.ts +++ b/src/modules/invoices/queue/invoice.processor.ts @@ -348,8 +348,8 @@ export class InvoiceProcessor extends WorkerProcessor { admin.id, { date: invoice.dueDate, - userPhone: invoice.user.phone, - userEmail: invoice.user.email, + userPhone: admin.phone, + userEmail: admin.email, serviceName: invoice.items[0]?.subscriptionPlan?.plan.service.name ?? "", fullName: invoice.user.firstName + " " + invoice.user.lastName, }, diff --git a/src/modules/settings/providers/user-settings.service.ts b/src/modules/settings/providers/user-settings.service.ts index 4d50136..a8143e9 100755 --- a/src/modules/settings/providers/user-settings.service.ts +++ b/src/modules/settings/providers/user-settings.service.ts @@ -21,7 +21,8 @@ export class UserSettingsService { where: { type: In(Object.values(NotifType)) }, }); - if (notifSettings.length !== Object.values(NotifType).length) throw new BadRequestException(SettingMessageEnum.NOTIF_NOT_FOUND); + //TODO: remove this after testing + // if (notifSettings.length !== Object.values(NotifType).length) throw new BadRequestException(SettingMessageEnum.NOTIF_NOT_FOUND); const userSettings = notifSettings.map((notifSetting) => queryRunner.manager.create(UserSetting, { diff --git a/src/modules/tickets/providers/tickets.service.ts b/src/modules/tickets/providers/tickets.service.ts index db3459c..a27d7ef 100755 --- a/src/modules/tickets/providers/tickets.service.ts +++ b/src/modules/tickets/providers/tickets.service.ts @@ -433,8 +433,8 @@ export class TicketsService { { ticketId: ticket.numericId.toString(), ticketSubject: ticket.subject, - userPhone: ticket.user.phone, - userEmail: ticket.user.email, + userPhone: admin.phone, + userEmail: admin.email, fullName: `${ticket.user.firstName} ${ticket.user.lastName}`, }, queryRunner,