fix(item) perbaikan item price

pull/32/head
Aswin Ashar Abdullah 2024-07-18 18:14:46 +07:00
parent 4840abf18e
commit 908834cdd9
7 changed files with 17 additions and 23 deletions

View File

@ -13,9 +13,11 @@ export abstract class BaseReadService<Entity> {
queryBuilder: SelectQueryBuilder<Entity>, queryBuilder: SelectQueryBuilder<Entity>,
params: BaseFilterEntity, params: BaseFilterEntity,
): Promise<PaginationResponse<Entity>> { ): Promise<PaginationResponse<Entity>> {
const limit = params.limit ?? 10;
const page = params.page ?? 1;
const [data, total] = await queryBuilder const [data, total] = await queryBuilder
.take(+params.limit) .take(+limit)
.skip(+params.limit * +params.page - +params.limit) .skip(+limit * +page - +limit)
.getManyAndCount(); .getManyAndCount();
return { return {

View File

@ -6,10 +6,7 @@ import { Global, Module } from '@nestjs/common';
@Global() @Global()
@Module({ @Module({
imports: [ imports: [ConfigModule.forRoot(), CqrsModule],
ConfigModule.forRoot(),
CqrsModule,
],
controllers: [MidtransController], controllers: [MidtransController],
providers: [MidtransService], providers: [MidtransService],
exports: [MidtransService], exports: [MidtransService],

View File

@ -124,8 +124,6 @@ export class IndexItemRateManager extends BaseIndexManager<ItemEntity> {
queryBuilder.andWhere(`${this.tableName}.tenant_id In (:...tenantIds)`, { queryBuilder.andWhere(`${this.tableName}.tenant_id In (:...tenantIds)`, {
tenantIds: this.filterParam.tenant_ids, tenantIds: this.filterParam.tenant_ids,
}); });
} else if (!this.filterParam.all_item) {
queryBuilder.andWhere(`${this.tableName}.tenant_id Is Null`);
} }
return queryBuilder; return queryBuilder;

View File

@ -72,17 +72,17 @@ export class IndexItemRatesManager extends BaseIndexManager<ItemRateEntity> {
} }
if (this.filterParam.season_period_ids) { if (this.filterParam.season_period_ids) {
queryBuilder.andWhere(`season_period.id In (:...itemIds)`, { queryBuilder.andWhere(`season_period.id In (:...seasonIdss)`, {
itemIds: this.filterParam.season_period_ids, seasonIdss: this.filterParam.season_period_ids,
}); });
} }
if (this.filterParam.start_date) { if (this.filterParam.start_date) {
queryBuilder.andWhere(`season_period.start_date < :inputStartDate`, { queryBuilder.andWhere(`season_period.start_date <= :inputStartDate`, {
inputStartDate: this.filterParam.end_date, inputStartDate: this.filterParam.end_date,
}); });
queryBuilder.andWhere(`season_period.end_date > :inputEndDate`, { queryBuilder.andWhere(`season_period.end_date >= :inputEndDate`, {
inputEndDate: this.filterParam.start_date, inputEndDate: this.filterParam.start_date,
}); });
} }

View File

@ -85,8 +85,6 @@ export class IndexItemManager extends BaseIndexManager<ItemEntity> {
queryBuilder.andWhere(`${this.tableName}.tenant_id In (:...tenantIds)`, { queryBuilder.andWhere(`${this.tableName}.tenant_id In (:...tenantIds)`, {
tenantIds: this.filterParam.tenant_ids, tenantIds: this.filterParam.tenant_ids,
}); });
} else if (!this.filterParam.all_item) {
queryBuilder.andWhere(`${this.tableName}.tenant_id Is Null`);
} }
return queryBuilder; return queryBuilder;

View File

@ -69,13 +69,12 @@ export class CurrentSeasonPeriodManager extends BaseIndexManager<SeasonPeriodEnt
setQueryFilter( setQueryFilter(
queryBuilder: SelectQueryBuilder<SeasonPeriodEntity>, queryBuilder: SelectQueryBuilder<SeasonPeriodEntity>,
): SelectQueryBuilder<SeasonPeriodEntity> { ): SelectQueryBuilder<SeasonPeriodEntity> {
queryBuilder.andWhere( queryBuilder.andWhere(`${this.tableName}.start_date <= :date`, {
`${this.tableName}.start_date BETWEEN :from AND :to`, date: this.filterParam.date ?? new Date().toLocaleDateString(),
{ });
from: this.filterParam.date ?? new Date().toLocaleDateString(), queryBuilder.andWhere(`${this.tableName}.end_date >= :date`, {
to: this.filterParam.date ?? new Date().toLocaleDateString(), date: this.filterParam.date ?? new Date().toLocaleDateString(),
}, });
);
queryBuilder.andWhere(`${this.tableName}.status In (:...statuses)`, { queryBuilder.andWhere(`${this.tableName}.status In (:...statuses)`, {
statuses: [STATUS.ACTIVE], statuses: [STATUS.ACTIVE],

View File

@ -38,10 +38,10 @@ export async function ValidateSeasonPeriodHelper(dataService, data) {
let datas = await query let datas = await query
.andWhere('data.priority = :priority', { priority: priority }) .andWhere('data.priority = :priority', { priority: priority })
.andWhere(`data.start_date < :inputStartDate`, { .andWhere(`data.start_date <= :inputStartDate`, {
inputStartDate: data.end_date, inputStartDate: data.end_date,
}) })
.andWhere(`data.end_date > :inputEndDate`, { .andWhere(`data.end_date >= :inputEndDate`, {
inputEndDate: data.start_date, inputEndDate: data.start_date,
}) })
.getMany(); .getMany();