From 655157239df85c85033fda9d790961b95f44851f Mon Sep 17 00:00:00 2001
From: Firman Ramdhani <33869609+firmanramdhani@users.noreply.github.com>
Date: Tue, 6 Aug 2024 13:23:21 +0700
Subject: [PATCH 1/2] feat(SPG-793): fix time at report log

---
 .../transaction-report/configs/cash-withdrawals.ts     | 10 ++++++----
 .../configs/transaction-report/configs/cashier-log.ts  | 10 ++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/modules/reports/shared/configs/transaction-report/configs/cash-withdrawals.ts b/src/modules/reports/shared/configs/transaction-report/configs/cash-withdrawals.ts
index d42ecb5..39391d5 100644
--- a/src/modules/reports/shared/configs/transaction-report/configs/cash-withdrawals.ts
+++ b/src/modules/reports/shared/configs/transaction-report/configs/cash-withdrawals.ts
@@ -29,17 +29,19 @@ export default <ReportConfigEntity>{
   column_configs: [
     {
       column: 'main__date',
-      query: `TO_CHAR(to_timestamp(main.created_at::double precision / 1000), 'DD-MM-YYYY')`,
+      query: 'main.created_at',
       label: 'Tanggal',
       type: DATA_TYPE.DIMENSION,
-      format: DATA_FORMAT.TEXT,
+      format: DATA_FORMAT.DATE_EPOCH,
+      date_format: 'DD-MM-YYYY',
     },
     {
       column: 'main__time',
-      query: `TO_CHAR(to_timestamp(main.created_at::double precision / 1000), 'HH24:MI')`,
+      query: 'main.created_at',
       label: 'Jam',
       type: DATA_TYPE.DIMENSION,
-      format: DATA_FORMAT.TEXT,
+      format: DATA_FORMAT.DATE_EPOCH,
+      date_format: 'HH:mm',
     },
     {
       column: 'main__drawn_by_name',
diff --git a/src/modules/reports/shared/configs/transaction-report/configs/cashier-log.ts b/src/modules/reports/shared/configs/transaction-report/configs/cashier-log.ts
index 9672770..077c67f 100644
--- a/src/modules/reports/shared/configs/transaction-report/configs/cashier-log.ts
+++ b/src/modules/reports/shared/configs/transaction-report/configs/cashier-log.ts
@@ -29,17 +29,19 @@ export default <ReportConfigEntity>{
   column_configs: [
     {
       column: 'main__date',
-      query: `TO_CHAR(to_timestamp(main.created_at::double precision / 1000), 'DD-MM-YYYY')`,
+      query: 'main.created_at',
       label: 'Tanggal',
       type: DATA_TYPE.DIMENSION,
-      format: DATA_FORMAT.TEXT,
+      format: DATA_FORMAT.DATE_EPOCH,
+      date_format: 'DD-MM-YYYY',
     },
     {
       column: 'main__time',
-      query: `TO_CHAR(to_timestamp(main.created_at::double precision / 1000), 'HH24:MI')`,
+      query: 'main.created_at',
       label: 'Jam',
       type: DATA_TYPE.DIMENSION,
-      format: DATA_FORMAT.TEXT,
+      format: DATA_FORMAT.DATE_EPOCH,
+      date_format: 'HH:mm',
     },
     {
       column: 'main__type',

From b48a469720995c7d4a385a72012094c449f70257 Mon Sep 17 00:00:00 2001
From: Firman Ramdhani <33869609+firmanramdhani@users.noreply.github.com>
Date: Tue, 6 Aug 2024 16:04:20 +0700
Subject: [PATCH 2/2] feat(SPG-772): fix key settlement date on booking module

---
 .../domain/usecases/managers/cancel-reconciliation.manager.ts | 3 ++-
 .../usecases/managers/confirm-reconciliation.manager.ts       | 4 ++++
 .../handlers/midtrans-transaction-callback.handler.ts         | 2 +-
 .../domain/usecases/handlers/settled-transaction.handler.ts   | 4 ++--
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/modules/transaction/reconciliation/domain/usecases/managers/cancel-reconciliation.manager.ts b/src/modules/transaction/reconciliation/domain/usecases/managers/cancel-reconciliation.manager.ts
index 898f2b1..a5eb3f3 100644
--- a/src/modules/transaction/reconciliation/domain/usecases/managers/cancel-reconciliation.manager.ts
+++ b/src/modules/transaction/reconciliation/domain/usecases/managers/cancel-reconciliation.manager.ts
@@ -54,8 +54,9 @@ export class CancelReconciliationManager extends BaseUpdateStatusManager<Transac
       status: this.dataStatus,
       reconciliation_status: this.dataStatus,
       payment_date: this.data.payment_date,
+      settlement_date:
+        this.dataStatus === STATUS.REJECTED ? null : this.data.settlement_date,
     });
-
     return;
   }
 
diff --git a/src/modules/transaction/reconciliation/domain/usecases/managers/confirm-reconciliation.manager.ts b/src/modules/transaction/reconciliation/domain/usecases/managers/confirm-reconciliation.manager.ts
index a2a6bd7..213341f 100644
--- a/src/modules/transaction/reconciliation/domain/usecases/managers/confirm-reconciliation.manager.ts
+++ b/src/modules/transaction/reconciliation/domain/usecases/managers/confirm-reconciliation.manager.ts
@@ -27,6 +27,10 @@ export class ConfirmReconciliationManager extends BaseUpdateStatusManager<Transa
       status: STATUS.SETTLED,
       reconciliation_status: this.dataStatus,
       payment_code: await generateInvoiceCodeHelper(this.dataService, 'PMY'),
+      settlement_date:
+        this.dataStatus === STATUS.CONFIRMED
+          ? this.data.payment_date
+          : this.data.settlement_date,
     });
 
     return;
diff --git a/src/modules/transaction/transaction/domain/usecases/handlers/midtrans-transaction-callback.handler.ts b/src/modules/transaction/transaction/domain/usecases/handlers/midtrans-transaction-callback.handler.ts
index 85d0f1c..f116154 100644
--- a/src/modules/transaction/transaction/domain/usecases/handlers/midtrans-transaction-callback.handler.ts
+++ b/src/modules/transaction/transaction/domain/usecases/handlers/midtrans-transaction-callback.handler.ts
@@ -24,7 +24,7 @@ export class MidtransCallbackHandler
   async handle(event: MidtransCallbackEvent) {
     const data_id = event.data.id;
     const data = event.data.data;
-    let old_data;
+    let old_data = undefined;
 
     const transaction = await this.dataService.getOneByOptions({
       where: {
diff --git a/src/modules/transaction/transaction/domain/usecases/handlers/settled-transaction.handler.ts b/src/modules/transaction/transaction/domain/usecases/handlers/settled-transaction.handler.ts
index 8d38740..0bf4e4d 100644
--- a/src/modules/transaction/transaction/domain/usecases/handlers/settled-transaction.handler.ts
+++ b/src/modules/transaction/transaction/domain/usecases/handlers/settled-transaction.handler.ts
@@ -68,7 +68,7 @@ export class SettledTransactionHandler
           data.payment_total_net_profit ?? 0,
         );
 
-        console.log(data, 'dsa');
+        // console.log(data, 'dsa');
         const google_calendar = await CreateEventCalendarHelper(data);
 
         Object.assign(data, {
@@ -80,7 +80,7 @@ export class SettledTransactionHandler
           calendar_link: google_calendar?.htmlLink,
         });
       } else if (oldSettled) {
-        console.log(data, 'data oldSettled');
+        // console.log(data, 'data oldSettled');
         const google_calendar = await CreateEventCalendarHelper(data);
 
         Object.assign(data, {