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
+20 -20
View File
@@ -1,5 +1,5 @@
import { Injectable, NotFoundException } from '@nestjs/common';
import { Food } from '../../foods/entities/food.entity';
import { Product } from ../../..products/entities/product.entity';
import { Cart, CartItem } from '../interfaces/cart.interface';
import { CartValidationService } from './cart-validation.service';
import { CartCalculationService } from './cart-calculation.service';
@@ -13,15 +13,15 @@ export class CartItemService {
) {}
/**
* Create a new cart item from food
* Create a new cart item from product
*/
createCartItem(food: Food, quantity: number): CartItem {
const itemPrice = food.price || 0;
const itemDiscount = food.discount || 0;
createCartItem(product: Product, quantity: number): CartItem {
const itemPrice = product.price || 0;
const itemDiscount = product.discount || 0;
return {
foodId: food.id,
foodTitle: food.title,
foodId: product.id,
foodTitle: product.title,
quantity,
price: itemPrice,
discount: itemDiscount,
@@ -30,15 +30,15 @@ export class CartItemService {
}
/**
* Build cart item from food (updating existing item if provided)
* Build cart item from product (updating existing item if provided)
*/
buildCartItemFromFood(food: Food, quantity: number, previous?: CartItem): CartItem {
const itemPrice = food.price || 0;
const itemDiscount = food.discount || 0;
buildCartItemFromFood(product: Product, quantity: number, previous?: CartItem): CartItem {
const itemPrice = product.price || 0;
const itemDiscount = product.discount || 0;
return {
...(previous ?? ({} as CartItem)),
foodId: food.id,
foodTitle: food.title,
foodId: product.id,
foodTitle: product.title,
quantity,
price: itemPrice,
discount: itemDiscount,
@@ -57,19 +57,19 @@ export class CartItemService {
* Add or increment item in cart
*/
async addOrIncrementItem(cart: Cart, foodId: string, restaurantId: string, quantityToAdd: number): Promise<void> {
const food = await this.validationService.validateAndGetFood(foodId, restaurantId, quantityToAdd);
const product = await this.validationService.validateAndGetFood(foodId, restaurantId, quantityToAdd);
const index = this.getItemIndex(cart, food.id);
const index = this.getItemIndex(cart, product.id);
if (index < 0) {
cart.items.push(this.createCartItem(food, quantityToAdd));
cart.items.push(this.createCartItem(product, quantityToAdd));
return;
}
const existingItem = cart.items[index];
const newQuantity = existingItem.quantity + quantityToAdd;
this.validationService.validateStock(food, newQuantity);
cart.items[index] = this.buildCartItemFromFood(food, newQuantity, existingItem);
this.validationService.validateStock(product, newQuantity);
cart.items[index] = this.buildCartItemFromFood(product, newQuantity, existingItem);
}
/**
@@ -100,8 +100,8 @@ export class CartItemService {
return;
}
const food = await this.validationService.getFoodOrFail(foodId);
cart.items[itemIndex] = this.buildCartItemFromFood(food, newQuantity, existingItem);
const product = await this.validationService.getFoodOrFail(foodId);
cart.items[itemIndex] = this.buildCartItemFromFood(product, newQuantity, existingItem);
}
}