diff --git a/src/modules/order/order.module.ts b/src/modules/order/order.module.ts index aae59ee..231683f 100644 --- a/src/modules/order/order.module.ts +++ b/src/modules/order/order.module.ts @@ -29,7 +29,7 @@ import { OrderItemRepository } from './repositories/order-item.repository'; UtilsModule, forwardRef(() => UserModule), productModule, - TicketModule + forwardRef(()=>TicketModule) ], controllers: [OrderController], providers: [OrderService, OrderRepository, OrderListeners, diff --git a/src/modules/order/providers/order.service.ts b/src/modules/order/providers/order.service.ts index 02d949d..240f295 100644 --- a/src/modules/order/providers/order.service.ts +++ b/src/modules/order/providers/order.service.ts @@ -17,10 +17,8 @@ import { ProductService } from 'src/modules/product/providers/product.service'; import { ProductRepository } from 'src/modules/product/repositories/product.repository'; import { TicketService } from 'src/modules/ticket/providers/tickets.service'; import { TicketRepository } from 'src/modules/ticket/repositories/tickets.repository'; -import { TicketStatus } from 'src/modules/ticket/enums/ticket-status.enum'; import { CreateInvoiceDto } from '../dto/create-invoice.dto'; import { AdminRepository } from 'src/modules/admin/repositories/admin.repository'; -import { Admin } from 'src/modules/admin/entities/admin.entity'; import { CreateOrderAsAdminDto } from '../dto/create-order-as-admin.dto'; @@ -92,7 +90,6 @@ export class OrderService { content, user, attachments, - status: TicketStatus.PENDING, admin: null, order }) @@ -173,7 +170,6 @@ export class OrderService { content, user, attachments, - status: TicketStatus.PENDING, admin: null, order }) diff --git a/src/modules/ticket/constant/index.ts b/src/modules/ticket/constant/index.ts deleted file mode 100755 index 2c24826..0000000 --- a/src/modules/ticket/constant/index.ts +++ /dev/null @@ -1,9 +0,0 @@ -export const REFERRAL_STRATEGY = "referralStrategy"; - -export const TICKET = { - QUEUE_NAME: "ticket", - AUTO_CLOSE_JOB_NAME: "auto-close-inactive", - AUTO_CLOSE_DAYS: 10, - AUTO_CLOSE_PRIORITY: 1, - AUTO_CLOSE_REPEAT_PATTERN: "0 1 * * *", -}; diff --git a/src/modules/ticket/enums/ticket-status.enum.ts b/src/modules/ticket/enums/ticket-status.enum.ts deleted file mode 100755 index 000c0e2..0000000 --- a/src/modules/ticket/enums/ticket-status.enum.ts +++ /dev/null @@ -1,5 +0,0 @@ -export enum TicketStatus { - PENDING = "PENDING", - ANSWERED = "ANSWERED", - CLOSED = "CLOSED", -} diff --git a/src/modules/ticket/providers/tickets.service.ts b/src/modules/ticket/providers/tickets.service.ts index 6274eba..af65dee 100755 --- a/src/modules/ticket/providers/tickets.service.ts +++ b/src/modules/ticket/providers/tickets.service.ts @@ -1,8 +1,5 @@ import { TicketRepository } from "../repositories/tickets.repository"; -import { InjectQueue } from "@nestjs/bullmq"; -import { BadRequestException, HttpException, Injectable, InternalServerErrorException, Logger, OnModuleInit } from "@nestjs/common"; -import { Queue } from "bullmq"; -import dayjs from "dayjs"; +import { BadRequestException, Injectable } from "@nestjs/common"; import { CreateTicketDto } from "../DTO/create-ticket.dto"; import { OrderRepository } from "src/modules/order/repositories/order.repository"; import { User } from "src/modules/user/entities/user.entity"; @@ -16,7 +13,6 @@ import { UpdateTicketDto } from "../DTO/update-ticket.dto"; @Injectable() export class TicketService { - private readonly logger = new Logger(TicketService.name); constructor( private readonly ticketsRepository: TicketRepository, diff --git a/src/modules/ticket/ticket.module.ts b/src/modules/ticket/ticket.module.ts index 550bd68..1bb252c 100755 --- a/src/modules/ticket/ticket.module.ts +++ b/src/modules/ticket/ticket.module.ts @@ -1,24 +1,24 @@ -import { BullModule } from "@nestjs/bullmq"; -import { Module } from "@nestjs/common"; - -import { TICKET } from "./constant"; +import { forwardRef, Module } from "@nestjs/common"; import { Ticket } from "./entities/ticket.entity"; - import { TicketService } from "./providers/tickets.service"; - import { TicketRepository } from "./repositories/tickets.repository"; import { TicketsController } from "./tickets.controller"; import { MikroOrmModule } from "@mikro-orm/nestjs"; +import { OrderModule } from "../order/order.module"; +import { AdminModule } from "../admin/admin.module"; +import { UserModule } from "../user/user.module"; @Module({ imports: [ + forwardRef(()=>OrderModule), MikroOrmModule.forFeature([Ticket]), - BullModule.registerQueue({ name: TICKET.QUEUE_NAME }), + AdminModule, + UserModule ], providers: [TicketService, TicketRepository], controllers: [TicketsController], - exports: [TicketService,TicketRepository], + exports: [TicketService, TicketRepository], }) export class TicketModule { } diff --git a/src/modules/ticket/tickets.controller.ts b/src/modules/ticket/tickets.controller.ts index dd1bedc..6420fe8 100755 --- a/src/modules/ticket/tickets.controller.ts +++ b/src/modules/ticket/tickets.controller.ts @@ -1,4 +1,4 @@ -import { Body, Controller, Delete, Get, HttpCode, HttpStatus, Param, Patch, Post, Query } from "@nestjs/common"; +import { Body, Controller, Delete, Get, Param, Patch, Post, Query } from "@nestjs/common"; import { ApiOperation, ApiTags } from "@nestjs/swagger"; import { CreateTicketDto } from "./DTO/create-ticket.dto"; import { FindTicketQueryDto } from "./DTO/search-ticket-query.dto"; @@ -7,7 +7,7 @@ import { UserId } from "src/common/decorators"; import { AdminId } from "src/common/decorators/admin-id.decorator"; import { UpdateTicketDto } from "./DTO/update-ticket.dto"; -@Controller("tickets") +@Controller() @ApiTags("Tickets") export class TicketsController {