From 819d88f49437de1bec1e4d7971d97c50e1dab381 Mon Sep 17 00:00:00 2001 From: akshayitzme Date: Mon, 18 Sep 2023 16:26:03 +0530 Subject: [PATCH] fix: failing test --- backend/database/bespoke.ts | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/backend/database/bespoke.ts b/backend/database/bespoke.ts index 35ff903e..d8f65ba7 100644 --- a/backend/database/bespoke.ts +++ b/backend/database/bespoke.ts @@ -8,6 +8,7 @@ import { import { ModelNameEnum } from '../../models/types'; import DatabaseCore from './core'; import { BespokeFunction } from './types'; +import { DateTime } from 'luxon'; import { DocItem, ReturnDocItem } from 'models/inventory/types'; import { safeParseFloat } from 'utils/index'; import { Money } from 'pesa'; @@ -401,11 +402,9 @@ export class BespokeQueries { await db.knex!(ModelNameEnum.SalesInvoice) .select('name') .where('isPOS', true) - .andWhereRaw('datetime(date) > datetime(?)', [ - new Date(fromDate.setHours(0, 0, 0)).toISOString(), - ]) - .andWhereRaw('datetime(date) < datetime(?)', [ - new Date(toDate.setHours(0, 0, 0)).toISOString(), + .andWhereBetween('date', [ + DateTime.fromJSDate(fromDate).toISODate(), + DateTime.fromJSDate(toDate).toISODate(), ]) ).map((row: { name: string }) => row.name);