fix: remove check length for the notif settings
This commit is contained in:
+3
-3
@@ -7,13 +7,13 @@ import { ConfigModule } from "@nestjs/config";
|
|||||||
import { ThrottlerModule } from "@nestjs/throttler";
|
import { ThrottlerModule } from "@nestjs/throttler";
|
||||||
import { TypeOrmModule } from "@nestjs/typeorm";
|
import { TypeOrmModule } from "@nestjs/typeorm";
|
||||||
import { MailerModule } from "@nestjs-modules/mailer";
|
import { MailerModule } from "@nestjs-modules/mailer";
|
||||||
import { TelegrafModule } from "nestjs-telegraf";
|
// import { TelegrafModule } from "nestjs-telegraf";
|
||||||
|
|
||||||
import { bullMqConfig } from "./configs/bullmq.config";
|
import { bullMqConfig } from "./configs/bullmq.config";
|
||||||
import { cacheConfig } from "./configs/cache.config";
|
import { cacheConfig } from "./configs/cache.config";
|
||||||
import { mailerConfig } from "./configs/mailer.config";
|
import { mailerConfig } from "./configs/mailer.config";
|
||||||
import { rateLimitConfig } from "./configs/rateLimit.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 { databaseConfigs } from "./configs/typeorm.config";
|
||||||
import { HTTPLogger } from "./core/middlewares/logger.middleware";
|
import { HTTPLogger } from "./core/middlewares/logger.middleware";
|
||||||
import { AddressModule } from "./modules/address/address.module";
|
import { AddressModule } from "./modules/address/address.module";
|
||||||
@@ -43,7 +43,7 @@ import { MonitoringModule } from "./monitoring/monitoring.module";
|
|||||||
|
|
||||||
@Module({
|
@Module({
|
||||||
imports: [
|
imports: [
|
||||||
TelegrafModule.forRootAsync(telegrafConfig()),
|
// TelegrafModule.forRootAsync(telegrafConfig()),
|
||||||
MailerModule.forRootAsync(mailerConfig()),
|
MailerModule.forRootAsync(mailerConfig()),
|
||||||
BullModule.forRootAsync(bullMqConfig()),
|
BullModule.forRootAsync(bullMqConfig()),
|
||||||
ThrottlerModule.forRootAsync(rateLimitConfig()),
|
ThrottlerModule.forRootAsync(rateLimitConfig()),
|
||||||
|
|||||||
@@ -79,7 +79,8 @@ export class AuthService {
|
|||||||
await this.notificationService.createNewCustomerNotification(
|
await this.notificationService.createNewCustomerNotification(
|
||||||
admin.id,
|
admin.id,
|
||||||
{
|
{
|
||||||
userPhone: user.phone,
|
userPhone: admin.phone,
|
||||||
|
userEmail: admin.email,
|
||||||
fullName: `${user.firstName} ${user.lastName}`,
|
fullName: `${user.firstName} ${user.lastName}`,
|
||||||
mobile: user.phone,
|
mobile: user.phone,
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -264,8 +264,8 @@ export class BlogsService {
|
|||||||
await this.notificationsService.createNewBlogCommentNotification(
|
await this.notificationsService.createNewBlogCommentNotification(
|
||||||
admin.id,
|
admin.id,
|
||||||
{
|
{
|
||||||
userPhone: user.phone,
|
userPhone: admin.phone,
|
||||||
userEmail: user.email,
|
userEmail: admin.email,
|
||||||
blogTitle: blog.title,
|
blogTitle: blog.title,
|
||||||
fullName: `${user.firstName} ${user.lastName}`,
|
fullName: `${user.firstName} ${user.lastName}`,
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -23,6 +23,9 @@ export class CriticismsService {
|
|||||||
async create(createDto: CreateCriticismDto, userId: string) {
|
async create(createDto: CreateCriticismDto, userId: string) {
|
||||||
const queryRunner = this.dataSource.createQueryRunner();
|
const queryRunner = this.dataSource.createQueryRunner();
|
||||||
try {
|
try {
|
||||||
|
await queryRunner.connect();
|
||||||
|
await queryRunner.startTransaction();
|
||||||
|
|
||||||
const user = await this.usersService.findOneByIdWithQueryRunner(userId, queryRunner);
|
const user = await this.usersService.findOneByIdWithQueryRunner(userId, queryRunner);
|
||||||
const files =
|
const files =
|
||||||
createDto.files?.map((file) => {
|
createDto.files?.map((file) => {
|
||||||
@@ -102,8 +105,8 @@ export class CriticismsService {
|
|||||||
admin.id,
|
admin.id,
|
||||||
{
|
{
|
||||||
fullName: `${criticism.user.firstName} ${criticism.user.lastName}`,
|
fullName: `${criticism.user.firstName} ${criticism.user.lastName}`,
|
||||||
userPhone: criticism.user.phone,
|
userPhone: admin.phone,
|
||||||
userEmail: criticism.user.email,
|
userEmail: admin.email,
|
||||||
title: criticism.title,
|
title: criticism.title,
|
||||||
},
|
},
|
||||||
queryRunner,
|
queryRunner,
|
||||||
|
|||||||
@@ -529,8 +529,8 @@ export class DanakServicesService {
|
|||||||
admin.id,
|
admin.id,
|
||||||
{
|
{
|
||||||
serviceName: service.name,
|
serviceName: service.name,
|
||||||
userPhone: user.phone,
|
userPhone: admin.phone,
|
||||||
userEmail: user.email,
|
userEmail: admin.email,
|
||||||
fullName: `${user.firstName} ${user.lastName}`,
|
fullName: `${user.firstName} ${user.lastName}`,
|
||||||
},
|
},
|
||||||
queryRunner,
|
queryRunner,
|
||||||
|
|||||||
@@ -348,8 +348,8 @@ export class InvoiceProcessor extends WorkerProcessor {
|
|||||||
admin.id,
|
admin.id,
|
||||||
{
|
{
|
||||||
date: invoice.dueDate,
|
date: invoice.dueDate,
|
||||||
userPhone: invoice.user.phone,
|
userPhone: admin.phone,
|
||||||
userEmail: invoice.user.email,
|
userEmail: admin.email,
|
||||||
serviceName: invoice.items[0]?.subscriptionPlan?.plan.service.name ?? "",
|
serviceName: invoice.items[0]?.subscriptionPlan?.plan.service.name ?? "",
|
||||||
fullName: invoice.user.firstName + " " + invoice.user.lastName,
|
fullName: invoice.user.firstName + " " + invoice.user.lastName,
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -21,7 +21,8 @@ export class UserSettingsService {
|
|||||||
where: { type: In(Object.values(NotifType)) },
|
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) =>
|
const userSettings = notifSettings.map((notifSetting) =>
|
||||||
queryRunner.manager.create(UserSetting, {
|
queryRunner.manager.create(UserSetting, {
|
||||||
|
|||||||
@@ -433,8 +433,8 @@ export class TicketsService {
|
|||||||
{
|
{
|
||||||
ticketId: ticket.numericId.toString(),
|
ticketId: ticket.numericId.toString(),
|
||||||
ticketSubject: ticket.subject,
|
ticketSubject: ticket.subject,
|
||||||
userPhone: ticket.user.phone,
|
userPhone: admin.phone,
|
||||||
userEmail: ticket.user.email,
|
userEmail: admin.email,
|
||||||
fullName: `${ticket.user.firstName} ${ticket.user.lastName}`,
|
fullName: `${ticket.user.firstName} ${ticket.user.lastName}`,
|
||||||
},
|
},
|
||||||
queryRunner,
|
queryRunner,
|
||||||
|
|||||||
Reference in New Issue
Block a user