From 908834cdd96ef3013f3ad9cc3b26b54d2a38b361 Mon Sep 17 00:00:00 2001 From: Aswin Ashar Abdullah Date: Thu, 18 Jul 2024 18:14:46 +0700 Subject: [PATCH] fix(item) perbaikan item price --- src/core/modules/data/service/base-read.service.ts | 6 ++++-- .../configuration/midtrans/midtrans.module.ts | 5 +---- .../usecases/managers/index-item-rate.manager.ts | 2 -- .../usecases/managers/index-item-rates.manager.ts | 8 ++++---- .../domain/usecases/managers/index-item.manager.ts | 2 -- .../usecases/managers/get-current-period.manager.ts | 13 ++++++------- .../usecases/managers/helpers/validate.helper.ts | 4 ++-- 7 files changed, 17 insertions(+), 23 deletions(-) diff --git a/src/core/modules/data/service/base-read.service.ts b/src/core/modules/data/service/base-read.service.ts index 6136c01..1b646cc 100644 --- a/src/core/modules/data/service/base-read.service.ts +++ b/src/core/modules/data/service/base-read.service.ts @@ -13,9 +13,11 @@ export abstract class BaseReadService { queryBuilder: SelectQueryBuilder, params: BaseFilterEntity, ): Promise> { + const limit = params.limit ?? 10; + const page = params.page ?? 1; const [data, total] = await queryBuilder - .take(+params.limit) - .skip(+params.limit * +params.page - +params.limit) + .take(+limit) + .skip(+limit * +page - +limit) .getManyAndCount(); return { diff --git a/src/modules/configuration/midtrans/midtrans.module.ts b/src/modules/configuration/midtrans/midtrans.module.ts index 38d22f5..755a639 100644 --- a/src/modules/configuration/midtrans/midtrans.module.ts +++ b/src/modules/configuration/midtrans/midtrans.module.ts @@ -6,10 +6,7 @@ import { Global, Module } from '@nestjs/common'; @Global() @Module({ - imports: [ - ConfigModule.forRoot(), - CqrsModule, - ], + imports: [ConfigModule.forRoot(), CqrsModule], controllers: [MidtransController], providers: [MidtransService], exports: [MidtransService], diff --git a/src/modules/item-related/item-rate/domain/usecases/managers/index-item-rate.manager.ts b/src/modules/item-related/item-rate/domain/usecases/managers/index-item-rate.manager.ts index 7cc92b8..bacc411 100644 --- a/src/modules/item-related/item-rate/domain/usecases/managers/index-item-rate.manager.ts +++ b/src/modules/item-related/item-rate/domain/usecases/managers/index-item-rate.manager.ts @@ -124,8 +124,6 @@ export class IndexItemRateManager extends BaseIndexManager { queryBuilder.andWhere(`${this.tableName}.tenant_id In (:...tenantIds)`, { tenantIds: this.filterParam.tenant_ids, }); - } else if (!this.filterParam.all_item) { - queryBuilder.andWhere(`${this.tableName}.tenant_id Is Null`); } return queryBuilder; diff --git a/src/modules/item-related/item/domain/usecases/managers/index-item-rates.manager.ts b/src/modules/item-related/item/domain/usecases/managers/index-item-rates.manager.ts index d51a110..c18bc97 100644 --- a/src/modules/item-related/item/domain/usecases/managers/index-item-rates.manager.ts +++ b/src/modules/item-related/item/domain/usecases/managers/index-item-rates.manager.ts @@ -72,17 +72,17 @@ export class IndexItemRatesManager extends BaseIndexManager { } if (this.filterParam.season_period_ids) { - queryBuilder.andWhere(`season_period.id In (:...itemIds)`, { - itemIds: this.filterParam.season_period_ids, + queryBuilder.andWhere(`season_period.id In (:...seasonIdss)`, { + seasonIdss: this.filterParam.season_period_ids, }); } if (this.filterParam.start_date) { - queryBuilder.andWhere(`season_period.start_date < :inputStartDate`, { + queryBuilder.andWhere(`season_period.start_date <= :inputStartDate`, { inputStartDate: this.filterParam.end_date, }); - queryBuilder.andWhere(`season_period.end_date > :inputEndDate`, { + queryBuilder.andWhere(`season_period.end_date >= :inputEndDate`, { inputEndDate: this.filterParam.start_date, }); } diff --git a/src/modules/item-related/item/domain/usecases/managers/index-item.manager.ts b/src/modules/item-related/item/domain/usecases/managers/index-item.manager.ts index c15a1d0..e688dbb 100644 --- a/src/modules/item-related/item/domain/usecases/managers/index-item.manager.ts +++ b/src/modules/item-related/item/domain/usecases/managers/index-item.manager.ts @@ -85,8 +85,6 @@ export class IndexItemManager extends BaseIndexManager { queryBuilder.andWhere(`${this.tableName}.tenant_id In (:...tenantIds)`, { tenantIds: this.filterParam.tenant_ids, }); - } else if (!this.filterParam.all_item) { - queryBuilder.andWhere(`${this.tableName}.tenant_id Is Null`); } return queryBuilder; diff --git a/src/modules/season-related/season-period/domain/usecases/managers/get-current-period.manager.ts b/src/modules/season-related/season-period/domain/usecases/managers/get-current-period.manager.ts index 5dbfd08..220e5b7 100644 --- a/src/modules/season-related/season-period/domain/usecases/managers/get-current-period.manager.ts +++ b/src/modules/season-related/season-period/domain/usecases/managers/get-current-period.manager.ts @@ -69,13 +69,12 @@ export class CurrentSeasonPeriodManager extends BaseIndexManager, ): SelectQueryBuilder { - queryBuilder.andWhere( - `${this.tableName}.start_date BETWEEN :from AND :to`, - { - from: this.filterParam.date ?? new Date().toLocaleDateString(), - to: this.filterParam.date ?? new Date().toLocaleDateString(), - }, - ); + queryBuilder.andWhere(`${this.tableName}.start_date <= :date`, { + date: this.filterParam.date ?? new Date().toLocaleDateString(), + }); + queryBuilder.andWhere(`${this.tableName}.end_date >= :date`, { + date: this.filterParam.date ?? new Date().toLocaleDateString(), + }); queryBuilder.andWhere(`${this.tableName}.status In (:...statuses)`, { statuses: [STATUS.ACTIVE], 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 199c78b..8a8d7ce 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,10 +38,10 @@ export async function ValidateSeasonPeriodHelper(dataService, data) { let datas = await query .andWhere('data.priority = :priority', { priority: priority }) - .andWhere(`data.start_date < :inputStartDate`, { + .andWhere(`data.start_date <= :inputStartDate`, { inputStartDate: data.end_date, }) - .andWhere(`data.end_date > :inputEndDate`, { + .andWhere(`data.end_date >= :inputEndDate`, { inputEndDate: data.start_date, }) .getMany();