diff --git a/src/modules/configuration/data-scheduling/domain/usecases/handlers/data-scheduling-change-status.handler.ts b/src/modules/configuration/data-scheduling/domain/usecases/handlers/data-scheduling-change-status.handler.ts
index fb32d29..174ef1b 100644
--- a/src/modules/configuration/data-scheduling/domain/usecases/handlers/data-scheduling-change-status.handler.ts
+++ b/src/modules/configuration/data-scheduling/domain/usecases/handlers/data-scheduling-change-status.handler.ts
@@ -31,7 +31,7 @@ export class DataSchedulingChangeStatusHandler
const editorName = newData.editor_name || 'System';
const totalPercentage = decryptionTotal(newData?.indexing_key);
- const description = `
${editorName} changed the status of ${scheduleName} (${totalPercentage}%) from ${oldStatus} to ${newStatus}.
`;
+ const description = `${editorName} changed the status of ${scheduleName} (${totalPercentage}%) schedule from ${newData?.schedule_date_from} to ${newData.schedule_date_to} from ${oldStatus} to ${newStatus}.
`;
const payload: DataSchedulingLogEntity = {
type: SCHEDULING_LOG_TYPE_ENUM.DATA_SCHEDULING,
diff --git a/src/modules/configuration/data-scheduling/domain/usecases/handlers/data-scheduling-deleted.handler.ts b/src/modules/configuration/data-scheduling/domain/usecases/handlers/data-scheduling-deleted.handler.ts
index 1d7f366..b173251 100644
--- a/src/modules/configuration/data-scheduling/domain/usecases/handlers/data-scheduling-deleted.handler.ts
+++ b/src/modules/configuration/data-scheduling/domain/usecases/handlers/data-scheduling-deleted.handler.ts
@@ -29,7 +29,7 @@ export class DataSchedulingDeletedHandler
const scheduleName = deletedData?.name || 'an item';
const totalPercentage = decryptionTotal(deletedData?.indexing_key);
- const description = `${deleterName} deleted schedule: ${scheduleName} (${totalPercentage}%).
`;
+ const description = `${deleterName} deleted schedule: ${scheduleName} (${totalPercentage}%) schedule from ${deletedData?.schedule_date_from} to ${deletedData.schedule_date_to}.
`;
const payload: DataSchedulingLogEntity = {
type: SCHEDULING_LOG_TYPE_ENUM.DATA_SCHEDULING,
diff --git a/src/modules/configuration/data-scheduling/domain/usecases/handlers/data-scheduling-updated.handler.ts b/src/modules/configuration/data-scheduling/domain/usecases/handlers/data-scheduling-updated.handler.ts
index e2687bb..b945d97 100644
--- a/src/modules/configuration/data-scheduling/domain/usecases/handlers/data-scheduling-updated.handler.ts
+++ b/src/modules/configuration/data-scheduling/domain/usecases/handlers/data-scheduling-updated.handler.ts
@@ -128,10 +128,10 @@ export class DataSchedulingUpdatedHandler
: `${totalPercentageOld}% to ${totalPercentageNew}%`
}`;
- let description = `${editorName} has updated schedule for
${itemName} (${labelName}).`;
+ let description = `
${editorName} has updated schedule for
${itemName} (${labelName}) schedule from
${newData?.schedule_date_from} to
${newData.schedule_date_to}.
`;
if (Object.keys(changingData.old).length > 0) {
- description += ` Change details:
`;
+ description += `Change details:`;
for (const key in changingData.old) {
if (Object.prototype.hasOwnProperty.call(changingData.old, key)) {
const label = this.labelMap[key] || key;
diff --git a/src/modules/configuration/data-scheduling/domain/usecases/managers/data-scheduling-default.manager.ts b/src/modules/configuration/data-scheduling/domain/usecases/managers/data-scheduling-default.manager.ts
index 97d68ba..ceac80f 100644
--- a/src/modules/configuration/data-scheduling/domain/usecases/managers/data-scheduling-default.manager.ts
+++ b/src/modules/configuration/data-scheduling/domain/usecases/managers/data-scheduling-default.manager.ts
@@ -74,8 +74,8 @@ export class DataSchedulingManager {
if (existData?.default_value !== saveData?.default_value) {
const description = existData?.id
- ? `${saveData.editor_name} mengubah pengaturan Default Percentage dari ${existData.default_value}% menjadi ${saveData.default_value}%.
`
- : `${saveData.creator_name} membuat pengaturan Default Percentage dengan value ${saveData.default_value}%.
`;
+ ? `${saveData.editor_name} changed the Default Percentage setting from ${existData.default_value}% to ${saveData.default_value}%.
`
+ : `${saveData.creator_name} created the Default Percentage setting with a value of ${saveData.default_value}%.
`;
const logPayload: DataSchedulingLogEntity = {
type: SCHEDULING_LOG_TYPE_ENUM.DEFAULT_PERCENTAGE,
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 b260df2..33a8eac 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
@@ -79,16 +79,22 @@ export class IndexDataSchedulingLogManager extends BaseIndexManager= :dateFrom', {
+ const dateTo = this.filterParam.log_created_to;
+
+ queryBuilder.andWhere('log_created_at BETWEEN :dateFrom AND :dateTo', {
+ dateFrom: dateFrom,
+ dateTo: dateTo,
+ });
+ } else if (this.filterParam.log_created_from) {
+ const dateFrom = this.filterParam.log_created_from;
+ queryBuilder.andWhere('log_created_at >= :dateFrom', {
dateFrom: dateFrom,
});
- }
-
- if (this.filterParam.log_created_to) {
+ } else if (this.filterParam.log_created_to) {
const dateTo = this.filterParam.log_created_to;
- queryBuilder.andWhere('log_created_to <= :dateTo', {
+ queryBuilder.andWhere('log_created_at <= :dateTo', {
dateTo: dateTo,
});
}