From 5d94c7a07c7471020fd527a88e7df4b33ee17b92 Mon Sep 17 00:00:00 2001
From: Firman Ramdhani <framdhani01@gamil.com>
Date: Fri, 11 Jul 2025 11:42:08 +0700
Subject: [PATCH] feat: add filter data scheduling date

---
 .../index-data-scheduling-log.manager.ts      | 17 ++++++++++++++-
 .../managers/index-data-scheduling.manager.ts |  2 +-
 .../data-scheduling-read.controller.ts        |  7 +++++--
 .../dto/filter-data-scheduling.dto.ts         | 21 +++++++++++++++++++
 4 files changed, 43 insertions(+), 4 deletions(-)

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<DataScheduli
 
     if (this.filterParam.schedule_date_to) {
       const dateTo = this.filterParam.schedule_date_to;
-      queryBuilder.andWhere('schedule_date_from <= :dateTo', {
+      queryBuilder.andWhere('schedule_date_to <= :dateTo', {
         dateTo: dateTo,
       });
     }
+
+    if (this.filterParam.log_created_from) {
+      const dateFrom = this.filterParam.log_created_from;
+      queryBuilder.andWhere('log_created_from >= :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<DataSchedulingE
 
     if (this.filterParam.schedule_date_to) {
       const dateTo = this.filterParam.schedule_date_to;
-      queryBuilder.andWhere('schedule_date_from <= :dateTo', {
+      queryBuilder.andWhere('schedule_date_to <= :dateTo', {
         dateTo: dateTo,
       });
     }
diff --git a/src/modules/configuration/data-scheduling/infrastructure/data-scheduling-read.controller.ts b/src/modules/configuration/data-scheduling/infrastructure/data-scheduling-read.controller.ts
index 669c12f..552045f 100644
--- a/src/modules/configuration/data-scheduling/infrastructure/data-scheduling-read.controller.ts
+++ b/src/modules/configuration/data-scheduling/infrastructure/data-scheduling-read.controller.ts
@@ -1,5 +1,8 @@
 import { Controller, Get, Param, Query } from '@nestjs/common';
-import { FilterDataSchedulingDto } from './dto/filter-data-scheduling.dto';
+import {
+  FilterDataSchedulingDto,
+  FilterDataSchedulingLogDto,
+} from './dto/filter-data-scheduling.dto';
 import { Pagination } from 'src/core/response';
 import { PaginationResponse } from 'src/core/response/domain/ok-response.interface';
 import {
@@ -43,7 +46,7 @@ export class DataSchedulingLogReadController {
   @Pagination()
   @ExcludePrivilege()
   async index(
-    @Query() params: FilterDataSchedulingDto,
+    @Query() params: FilterDataSchedulingLogDto,
   ): Promise<PaginationResponse<DataSchedulingLogEntity>> {
     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)