diff --git a/src/modules/foods/controllers/food.controller.ts b/src/modules/foods/controllers/food.controller.ts index e94e966..3f127ed 100644 --- a/src/modules/foods/controllers/food.controller.ts +++ b/src/modules/foods/controllers/food.controller.ts @@ -44,8 +44,7 @@ export class FoodController { @ApiOperation({ summary: 'Get a food by id' }) @ApiParam({ name: 'foodId', required: true }) findPublicFoodById(@Param('foodId') foodId: string, @UserId() userId?: string): Promise { - const a = this.foodsService.findByIdPublic(foodId, userId); - return a; + return this.foodsService.findByIdPublic(foodId, userId); } @Post('public/foods/favorite/:foodId') diff --git a/src/modules/foods/providers/food.service.ts b/src/modules/foods/providers/food.service.ts index dc6f53d..0a6fdc6 100644 --- a/src/modules/foods/providers/food.service.ts +++ b/src/modules/foods/providers/food.service.ts @@ -93,9 +93,13 @@ export class FoodService { if (userId) { isFavorite = (await this.em.count(Favorite, { user: { id: userId }, food: { id: foodId } })) > 0; } + const availability = this.getFoodAvailability(food); + return { ...food, isFavorite, + isAvailable: availability.isAvailable, + unavailabilityMessage: availability.unavailabilityMessage, }; }