diff --git a/src/app.module.ts b/src/app.module.ts index 3570990..863da9e 100755 --- a/src/app.module.ts +++ b/src/app.module.ts @@ -7,13 +7,13 @@ import { ConfigModule } from "@nestjs/config"; import { ThrottlerModule } from "@nestjs/throttler"; import { TypeOrmModule } from "@nestjs/typeorm"; import { MailerModule } from "@nestjs-modules/mailer"; -import { TelegrafModule } from "nestjs-telegraf"; +// import { TelegrafModule } from "nestjs-telegraf"; import { bullMqConfig } from "./configs/bullmq.config"; import { cacheConfig } from "./configs/cache.config"; import { mailerConfig } from "./configs/mailer.config"; import { rateLimitConfig } from "./configs/rateLimit.config"; -import { telegrafConfig } from "./configs/telegraf.config"; +// import { telegrafConfig } from "./configs/telegraf.config"; import { databaseConfigs } from "./configs/typeorm.config"; import { HTTPLogger } from "./core/middlewares/logger.middleware"; import { AddressModule } from "./modules/address/address.module"; @@ -42,7 +42,7 @@ import { UsersModule } from "./modules/users/users.module"; import { WalletsModule } from "./modules/wallets/wallets.module"; @Module({ imports: [ - TelegrafModule.forRootAsync(telegrafConfig()), + // TelegrafModule.forRootAsync(telegrafConfig()), MailerModule.forRootAsync(mailerConfig()), BullModule.forRootAsync(bullMqConfig()), ThrottlerModule.forRootAsync(rateLimitConfig()), diff --git a/src/configs/typeorm.config.ts b/src/configs/typeorm.config.ts index 8d8378f..9391ab2 100755 --- a/src/configs/typeorm.config.ts +++ b/src/configs/typeorm.config.ts @@ -13,7 +13,7 @@ export function databaseConfigs(): TypeOrmModuleAsyncOptions { username: configService.getOrThrow("DB_USER"), password: configService.getOrThrow("DB_PASS"), autoLoadEntities: true, - synchronize: configService.getOrThrow("NODE_ENV") == "production" ? false : true, + synchronize: configService.getOrThrow("NODE_ENV") == "production" ? false : false, logging: configService.getOrThrow("NODE_ENV") == "production" ? false : true, migrationsTableName: "typeorm_migrations", migrationsRun: false, diff --git a/src/modules/logger/logger.service.ts b/src/modules/logger/logger.service.ts index 958cb8c..05c47e3 100755 --- a/src/modules/logger/logger.service.ts +++ b/src/modules/logger/logger.service.ts @@ -18,7 +18,7 @@ export class LoggerService extends Logger { async sendLogToTelegram(level: string, message: string) { try { const logMessage = `🚨 *${level.toUpperCase()} Log:*\n${message}`; - await this.bot.telegram.sendMessage(this.chatId, logMessage, { + await this.bot?.telegram?.sendMessage(this.chatId, logMessage, { parse_mode: "MarkdownV2", }); } catch (error) { diff --git a/src/modules/users/providers/users.service.ts b/src/modules/users/providers/users.service.ts index eaeaaa1..409f7c2 100755 --- a/src/modules/users/providers/users.service.ts +++ b/src/modules/users/providers/users.service.ts @@ -81,7 +81,10 @@ export class UsersService { /************************************************************ */ async getMe(userId: string) { - const user = await this.userRepository.findOne({ where: { id: userId }, relations: { roles: true } }); + const user = await this.userRepository.findOne({ + where: { id: userId }, + relations: { roles: true, realUser: { address: { city: { province: true } } }, legalUser: { address: { city: { province: true } } } }, + }); if (!user) throw new BadRequestException(UserMessage.USER_NOT_FOUND); return { user }; }