From ab9ec4ac0e7c816c4834a78b88591a7d4763b02b Mon Sep 17 00:00:00 2001
From: Firman Ramdhani <33869609+firmanramdhani@users.noreply.github.com>
Date: Tue, 10 Sep 2024 17:11:20 +0700
Subject: [PATCH 1/2] feat(SPG-935): add column payment_date_bank

---
 ...payment-date-bank-column-at-transaction.ts | 19 +++++++++++++++++++
 .../managers/detail-reconciliation.manager.ts |  1 +
 .../managers/index-reconciliation.manager.ts  |  1 +
 .../managers/update-reconciliation.manager.ts |  1 +
 .../data/models/transaction.model.ts          |  3 +++
 .../domain/entities/transaction.entity.ts     |  1 +
 6 files changed, 26 insertions(+)
 create mode 100644 src/database/migrations/1725962197762-add-payment-date-bank-column-at-transaction.ts

diff --git a/src/database/migrations/1725962197762-add-payment-date-bank-column-at-transaction.ts b/src/database/migrations/1725962197762-add-payment-date-bank-column-at-transaction.ts
new file mode 100644
index 0000000..f8f7789
--- /dev/null
+++ b/src/database/migrations/1725962197762-add-payment-date-bank-column-at-transaction.ts
@@ -0,0 +1,19 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class AddPaymentDateBankColumnAtTransaction1725962197762
+  implements MigrationInterface
+{
+  name = 'AddPaymentDateBankColumnAtTransaction1725962197762';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "transactions" ADD "payment_date_bank" date`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "transactions" DROP COLUMN "payment_date_bank"`,
+    );
+  }
+}
diff --git a/src/modules/transaction/reconciliation/domain/usecases/managers/detail-reconciliation.manager.ts b/src/modules/transaction/reconciliation/domain/usecases/managers/detail-reconciliation.manager.ts
index 0d8b25a..00a1270 100644
--- a/src/modules/transaction/reconciliation/domain/usecases/managers/detail-reconciliation.manager.ts
+++ b/src/modules/transaction/reconciliation/domain/usecases/managers/detail-reconciliation.manager.ts
@@ -43,6 +43,7 @@ export class DetailReconciliationManager extends BaseDetailManager<TransactionEn
       `${this.tableName}.payment_code_reference`,
       `${this.tableName}.payment_code`,
       `${this.tableName}.payment_date`,
+      `${this.tableName}.payment_date_bank`,
 
       `${this.tableName}.payment_total`,
       `${this.tableName}.payment_total_net_profit`,
diff --git a/src/modules/transaction/reconciliation/domain/usecases/managers/index-reconciliation.manager.ts b/src/modules/transaction/reconciliation/domain/usecases/managers/index-reconciliation.manager.ts
index 026de91..062c49f 100644
--- a/src/modules/transaction/reconciliation/domain/usecases/managers/index-reconciliation.manager.ts
+++ b/src/modules/transaction/reconciliation/domain/usecases/managers/index-reconciliation.manager.ts
@@ -58,6 +58,7 @@ export class IndexReconciliationManager extends BaseIndexManager<TransactionEnti
       `${this.tableName}.payment_code_reference`,
       `${this.tableName}.payment_code`,
       `${this.tableName}.payment_date`,
+      `${this.tableName}.payment_date_bank`,
 
       `${this.tableName}.payment_total`,
       `${this.tableName}.payment_total_net_profit`,
diff --git a/src/modules/transaction/reconciliation/domain/usecases/managers/update-reconciliation.manager.ts b/src/modules/transaction/reconciliation/domain/usecases/managers/update-reconciliation.manager.ts
index 30d9b15..4de46d6 100644
--- a/src/modules/transaction/reconciliation/domain/usecases/managers/update-reconciliation.manager.ts
+++ b/src/modules/transaction/reconciliation/domain/usecases/managers/update-reconciliation.manager.ts
@@ -25,6 +25,7 @@ export class UpdateReconciliationManager extends BaseUpdateManager<TransactionEn
       reconciliation_mdr: this.data.reconciliation_mdr ?? null,
       payment_total_net_profit: net_profit,
       payment_date: this.data.payment_date ?? this.oldData.payment_date,
