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
+11 -11
View File
@@ -2,9 +2,9 @@ import { Injectable, Logger } from '@nestjs/common';
import { Cron } from '@nestjs/schedule';
import { EntityManager } from '@mikro-orm/postgresql';
import { EventEmitter2 } from '@nestjs/event-emitter';
import { Payment } from '../../payments/entities/payment.entity';
import { PaymentMethodEnum, PaymentStatusEnum } from '../../payments/interface/payment';
import { InventoryService } from '../../inventory/inventory.service';
import { Payment } from '../../../payments/entities/payment.entity';
import { PaymentMethodEnum, PaymentStatusEnum } from '../../../payments/interface/payment';
import { InventoryService } from '../../../inventory/inventory.service';
import { OrderStatus } from '../interface/order.interface';
import { Order } from '../entities/order.entity';
import { OrderStatusChangedEvent } from '../events/order.events';
@@ -37,7 +37,7 @@ export class OrdersCrone {
status: PaymentStatusEnum.Pending,
createdAt: { $lte: cutoff },
},
{ populate: ['order', 'order.items', 'order.items.food'] },
{ populate: ['order', 'order.items', 'order.items.product'] },
);
if (!payments || payments.length === 0) {
@@ -53,7 +53,7 @@ export class OrdersCrone {
const payment = await em.findOne(
Payment,
{ id: p.id },
{ populate: ['order', 'order.items', 'order.items.food'] },
{ populate: ['order', 'order.items', 'order.items.product'] },
);
if (!payment) return;
if (payment.status !== PaymentStatusEnum.Pending) return;
@@ -67,7 +67,7 @@ export class OrdersCrone {
// prepare restore payload
const items = (payment.order as any).items || [];
const restorePayload = {
items: items.map((it: any) => ({ foodId: it.food.id, quantity: it.quantity })),
items: items.map((it: any) => ({ foodId: it.product.id, quantity: it.quantity })),
};
if (restorePayload.items.length > 0) {
@@ -114,7 +114,7 @@ export class OrdersCrone {
},
updatedAt: { $lte: cutoff },
},
{ populate: ['restaurant'] },
{ populate: ['shop'] },
);
if (!orders || orders.length === 0) {
@@ -130,7 +130,7 @@ export class OrdersCrone {
const reloadedOrder = await em.findOne(
Order,
{ id: order.id },
{ populate: ['restaurant', 'user'] },
{ populate: ['shop', 'user'] },
);
if (!reloadedOrder) return;
if (
@@ -145,9 +145,9 @@ export class OrdersCrone {
const previousStatus = reloadedOrder.status;
const restaurantId =
typeof reloadedOrder.restaurant === 'string'
? reloadedOrder.restaurant
: reloadedOrder.restaurant.id;
typeof reloadedOrder.shop === 'string'
? reloadedOrder.shop
: reloadedOrder.shop.id;
// Update order status and history
reloadedOrder.status = OrderStatus.COMPLETED;