clean

src/modules/foods/providers/food.service.ts

@@ -7,27 +7,24 @@ import { EntityManager } from '@mikro-orm/postgresql';
 import { RequiredEntityData, FilterQuery } from '@mikro-orm/core';
 import { Food } from '../entities/food.entity';
 import { CategoryMessage, FoodMessage, RestMessage } from 'src/common/enums/message.enum';
-import { RestRepository } from 'src/modules/restaurants/repositories/rest.repository';
-import { CacheService } from '../../utils/cache.service';
 import { Favorite } from '../entities/favorite.entity';
 import { MealType } from '../interface/food.interface';
 import { Inventory } from 'src/modules/inventory/entities/inventory.entity';
+import { RestaurantsService } from 'src/modules/restaurants/providers/restaurants.service';
 
 @Injectable()
 export class FoodService {
   constructor(
     private readonly foodRepository: FoodRepository,
     private readonly categoryRepository: CategoryRepository,
-    private readonly restRepository: RestRepository,
+    private readonly restService: RestaurantsService,
     private readonly em: EntityManager,
   ) { }
 
   async create(restId: string, createFoodDto: CreateFoodDto) {
     const { categoryId, dailyStock = 0, ...rest } = createFoodDto;
-    const restaurant = await this.restRepository.findOne({ id: restId });
-    if (!restaurant) {
-      throw new NotFoundException(RestMessage.NOT_FOUND);
-    }
+    const restaurant = await this.restService.findOneOrFail(restId);
+
     const category = await this.categoryRepository.findOne({ id: categoryId, restaurant: { id: restId } });
     if (!category) {
       throw new NotFoundException(CategoryMessage.NOT_FOUND);
@@ -84,7 +81,7 @@ export class FoodService {
   /**
    * Public food detail (only active foods are visible).
    */
-  async findPublicById(foodId: string, userId?: string): Promise<any> {
+  async findByIdPublic(foodId: string, userId?: string): Promise<any> {
     const food = await this.foodRepository.findOne({ id: foodId, isActive: true }, { populate: ['category', 'inventory'] });
     if (!food) throw new NotFoundException(FoodMessage.NOT_FOUND);
     let isFavorite = false;
@@ -101,7 +98,8 @@ export class FoodService {
    * Admin food detail (scoped to the authenticated restaurant).
    */
   async findAdminById(restId: string, id: string): Promise<Food> {
-    const food = await this.foodRepository.findOne({ id, restaurant: { id: restId } }, { populate: ['category', 'inventory'] });
+    const food = await this.foodRepository.findOne({ id, restaurant: { id: restId } },
+      { populate: ['category', 'inventory'] });
 
     if (!food) throw new NotFoundException(FoodMessage.NOT_FOUND);
     return food;
@@ -113,11 +111,6 @@ export class FoodService {
    * @returns Array of active foods matching current day and meal time
    */
   async findByWeekDateAndMealType(slug: string): Promise<Food[]> {
-    const restaurant = await this.restRepository.findOne({ slug });
-    if (!restaurant) {
-      throw new NotFoundException(RestMessage.NOT_FOUND);
-    }
-
     const { iranWeekDay, mealType } = this.getCurrentIranTimeContext();
 
     const queryFilter: FilterQuery<Food> = {
@@ -263,11 +256,6 @@ export class FoodService {
   async getMyFavorites(userId: string, restId: string) {
     return this.em.find(Favorite, { user: userId, food: { restaurant: { id: restId } } }, { populate: ['food'] });
   }
-  /**
-   * Invalidate cache for restaurant foods
-   */
-  // private async invalidateRestaurantFoodsCache(slug: string): Promise<void> {
-  //   const cacheKey = `${this.FOODS_BY_RESTAURANT_CACHE_KEY_PREFIX}${slug}`;
-  //   await this.cacheService.del(cacheKey);
-  // }
+
+
 }