diff --git a/src/common/enums/message.enum.ts b/src/common/enums/message.enum.ts index 2663b68..3de4b54 100755 --- a/src/common/enums/message.enum.ts +++ b/src/common/enums/message.enum.ts @@ -346,7 +346,7 @@ export const enum NotificationMessage { ANSWER_TICKET = "پاسخ تیکت", ANSWER_TICKET_MESSAGE = "پاسخ جدیدی برای تیکت [ticketId] دریافت کردید", CREATE_TICKET = "ایجاد تیکت", - CREATE_TICKET_MESSAGE = "تیکت شما با شماره [ticketNumber] ثبت شد", + CREATE_TICKET_MESSAGE = "تیکت شما با شماره [ticketId] ثبت شد", } export const enum SubscriptionMessage { diff --git a/src/modules/tickets/providers/tickets.service.ts b/src/modules/tickets/providers/tickets.service.ts index 6b307a2..f80addd 100755 --- a/src/modules/tickets/providers/tickets.service.ts +++ b/src/modules/tickets/providers/tickets.service.ts @@ -1,9 +1,10 @@ -import { BadRequestException, HttpException, Injectable, InternalServerErrorException } from "@nestjs/common"; +import { BadRequestException, HttpException, Injectable, InternalServerErrorException, Logger } from "@nestjs/common"; import { DataSource, FindManyOptions, Not } from "typeorm"; import { ParamDto } from "../../../common/DTO/param.dto"; import { CommonMessage, TicketMessageEnum, UserMessage } from "../../../common/enums/message.enum"; -import { DanakServicesService } from "../../danak-services/providers/danak-services.service"; +import { DanakService } from "../../danak-services/entities/danak-service.entity"; +import { NotificationsService } from "../../notifications/providers/notifications.service"; import { User } from "../../users/entities/user.entity"; import { UsersService } from "../../users/providers/users.service"; import { PaginationUtils } from "../../utils/providers/pagination.utils"; @@ -13,6 +14,7 @@ import { CreateTicketDto } from "../DTO/create-ticket.dto"; import { SearchTicketCategoryDto } from "../DTO/search-ticket-category.dto"; import { SearchTicketQueryDto } from "../DTO/search-ticket-query.dto"; import { UpdateTicketCategoryDto } from "../DTO/update-ticket-category.dto"; +import { TicketCategory } from "../entities/ticket-category.entity"; import { TicketMessageAttachment } from "../entities/ticket-message-attachment"; import { TicketMessage } from "../entities/ticket-message.entity"; import { Ticket } from "../entities/ticket.entity"; @@ -23,12 +25,13 @@ import { TicketsRepository } from "../repositories/tickets.repository"; @Injectable() export class TicketsService { + private readonly logger = new Logger(TicketsService.name); constructor( + private readonly notificationsService: NotificationsService, private readonly ticketsCategoryRepository: TicketCategoryRepository, private readonly ticketsRepository: TicketsRepository, private readonly ticketMessagesRepository: TicketMessagesRepository, private readonly usersService: UsersService, - private readonly danakServicesService: DanakServicesService, private dataSource: DataSource, ) {} //******************************** */ @@ -109,41 +112,68 @@ export class TicketsService { //******************************** */ async createTicket(createDto: CreateTicketDto, userId: string) { - let service; - const { user } = await this.usersService.findOneById(userId); - const ticketCategory = await this.ticketsCategoryRepository.findCategoryById(createDto.categoryId); - if (!ticketCategory) throw new BadRequestException(TicketMessageEnum.CATEGORY_NOT_FOUND); - const { attachmentUrls } = createDto; + const queryRunner = this.dataSource.createQueryRunner(); + await queryRunner.connect(); + await queryRunner.startTransaction(); + try { + let service; + const user = await this.usersService.findOneByIdWithQueryRunner(userId, queryRunner); - // - if (createDto.danakServiceId) { - service = await this.danakServicesService.findServiceById(createDto.danakServiceId); - if (!service) throw new BadRequestException(TicketMessageEnum.SERVICE_NOT_FOUND); - } + const ticketCategory = await queryRunner.manager.findOneBy(TicketCategory, { id: createDto.categoryId }); + if (!ticketCategory) throw new BadRequestException(TicketMessageEnum.CATEGORY_NOT_FOUND); - const ticketMessage: Partial = { content: createDto.message, author: user }; + const { attachmentUrls } = createDto; - if (attachmentUrls) { - ticketMessage.attachments = attachmentUrls.map((url) => { - const attachment = new TicketMessageAttachment(); - attachment.attachmentUrl = url; - return attachment; + // + if (createDto.danakServiceId) { + service = await queryRunner.manager.findOneBy(DanakService, { id: createDto.danakServiceId }); + if (!service) throw new BadRequestException(TicketMessageEnum.SERVICE_NOT_FOUND); + } + + const ticketMessage: Partial = { content: createDto.message, author: user }; + + if (attachmentUrls?.length) { + ticketMessage.attachments = attachmentUrls.map((url) => { + const attachment = new TicketMessageAttachment(); + attachment.attachmentUrl = url; + return attachment; + }); + } + const ticket = queryRunner.manager.create(Ticket, { + ...createDto, + user, + category: ticketCategory, + messages: [ticketMessage], + danakService: service, }); + + await queryRunner.manager.save(Ticket, ticket); + + await this.notificationsService.createTicketNotification( + userId, + { + ticketId: ticket.numericId.toString(), + subject: ticket.subject, + date: ticket.createdAt, + userPhone: user.phone, + userEmail: user.email, + }, + queryRunner, + ); + + await queryRunner.commitTransaction(); + + return { + message: TicketMessageEnum.CREATED, + ticketId: ticket.id, + }; + } catch (error) { + this.logger.error("Error in create ticket transaction", error); + await queryRunner.rollbackTransaction(); + throw error; + } finally { + await queryRunner.release(); } - const ticket = this.ticketsRepository.create({ - ...createDto, - user, - category: ticketCategory, - messages: [ticketMessage], - danakService: service, - }); - - await this.ticketsRepository.save(ticket); - - return { - message: TicketMessageEnum.CREATED, - ticketId: ticket.id, - }; } //******************************** */ @@ -224,9 +254,9 @@ export class TicketsService { let ticket: null | Ticket = null; if (isAdmin) { - ticket = await queryRunner.manager.findOneBy(Ticket, { id: ticketId }); + ticket = await queryRunner.manager.findOne(Ticket, { where: { id: ticketId }, relations: { user: true } }); } else { - ticket = await queryRunner.manager.findOneBy(Ticket, { id: ticketId, user: { id: userId } }); + ticket = await queryRunner.manager.findOne(Ticket, { where: { id: ticketId, user: { id: userId } }, relations: { user: true } }); } if (!ticket) throw new BadRequestException(TicketMessageEnum.TICKET_NOT_FOUND); @@ -252,6 +282,20 @@ export class TicketsService { await queryRunner.manager.save(TicketMessageAttachment, attachments); } + if (isAdmin) { + await this.notificationsService.createAnswerTicketNotification( + ticket.user.id, + { + ticketId: ticket.numericId.toString(), + subject: ticket.subject, + date: ticket.createdAt, + userPhone: user.phone, + userEmail: user.email, + }, + queryRunner, + ); + } + await queryRunner.commitTransaction(); return { message: TicketMessageEnum.MESSAGE_CREATED, diff --git a/src/modules/tickets/tickets.controller.ts b/src/modules/tickets/tickets.controller.ts index 5ec9eb4..49abdab 100755 --- a/src/modules/tickets/tickets.controller.ts +++ b/src/modules/tickets/tickets.controller.ts @@ -13,7 +13,6 @@ import { Pagination } from "../../common/decorators/pagination.decorator"; import { PermissionsDec } from "../../common/decorators/permission.decorator"; import { UserDec } from "../../common/decorators/user.decorator"; import { ParamDto } from "../../common/DTO/param.dto"; -import { User } from "../users/entities/user.entity"; import { PermissionEnum } from "../users/enums/permission.enum"; @Controller("tickets") @@ -106,13 +105,7 @@ export class TicketsController { @ApiOperation({ summary: "Get all ticket messages of user" }) @AuthGuards() @Get(":id/messages") - getTicketMessages( - @Param() paramDto: ParamDto, - @UserDec("id") userId: string, - @UserDec("isAdmin") isAdmin: boolean, - @UserDec() user: User, - ) { - console.log(user); + getTicketMessages(@Param() paramDto: ParamDto, @UserDec("id") userId: string, @UserDec("isAdmin") isAdmin: boolean) { return this.ticketsService.getTicketMessages(paramDto.id, userId, isAdmin); } diff --git a/src/modules/tickets/tickets.module.ts b/src/modules/tickets/tickets.module.ts index 8f4f8c8..123ed12 100755 --- a/src/modules/tickets/tickets.module.ts +++ b/src/modules/tickets/tickets.module.ts @@ -13,9 +13,15 @@ import { UsersModule } from "../users/users.module"; import { TicketMessageAttachment } from "./entities/ticket-message-attachment"; import { TicketMessageAttachmentsRepository } from "./repositories/ticket-message-attachment.repository"; import { DanakServicesModule } from "../danak-services/danak-services.module"; +import { NotificationModule } from "../notifications/notifications.module"; @Module({ - imports: [TypeOrmModule.forFeature([Ticket, TicketCategory, TicketMessageAttachment, TicketMessage]), UsersModule, DanakServicesModule], + imports: [ + TypeOrmModule.forFeature([Ticket, TicketCategory, TicketMessageAttachment, TicketMessage]), + UsersModule, + DanakServicesModule, + NotificationModule, + ], providers: [TicketsService, TicketsRepository, TicketCategoryRepository, TicketMessagesRepository, TicketMessageAttachmentsRepository], controllers: [TicketsController], exports: [TicketsService],