This commit is contained in:
2026-02-21 16:35:45 +03:30
parent 221e949f32
commit 408290bf5a
7 changed files with 51 additions and 91 deletions
+4 -8
View File
@@ -3,10 +3,7 @@ import { EntityManager } from '@mikro-orm/postgresql';
import { OrderRepository } from '../repositories/order.repository';
import { FindOrdersDto } from '../dto/find-orders.dto';
import { EventEmitter2 } from '@nestjs/event-emitter';
import {
CreateOrderAsAdminDto,
CreateOrderItemDtoAsAdmin,
} from '../dto/create-order.dto';
import { CreateOrderAsAdminDto } from '../dto/create-order.dto';
import { UserService } from 'src/modules/user/providers/user.service';
import { OrderStatusEnum } from '../interface/order.interface';
import { ProductService } from 'src/modules/product/providers/product.service';
@@ -18,16 +15,15 @@ import { Order } from '../entities/order.entity';
import { PaymentRepository } from 'src/modules/payment/repositories/payment.repository';
import { AdminService } from 'src/modules/admin/providers/admin.service';
import { UpdateOrderAsAdminDto } from '../dto/update-order.dto';
import { FindOrderItemsDto } from '../dto/find-order-items.dto';
import { PermissionService } from 'src/modules/roles/providers/permissions.service';
import { PermissionEnum } from 'src/common/enums/permission.enum';
import { User } from 'src/modules/user/entities/user.entity';
import { OrderType } from '../entities/order-type.entity';
import { Product } from 'src/modules/product/entities/product.entity';
import { InvoiceItem } from 'src/modules/invoice/entities/invoice-item.entity';
import { PaginatedResult } from 'src/common/interfaces/pagination.interface';
import { UpdateStatusAsDesignerDto } from '../dto/update-status-as-designer.dto';
import { UpdateStatusDto } from '../dto/update-status.dto';
import { Category } from 'src/modules/product/entities/category.entity';
@Injectable()
export class OrderService {
@@ -79,7 +75,7 @@ export class OrderService {
const creator = await this.adminService.findOrFail(adminId);
const type = await this.em.findOne(OrderType, { id: dto.typeId });
const type = await this.em.findOne(Category, { id: dto.typeId });
if (!type) {
throw new NotFoundException(`Order type with ID ${dto.typeId} not found.`);
}
@@ -157,7 +153,7 @@ export class OrderService {
order.user = user as User;
}
if (dto.typeId !== undefined) {
const type = await this.em.findOne(OrderType, { id: dto.typeId });
const type = await this.em.findOne(Category, { id: dto.typeId });
if (!type) {
throw new NotFoundException(`Order type with ID ${dto.typeId} not found.`);
}