From c6be42299e1bb04e3c057f89ee079f406d818998 Mon Sep 17 00:00:00 2001
From: Aswin Ashar Abdullah <asharaswin@gmail.com>
Date: Tue, 30 Jul 2024 17:12:55 +0700
Subject: [PATCH] fix(SPG-697) Pada index booking seharusnya transaksi pos
 tidak muncul, dan sesuaikan alur booking dengan pembayaran counter

---
 ...4920-update-column-to-transaction-table.ts | 25 +++++++++++++++++++
 .../batch-confirm-reconciliation.manager.ts   |  5 +---
 .../confirm-reconciliation.manager.ts         |  5 +---
 .../managers/detail-reconciliation.manager.ts |  1 +
 .../managers/index-reconciliation.manager.ts  |  1 +
 .../data/models/transaction-item.model.ts     |  3 +++
 .../data/models/transaction.model.ts          |  3 +++
 .../entities/transaction-item.entity.ts       |  1 +
 .../domain/entities/transaction.entity.ts     |  1 +
 .../midtrans-transaction-callback.handler.ts  |  2 ++
 .../managers/confirm-transaction.manager.ts   |  5 +---
 .../managers/detail-transaction.manager.ts    |  1 +
 .../helpers/generate-invoice-code.helper.ts   |  2 +-
 .../helpers/mapping-transaction.helper.ts     |  4 +--
 .../managers/index-transaction.manager.ts     |  2 ++
 15 files changed, 46 insertions(+), 15 deletions(-)
 create mode 100644 src/database/migrations/1722334034920-update-column-to-transaction-table.ts

