From 5ab14f5c62be3f6bc8521140ad3bcc21b95d33ba Mon Sep 17 00:00:00 2001 From: Aswin Ashar Abdullah Date: Wed, 3 Jul 2024 23:07:27 +0700 Subject: [PATCH] fix(SPG-566) BE - Validasi season periode tipe range date --- .../managers/helpers/validate.helper.ts | 36 ++++--------------- 1 file changed, 6 insertions(+), 30 deletions(-) diff --git a/src/modules/season-related/season-period/domain/usecases/managers/helpers/validate.helper.ts b/src/modules/season-related/season-period/domain/usecases/managers/helpers/validate.helper.ts index ee74adc..643c425 100644 --- a/src/modules/season-related/season-period/domain/usecases/managers/helpers/validate.helper.ts +++ b/src/modules/season-related/season-period/domain/usecases/managers/helpers/validate.helper.ts @@ -38,36 +38,12 @@ export async function ValidateSeasonPeriodHelper(dataService, data) { let datas = await query .andWhere('data.priority = :priority', { priority: priority }) - .andWhere( - new Brackets((query) => { - // contoh data tanggal 1 Agustus - 31 Agustus - query.orWhere( - new Brackets((q) => { - return q - .andWhere('data.start_date <= :inputStartDate ', { - inputStartDate: data.start_date, - }) - .andWhere('data.end_date >= :inputEndDate', { - inputEndDate: data.end_date, - }); - }), - ); - - query.orWhere( - new Brackets((q) => { - return q - .andWhere('data.start_date >= :inputStartDate ', { - inputStartDate: data.start_date, - }) - .andWhere('data.end_date <= :inputEndDate', { - inputEndDate: data.end_date, - }); - }), - ); - - return query; - }), - ) + .andWhere(`data.start_date < :inputStartDate`, { + inputStartDate: data.end_date, + }) + .andWhere(`data.end_date > :inputEndDate`, { + inputEndDate: data.start_date, + }) .getMany(); if (priority == 2) {