+      payment_date_bank: this.data.payment_date_bank ?? null,
     });
 
     return;
diff --git a/src/modules/transaction/transaction/data/models/transaction.model.ts b/src/modules/transaction/transaction/data/models/transaction.model.ts
index 44d994e..e78c048 100644
--- a/src/modules/transaction/transaction/data/models/transaction.model.ts
+++ b/src/modules/transaction/transaction/data/models/transaction.model.ts
@@ -148,6 +148,9 @@ export class TransactionModel
   @Column('date', { name: 'payment_date', nullable: true })
   payment_date: Date;
 
+  @Column('date', { name: 'payment_date_bank', nullable: true })
+  payment_date_bank: Date;
+
   // calculation data
   @Column('decimal', { name: 'payment_sub_total', nullable: true })
   payment_sub_total: number;
diff --git a/src/modules/transaction/transaction/domain/entities/transaction.entity.ts b/src/modules/transaction/transaction/domain/entities/transaction.entity.ts
index d9d507b..125778c 100644
--- a/src/modules/transaction/transaction/domain/entities/transaction.entity.ts
+++ b/src/modules/transaction/transaction/domain/entities/transaction.entity.ts
@@ -54,6 +54,7 @@ export interface TransactionEntity extends BaseStatusEntity {
   payment_midtrans_token: string;
   payment_midtrans_url: string;
   payment_date: Date;
+  payment_date_bank: Date;
 
   // calculation data
   payment_sub_total: number; // total invoice tanpa discount

From 6e5b19380bc43bb97218e8c7c75ecbd554809b69 Mon Sep 17 00:00:00 2001
From: Firman Ramdhani <33869609+firmanramdhani@users.noreply.github.com>
Date: Tue, 10 Sep 2024 17:15:52 +0700
Subject: [PATCH 2/2] feat(SPG-935): add column payment_date_bank

---
 .../configs/reconciliation.ts                 | 24 +++++++++++++++----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/modules/reports/shared/configs/transaction-report/configs/reconciliation.ts b/src/modules/reports/shared/configs/transaction-report/configs/reconciliation.ts
index 365f8db..8396bfb 100644
--- a/src/modules/reports/shared/configs/transaction-report/configs/reconciliation.ts
+++ b/src/modules/reports/shared/configs/transaction-report/configs/reconciliation.ts
@@ -37,9 +37,17 @@ export default <ReportConfigEntity>{
       format: DATA_FORMAT.TEXT,
     },
     {
-      column: 'main__settlement_date',
-      query: 'main.settlement_date',
-      label: 'Tgl. Pendapatan',
+      column: 'main__payment_date',
+      query: 'main.payment_date',
+      label: 'Tgl. Transaksi',
+      type: DATA_TYPE.DIMENSION,
+      format: DATA_FORMAT.DATE_TIMESTAMP,
+      date_format: 'DD/MM/YYYY',
+    },
+    {
+      column: 'main__payment_date_bank',
+      query: 'main.payment_date_bank',
+      label: 'Tgl. Transaksi Bank',
       type: DATA_TYPE.DIMENSION,
       format: DATA_FORMAT.DATE_TIMESTAMP,
       date_format: 'DD/MM/YYYY',
@@ -136,8 +144,14 @@ export default <ReportConfigEntity>{
       select_custom_options: [...Object.values(TransactionType)],
     },
     {
-      filed_label: 'Tgl. Pendapatan',
-      filter_column: 'main__settlement_date',
+      filed_label: 'Tgl. Transaksi',
+      filter_column: 'main__payment_date',
+      field_type: FILTER_FIELD_TYPE.date_range_picker,
+      filter_type: FILTER_TYPE.DATE_IN_RANGE_TIMESTAMP,
+    },
+    {
+      filed_label: 'Tgl. Transaksi Bank',
+      filter_column: 'main__payment_date_bank',
       field_type: FILTER_FIELD_TYPE.date_range_picker,
       filter_type: FILTER_TYPE.DATE_IN_RANGE_TIMESTAMP,
     },