diff --git a/src/modules/configuration/data-scheduling/domain/usecases/managers/index-data-scheduling-log.manager.ts b/src/modules/configuration/data-scheduling/domain/usecases/managers/index-data-scheduling-log.manager.ts index 124727d..b260df2 100644 --- a/src/modules/configuration/data-scheduling/domain/usecases/managers/index-data-scheduling-log.manager.ts +++ b/src/modules/configuration/data-scheduling/domain/usecases/managers/index-data-scheduling-log.manager.ts @@ -74,10 +74,25 @@ export class IndexDataSchedulingLogManager extends BaseIndexManager= :dateFrom', { + dateFrom: dateFrom, + }); + } + + if (this.filterParam.log_created_to) { + const dateTo = this.filterParam.log_created_to; + queryBuilder.andWhere('log_created_to <= :dateTo', { + dateTo: dateTo, + }); + } + return queryBuilder; } diff --git a/src/modules/configuration/data-scheduling/domain/usecases/managers/index-data-scheduling.manager.ts b/src/modules/configuration/data-scheduling/domain/usecases/managers/index-data-scheduling.manager.ts index 0c4c86b..3acd015 100644 --- a/src/modules/configuration/data-scheduling/domain/usecases/managers/index-data-scheduling.manager.ts +++ b/src/modules/configuration/data-scheduling/domain/usecases/managers/index-data-scheduling.manager.ts @@ -67,7 +67,7 @@ export class IndexDataSchedulingManager extends BaseIndexManager> { return await this.orchestrator.indexLog(params); } diff --git a/src/modules/configuration/data-scheduling/infrastructure/dto/filter-data-scheduling.dto.ts b/src/modules/configuration/data-scheduling/infrastructure/dto/filter-data-scheduling.dto.ts index ab6a50f..628cd11 100644 --- a/src/modules/configuration/data-scheduling/infrastructure/dto/filter-data-scheduling.dto.ts +++ b/src/modules/configuration/data-scheduling/infrastructure/dto/filter-data-scheduling.dto.ts @@ -16,6 +16,27 @@ export class FilterDataSchedulingDto schedule_date_to: Date; } +export class FilterDataSchedulingLogDto + extends BaseFilterDto + implements FilterDataSchedulingEntity +{ + @ApiProperty({ type: 'string', required: false }) + @ValidateIf((body) => body.schedule_date_from) + schedule_date_from: Date; + + @ApiProperty({ type: 'string', required: false }) + @ValidateIf((body) => body.schedule_date_to) + schedule_date_to: Date; + + @ApiProperty({ type: Number, required: false }) + @ValidateIf((body) => body.log_created_from) + log_created_from: number; + + @ApiProperty({ type: Number, required: false }) + @ValidateIf((body) => body.log_created_to) + log_created_to: number; +} + export class FilterActiveDataSchedulingDto { // @ApiProperty({ type: 'string', required: true }) // @ValidateIf((body) => body.schedule_date_from)