chore: add manaual refer for ticket of super admin

This commit is contained in:
mahyargdz
2025-04-21 16:17:48 +03:30
parent e7d547f19b
commit 03d8c431fa
8 changed files with 86 additions and 34 deletions
@@ -12,6 +12,7 @@ import { PaginationUtils } from "../../utils/providers/pagination.utils";
import { CreateTicketCategoryDto } from "../DTO/create-ticket-category.dto";
import { CreateTicketMessageDto } from "../DTO/create-ticket-message.dto";
import { CreateTicketDto } from "../DTO/create-ticket.dto";
import { ReferTicketDto } from "../DTO/refer-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";
@@ -23,7 +24,6 @@ import { TicketStatus } from "../enums/ticket-status.enum";
import { TicketCategoryRepository } from "../repositories/tickets-category.repository";
import { TicketMessagesRepository } from "../repositories/tickets-message.repository";
import { TicketsRepository } from "../repositories/tickets.repository";
@Injectable()
export class TicketsService {
private readonly logger = new Logger(TicketsService.name);
@@ -58,13 +58,11 @@ export class TicketsService {
.loadRelationCountAndMap("category.usersCount", "group.users");
if (queryDto.isActive !== undefined) {
queryBuilder.andWhere("category.isActive = :isActive", {
isActive: queryDto.isActive === 1,
});
queryBuilder.andWhere("category.isActive = :isActive", { isActive: queryDto.isActive === 1 });
}
if (queryDto.q) {
queryBuilder.where("category.title LIKE :q", { q: `%${queryDto.q}%` });
queryBuilder.where("category.title ILIKE :q", { q: `%${queryDto.q}%` });
}
const [categories, count] = await queryBuilder.skip(skip).take(limit).getManyAndCount();
@@ -276,8 +274,6 @@ export class TicketsService {
if (ticket.status === TicketStatus.CLOSED) throw new BadRequestException(TicketMessageEnum.TICKET_CLOSED);
const isSuperAdmin = await this.usersService.isSuperAdmin(userId);
console.log(isSuperAdmin);
console.log(ticket.assignedTo);
if (isAdmin && !isSuperAdmin && ticket.assignedTo?.id !== userId)
throw new BadRequestException(TicketMessageEnum.TICKET_NOT_ASSIGNED_TO_USER);
@@ -355,6 +351,50 @@ export class TicketsService {
message: TicketMessageEnum.CLOSED,
};
}
//******************************** */
async referTicket(ticketId: string, userId: string, referDto: ReferTicketDto) {
const queryRunner = this.dataSource.createQueryRunner();
try {
await queryRunner.connect();
await queryRunner.startTransaction();
const isSuperAdmin = await this.usersService.isSuperAdmin(userId);
if (!isSuperAdmin) throw new BadRequestException(TicketMessageEnum.TICKET_NOT_ASSIGNED_TO_USER);
const ticket = await this.ticketsRepository.findTicketById(ticketId);
if (!ticket) throw new BadRequestException(TicketMessageEnum.TICKET_NOT_FOUND);
const admin = await this.usersService.findOneByIdWithQueryRunner(referDto.adminId, queryRunner);
ticket.assignedTo = admin;
await queryRunner.manager.save(this.ticketsRepository.target, ticket);
await this.notificationsService.createAssignTicketNotificationForAdmin(
admin.id,
{
ticketId: ticket.numericId.toString(),
subject: ticket.subject,
date: ticket.createdAt,
userPhone: ticket.user.phone,
userEmail: ticket.user.email,
user: `${ticket.user.firstName} ${ticket.user.lastName}`,
},
queryRunner,
);
await queryRunner.commitTransaction();
return {
message: TicketMessageEnum.REFERRED,
ticket,
};
} catch (error) {
await queryRunner.rollbackTransaction();
throw error;
} finally {
await queryRunner.release();
}
}
//******************************** */
@@ -375,7 +415,6 @@ export class TicketsService {
//***************************** */
private async assignTicketAndNotify(ticket: Ticket, ticketCategory: TicketCategory, user: User, queryRunner: QueryRunner) {
// const assignedUser = await this.autoAssignUser(ticketCategory);
const assignedUser = await this.referralService.assignAdmin(ticketCategory.group);
//
ticket.assignedTo = assignedUser;