change entity names

This commit is contained in:
2026-02-08 09:18:20 +03:30
parent 6be6a66079
commit 9a7010dcea
180 changed files with 2751 additions and 2513 deletions
@@ -1,17 +1,17 @@
import { Entity, Index, ManyToOne, Property } from '@mikro-orm/core';
import { BaseEntity } from '../../../common/entities/base.entity';
import { BaseEntity } from '../../../../common/entities/base.entity';
import { Order } from './order.entity';
import { Food } from '../../foods/entities/food.entity';
import { Product } from ../../..products/entities/product.entity';
@Entity({ tableName: 'order_items' })
@Index({ properties: ['order'] })
@Index({ properties: ['food'] })
@Index({ properties: ['product'] })
export class OrderItem extends BaseEntity {
@ManyToOne(() => Order)
order!: Order;
@ManyToOne(() => Food)
food!: Food;
@ManyToOne(() => Product)
product!: Product;
@Property({ type: 'int' })
quantity!: number;
+17 -17
View File
@@ -11,28 +11,28 @@ import {
Unique,
type EventArgs,
} from '@mikro-orm/core';
import { BaseEntity } from '../../../common/entities/base.entity';
import { BaseEntity } from '../../../../common/entities/base.entity';
import { OrderCouponDetail, OrderStatus } from '../interface/order.interface';
import { User } from '../../users/entities/user.entity';
import { Restaurant } from '../../restaurants/entities/restaurant.entity';
import { PaymentMethod } from '../../payments/entities/payment-method.entity';
import { User } from '../../../users/entities/user.entity';
import { Shop } from ../../..shops/entities/shop.entity';
import { PaymentMethod } from '../../../payments/entities/payment-method.entity';
import { OrderItem } from './order-item.entity';
import { Delivery } from '../../delivery/entities/delivery.entity';
import { Delivery } from '../../../delivery/entities/delivery.entity';
import { OrderUserAddress, OrderCarAddress } from '../interface/order.interface';
import { Payment } from 'src/modules/payments/entities/payment.entity';
@Entity({ tableName: 'orders' })
@Unique({ properties: ['restaurant', 'orderNumber'] })
@Index({ properties: ['restaurant', 'status'] })
@Unique({ properties: ['shop', 'orderNumber'] })
@Index({ properties: ['shop', 'status'] })
@Index({ properties: ['user', 'status'] })
@Index({ properties: ['restaurant', 'orderNumber'] })
@Index({ properties: ['shop', 'orderNumber'] })
@Index({ properties: ['status'] })
export class Order extends BaseEntity {
@ManyToOne(() => User)
user!: User;
@ManyToOne(() => Restaurant)
restaurant!: Restaurant;
@ManyToOne(() => Shop)
shop!: Shop;
@ManyToOne(() => Delivery)
deliveryMethod!: Delivery;
@@ -105,19 +105,19 @@ export class Order extends BaseEntity {
const em = args.em;
const order = args.entity;
// Ensure restaurant is loaded
if (!order.restaurant) {
throw new Error('Restaurant must be set before creating order');
// Ensure shop is loaded
if (!order.shop) {
throw new Error('Shop must be set before creating order');
}
// Get the restaurant ID (handle both entity and ID cases)
const restaurantId = typeof order.restaurant === 'string' ? order.restaurant : order.restaurant.id;
// Get the shop ID (handle both entity and ID cases)
const restaurantId = typeof order.shop === 'string' ? order.shop : order.shop.id;
// Query for max orderNumber for this restaurant
// Query for max orderNumber for this shop
// Using findOne with orderBy to get the highest order number
const maxOrder = await em.findOne(
Order,
{ restaurant: restaurantId },
{ shop: restaurantId },
{
orderBy: { orderNumber: 'DESC' },
fields: ['orderNumber'],