From b3b26bbcb1bd7ff43c5ad34951a750bd8117c4bb Mon Sep 17 00:00:00 2001 From: morteza-mortezai Date: Tue, 6 Jan 2026 11:20:19 +0330 Subject: [PATCH] fix:direct login --- src/modules/dmenu/dmenu.module.ts | 2 ++ src/modules/dmenu/providers/restaurant.service.ts | 10 +++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/modules/dmenu/dmenu.module.ts b/src/modules/dmenu/dmenu.module.ts index 6ce1f38..651946d 100644 --- a/src/modules/dmenu/dmenu.module.ts +++ b/src/modules/dmenu/dmenu.module.ts @@ -7,11 +7,13 @@ import { IconsService } from "./providers/icons.service"; import { RestaurantService } from "./providers/restaurant.service"; import { dmenuConfig } from "../../configs/icons.config"; import { SubscriptionsModule } from "../subscriptions/subscriptions.module"; +import { UsersModule } from "../users/users.module"; @Module({ imports: [ forwardRef(() => SubscriptionsModule), + UsersModule ], controllers: [DmenuController], providers: [ diff --git a/src/modules/dmenu/providers/restaurant.service.ts b/src/modules/dmenu/providers/restaurant.service.ts index 1ab37b7..0502a9d 100644 --- a/src/modules/dmenu/providers/restaurant.service.ts +++ b/src/modules/dmenu/providers/restaurant.service.ts @@ -12,6 +12,7 @@ import { UpdateRestaurantDto } from "../DTO/update-restaurant.dto"; import { CreateMyRestaurantAdminDto } from "../DTO/create-restaurant-admin.dto"; import { PlanEnum, ISetupRestaurant, IExternalApiResponse } from "../interface/plan.interface"; import { SubscriptionsService } from "../../subscriptions/providers/subscriptions.service"; +import { UsersService } from "../../users/providers/users.service"; import { SubscriptionMessage } from "../../../common/enums/message.enum"; @@ -23,6 +24,7 @@ export class RestaurantService { @Inject(DMENU_CONFIG) private readonly config: IDmenuConfig, private readonly httpService: HttpService, private readonly subscriptionService: SubscriptionsService, + private readonly usersService: UsersService, ) { } private getHeaders(): Record { @@ -435,17 +437,19 @@ export class RestaurantService { async directLogin(userSubscriptionId: string, userId: string) { try { // 1. Get userSubscription by id - const { userSubscription } = await this.subscriptionService.getUserSubscriptionById(userSubscriptionId, userId); + const user = await this.usersService.findOneById(userId) + if (!user) { + throw new BadRequestException("User Not found"); + } // 2. Get phone from userSubscription - const phone = userSubscription.businessPhone; + const phone = user.user.phone if (!phone) { throw new BadRequestException("Phone number not found in user subscription"); } // 3. Get restaurant by subscription id const restaurant = await this.getRestaurantSubscription(userSubscriptionId); - console.log('restaurant', restaurant); // 4. Get slug from restaurant const slug = restaurant.data.slug;