diff --git a/src/database/migrations/1722334034920-update-column-to-transaction-table.ts b/src/database/migrations/1722334034920-update-column-to-transaction-table.ts
new file mode 100644
index 0000000..64a329b
--- /dev/null
+++ b/src/database/migrations/1722334034920-update-column-to-transaction-table.ts
@@ -0,0 +1,25 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class UpdateColumnToTransactionTable1722334034920
+  implements MigrationInterface
+{
+  name = 'UpdateColumnToTransactionTable1722334034920';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "transaction_items" ADD "qr_image_url" character varying`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "transactions" ADD "payment_code" character varying`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "transactions" DROP COLUMN "payment_code"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "transaction_items" DROP COLUMN "qr_image_url"`,
+    );
+  }
+}
diff --git a/src/modules/transaction/reconciliation/domain/usecases/managers/batch-confirm-reconciliation.manager.ts b/src/modules/transaction/reconciliation/domain/usecases/managers/batch-confirm-reconciliation.manager.ts
index c8ae532..e9c8347 100644
--- a/src/modules/transaction/reconciliation/domain/usecases/managers/batch-confirm-reconciliation.manager.ts
+++ b/src/modules/transaction/reconciliation/domain/usecases/managers/batch-confirm-reconciliation.manager.ts
@@ -19,10 +19,7 @@ export class BatchConfirmReconciliationManager extends BaseBatchUpdateStatusMana
       reconciliation_confirm_date: new Date().getTime(),
       status: STATUS.SETTLED,
       reconciliation_status: this.dataStatus,
-      payment_code_reference: await generateInvoiceCodeHelper(
-        this.dataService,
-        'PMY',
-      ),
+      payment_code: await generateInvoiceCodeHelper(this.dataService, 'PMY'),
     });
     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 bb670ca..a2a6bd7 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
@@ -26,10 +26,7 @@ export class ConfirmReconciliationManager extends BaseUpdateStatusManager<Transa
       reconciliation_confirm_date: new Date().getTime(),
       status: STATUS.SETTLED,
       reconciliation_status: this.dataStatus,
-      payment_code_reference: await generateInvoiceCodeHelper(
-        this.dataService,
-        'PMY',
-      ),
+      payment_code: await generateInvoiceCodeHelper(this.dataService, 'PMY'),
     });
 
     return;
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 2598647..7f40de2 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
@@ -40,6 +40,7 @@ export class DetailReconciliationManager extends BaseDetailManager<TransactionEn
       `${this.tableName}.payment_type_method_name`,
       `${this.tableName}.payment_type_method_number`,
       `${this.tableName}.payment_code_reference`,
+      `${this.tableName}.payment_code`,
       `${this.tableName}.payment_date`,
 
       `${this.tableName}.payment_total`,
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 e1ce839..11e3db5 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
@@ -53,6 +53,7 @@ export class IndexReconciliationManager extends BaseIndexManager<TransactionEnti
       `${this.tableName}.payment_type_method_name`,
       `${this.tableName}.payment_type_method_number`,
       `${this.tableName}.payment_code_reference`,
+      `${this.tableName}.payment_code`,
       `${this.tableName}.payment_date`,
 
       `${this.tableName}.payment_total`,
diff --git a/src/modules/transaction/transaction/data/models/transaction-item.model.ts b/src/modules/transaction/transaction/data/models/transaction-item.model.ts
index d00e800..dc5b278 100644
--- a/src/modules/transaction/transaction/data/models/transaction-item.model.ts
+++ b/src/modules/transaction/transaction/data/models/transaction-item.model.ts
@@ -14,6 +14,9 @@ export class TransactionItemModel
   @Column('varchar', { name: 'item_id', nullable: true })
   item_id: string;
 
+  @Column('varchar', { name: 'qr_image_url', nullable: true })
+  qr_image_url: string;
+
   @Column('varchar', { name: 'item_name', nullable: true })
   item_name: string;
 
diff --git a/src/modules/transaction/transaction/data/models/transaction.model.ts b/src/modules/transaction/transaction/data/models/transaction.model.ts
index 768a49d..e8c93a2 100644
--- a/src/modules/transaction/transaction/data/models/transaction.model.ts
+++ b/src/modules/transaction/transaction/data/models/transaction.model.ts
@@ -107,6 +107,9 @@ export class TransactionModel
   })
   payment_type: TransactionPaymentType;
 
+  @Column('varchar', { name: 'payment_code', nullable: true })
+  payment_code: string;
+
   @Column('varchar', { name: 'payment_type_method_id', nullable: true })
   payment_type_method_id: string;
 
diff --git a/src/modules/transaction/transaction/domain/entities/transaction-item.entity.ts b/src/modules/transaction/transaction/domain/entities/transaction-item.entity.ts
index 102355a..68d63cb 100644
--- a/src/modules/transaction/transaction/domain/entities/transaction-item.entity.ts
+++ b/src/modules/transaction/transaction/domain/entities/transaction-item.entity.ts
@@ -10,6 +10,7 @@ export interface TransactionItemEntity extends BaseCoreEntity {
   item_category_id: string;
   item_category_name: string;
   item_bundlings: string;
+  qr_image_url: string;
 
   // item tenant data
   item_tenant_id: string;
diff --git a/src/modules/transaction/transaction/domain/entities/transaction.entity.ts b/src/modules/transaction/transaction/domain/entities/transaction.entity.ts
index 2f3fcec..18761df 100644
--- a/src/modules/transaction/transaction/domain/entities/transaction.entity.ts
+++ b/src/modules/transaction/transaction/domain/entities/transaction.entity.ts
@@ -47,6 +47,7 @@ export interface TransactionEntity extends BaseStatusEntity {
   payment_type_method_qr: string;
   payment_card_information: string;
   payment_code_reference: string;
+  payment_code: string;
   payment_midtrans_token: string;
   payment_midtrans_url: string;
   payment_date: Date;
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 48ab93f..85d0f1c 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
@@ -10,6 +10,7 @@ import {
 import { TransactionChangeStatusEvent } from '../../entities/event/transaction-change-status.event';
 import * as _ from 'lodash';
 import { TABLE_NAME } from 'src/core/strings/constants/table.constants';
+import { generateInvoiceCodeHelper } from '../managers/helpers/generate-invoice-code.helper';
 
 @EventsHandler(MidtransCallbackEvent)
 export class MidtransCallbackHandler
@@ -36,6 +37,7 @@ export class MidtransCallbackHandler
       Object.assign(transaction, {
         status: STATUS.SETTLED,
         settlement_date: new Date(data.settlement_time),
+        payment_code: await generateInvoiceCodeHelper(this.dataService, 'PMY'),
         payment_code_reference: data.approval_code,
       });
     } else if (['pending'].includes(data['transaction_status'])) {
diff --git a/src/modules/transaction/transaction/domain/usecases/managers/confirm-transaction.manager.ts b/src/modules/transaction/transaction/domain/usecases/managers/confirm-transaction.manager.ts
index 89b6bbe..b1cf03d 100644
--- a/src/modules/transaction/transaction/domain/usecases/managers/confirm-transaction.manager.ts
+++ b/src/modules/transaction/transaction/domain/usecases/managers/confirm-transaction.manager.ts
@@ -56,10 +56,7 @@ export class ConfirmTransactionManager extends BaseUpdateStatusManager<Transacti
     }
 
     Object.assign(this.data, {
-      invoice_code:
-        this.data.payment_type == TransactionPaymentType.COUNTER
-          ? null
-          : await generateInvoiceCodeHelper(this.dataService, 'INV'),
+      invoice_code: await generateInvoiceCodeHelper(this.dataService, 'INV'),
       status: freeTransaction ? STATUS.ACTIVE : STATUS.PENDING,
       invoice_date: new Date(),
     });
diff --git a/src/modules/transaction/transaction/domain/usecases/managers/detail-transaction.manager.ts b/src/modules/transaction/transaction/domain/usecases/managers/detail-transaction.manager.ts
index 729c6ce..0453916 100644
--- a/src/modules/transaction/transaction/domain/usecases/managers/detail-transaction.manager.ts
+++ b/src/modules/transaction/transaction/domain/usecases/managers/detail-transaction.manager.ts
@@ -69,6 +69,7 @@ export class DetailTransactionManager extends BaseDetailManager<TransactionEntit
       `${this.tableName}.payment_type_method_number`,
       `${this.tableName}.payment_card_information`,
       `${this.tableName}.payment_code_reference`,
+      `${this.tableName}.payment_code`,
 
       `${this.tableName}.payment_sub_total`,
       `${this.tableName}.payment_discount_total`,
diff --git a/src/modules/transaction/transaction/domain/usecases/managers/helpers/generate-invoice-code.helper.ts b/src/modules/transaction/transaction/domain/usecases/managers/helpers/generate-invoice-code.helper.ts
index c837699..99c7779 100644
--- a/src/modules/transaction/transaction/domain/usecases/managers/helpers/generate-invoice-code.helper.ts
+++ b/src/modules/transaction/transaction/domain/usecases/managers/helpers/generate-invoice-code.helper.ts
@@ -14,7 +14,7 @@ export async function generateInvoiceCodeHelper(dataService, code) {
 
   if (code == 'PYM') {
     query = {
-      payment_code_reference: ILike(`%${month_year}%`),
+      payment_code: ILike(`%${month_year}%`),
     };
   }
 
diff --git a/src/modules/transaction/transaction/domain/usecases/managers/helpers/mapping-transaction.helper.ts b/src/modules/transaction/transaction/domain/usecases/managers/helpers/mapping-transaction.helper.ts
index 31da64f..3f50540 100644
--- a/src/modules/transaction/transaction/domain/usecases/managers/helpers/mapping-transaction.helper.ts
+++ b/src/modules/transaction/transaction/domain/usecases/managers/helpers/mapping-transaction.helper.ts
@@ -61,7 +61,6 @@ export function mappingTransaction(data) {
     season_period: season_period,
     items: items,
     payment_type_bank: payment_type_bank,
-    payment_code: data.payment_code_reference,
   });
 
   delete data.season_period_id;
@@ -82,17 +81,18 @@ export function mappingRevertTransaction(data, type) {
         editor_id: data.pos_admin?.id,
         editor_name: data.pos_admin?.name,
         edited_at: new Date(data.created_at),
+        payment_code: data.code,
       });
     } else {
       Object.assign(data, {
         creator_id: data.pos_admin?.id,
         creator_name: data.pos_admin?.name,
+        invoice_code: data.code,
       });
     }
 
     Object.assign(data, {
       id: data.booking_id ?? data._id,
-      invoice_code: data.code,
       creator_counter_no: Number(data.pos_number),
       status: STATUS.SETTLED,
       settlement_date: new Date(data.created_at),
diff --git a/src/modules/transaction/transaction/domain/usecases/managers/index-transaction.manager.ts b/src/modules/transaction/transaction/domain/usecases/managers/index-transaction.manager.ts
index 342e5c1..dbed026 100644
--- a/src/modules/transaction/transaction/domain/usecases/managers/index-transaction.manager.ts
+++ b/src/modules/transaction/transaction/domain/usecases/managers/index-transaction.manager.ts
@@ -67,6 +67,8 @@ export class IndexTransactionManager extends BaseIndexManager<TransactionEntity>
       `${this.tableName}.editor_id`,
       `${this.tableName}.editor_name`,
 
+      `${this.tableName}.payment_code`,
+      `${this.tableName}.payment_card_information`,
       `${this.tableName}.payment_type`,
       `${this.tableName}.payment_date`,
       `${this.tableName}.payment_total_pay`,