diff --git a/bot/validations.ts b/bot/validations.ts index e10f8be2..ab8729cd 100644 --- a/bot/validations.ts +++ b/bot/validations.ts @@ -6,7 +6,7 @@ import { IOrder } from "../models/order"; import { Telegraf } from "telegraf"; const { parsePaymentRequest } = require('invoices'); -const { ObjectId } = require('mongoose').Types; +import { Types } from 'mongoose'; import * as messages from './messages'; import { Order, User, Community } from '../models'; import { isIso4217, isDisputeSolver } from '../util'; @@ -94,7 +94,6 @@ const validateAdmin = async (ctx: MainContext, id?: string) => { if (user.default_community_id) community = await Community.findOne({ _id: user.default_community_id }); - if (community === null) throw Error("Community was not found in DB"); const isSolver = isDisputeSolver(community, user); if (!user.admin && !isSolver) @@ -593,7 +592,7 @@ const validateParams = async (ctx: MainContext, paramNumber: number, errOutputSt const validateObjectId = async (ctx: MainContext, id: string) => { try { - if (!ObjectId.isValid(id)) { + if (!Types.ObjectId.isValid(id)) { await messages.notValidIdMessage(ctx); return false; } @@ -647,7 +646,7 @@ const isBannedFromCommunity = async (user: UserDocument, communityId: string) => } }; -module.exports = { +export { validateSellOrder, validateBuyOrder, validateUser,