fix: the problem in the invoice pay
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
import { ApiProperty } from "@nestjs/swagger";
|
||||
import { ArrayMinSize, IsEnum, IsNotEmpty, IsOptional, IsString, IsUUID, IsUrl, Length } from "class-validator";
|
||||
|
||||
import { TicketMessageEnum } from "../../../common/enums/message.enum";
|
||||
import { TicketMessageEnum, UserMessage } from "../../../common/enums/message.enum";
|
||||
import { TicketPriority } from "../enums/ticket-priority.enum";
|
||||
|
||||
export class CreateTicketDto {
|
||||
@@ -46,3 +46,10 @@ export class CreateTicketDto {
|
||||
@ApiProperty({ description: "attachment url", example: ["https://example.com/test.png"] })
|
||||
attachmentUrls?: string[];
|
||||
}
|
||||
|
||||
export class CreateTicketByAdminDto extends CreateTicketDto {
|
||||
@IsNotEmpty({ message: UserMessage.USER_ID_REQUIRED })
|
||||
@IsUUID("4", { message: UserMessage.USER_ID_SHOULD_BE_A_UUID })
|
||||
@ApiProperty({ description: "User ID of the ticket", example: "123e4567-e89b-12d3-a456-426614174000" })
|
||||
userId: string;
|
||||
}
|
||||
|
||||
@@ -17,7 +17,7 @@ import { AdminsService } from "../../users/providers/admins.service";
|
||||
import { UsersService } from "../../users/providers/users.service";
|
||||
import { CreateTicketCategoryDto } from "../DTO/create-ticket-category.dto";
|
||||
import { CreateTicketMessageDto } from "../DTO/create-ticket-message.dto";
|
||||
import { CreateTicketDto } from "../DTO/create-ticket.dto";
|
||||
import { CreateTicketByAdminDto, 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";
|
||||
@@ -207,6 +207,56 @@ export class TicketsService implements OnModuleInit {
|
||||
await queryRunner.release();
|
||||
}
|
||||
}
|
||||
//******************************** */
|
||||
|
||||
async createTicketByAdmin(createDto: CreateTicketByAdminDto, adminId: string) {
|
||||
const queryRunner = this.dataSource.createQueryRunner();
|
||||
|
||||
try {
|
||||
await queryRunner.connect();
|
||||
await queryRunner.startTransaction();
|
||||
|
||||
const [user, admin, ticketCategory] = await Promise.all([
|
||||
this.usersService.findOneByIdWithQueryRunner(createDto.userId, queryRunner),
|
||||
this.usersService.findOneByIdWithQueryRunner(adminId, queryRunner),
|
||||
queryRunner.manager.findOne(TicketCategory, { where: { id: createDto.categoryId }, relations: { group: { users: true } } }),
|
||||
]);
|
||||
|
||||
if (!ticketCategory) throw new BadRequestException(TicketMessageEnum.CATEGORY_NOT_FOUND);
|
||||
|
||||
const ticketMessage: Partial<TicketMessage> = { content: createDto.message, author: admin };
|
||||
|
||||
const ticket = queryRunner.manager.create(Ticket, {
|
||||
...createDto,
|
||||
user,
|
||||
category: ticketCategory,
|
||||
messages: [ticketMessage],
|
||||
assignedTo: admin,
|
||||
});
|
||||
|
||||
await queryRunner.manager.save(Ticket, ticket);
|
||||
|
||||
await this.notificationQueue.addTicketNotification(user.id, {
|
||||
ticketId: ticket.numericId.toString(),
|
||||
subject: ticket.subject,
|
||||
date: ticket.createdAt,
|
||||
userPhone: user.phone,
|
||||
userEmail: user.email,
|
||||
});
|
||||
|
||||
await queryRunner.commitTransaction();
|
||||
|
||||
return {
|
||||
message: TicketMessageEnum.CREATED,
|
||||
ticketId: ticket.id,
|
||||
};
|
||||
} catch (error) {
|
||||
await queryRunner.rollbackTransaction();
|
||||
throw error;
|
||||
} finally {
|
||||
await queryRunner.release();
|
||||
}
|
||||
}
|
||||
|
||||
//******************************** */
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ import { ApiOperation, ApiTags } from "@nestjs/swagger";
|
||||
|
||||
import { CreateTicketCategoryDto } from "./DTO/create-ticket-category.dto";
|
||||
import { CreateTicketMessageDto } from "./DTO/create-ticket-message.dto";
|
||||
import { CreateTicketDto } from "./DTO/create-ticket.dto";
|
||||
import { CreateTicketByAdminDto, 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";
|
||||
@@ -69,13 +69,13 @@ export class TicketsController {
|
||||
return this.ticketsService.createTicket(createDto, userId);
|
||||
}
|
||||
|
||||
// @ApiOperation({ summary: "create ticket by admin" })
|
||||
// @AdminRoute()
|
||||
// @PermissionsDec(PermissionEnum.TICKETS)
|
||||
// @Post("admin")
|
||||
// createTicketByAdmin(@Body() createDto: CreateTicketDto, @UserDec("id") adminId: string) {
|
||||
// return this.ticketsService.createTicketByAdmin(createDto, adminId);
|
||||
// }
|
||||
@ApiOperation({ summary: "create ticket by admin" })
|
||||
@AdminRoute()
|
||||
@PermissionsDec(PermissionEnum.TICKETS)
|
||||
@Post("admin")
|
||||
createTicketByAdmin(@Body() createDto: CreateTicketByAdminDto, @UserDec("id") adminId: string) {
|
||||
return this.ticketsService.createTicketByAdmin(createDto, adminId);
|
||||
}
|
||||
|
||||
@ApiOperation({ summary: "Get all tickets of user ==> user route" })
|
||||
@Get()
|
||||
|
||||
Reference in New Issue
Block a user