From e401a1bf4cdcc2f0c21e99aaae2f4bb191861b0e Mon Sep 17 00:00:00 2001
From: Aswin Ashar Abdullah <asharaswin@gmail.com>
Date: Fri, 2 Aug 2024 15:16:43 +0700
Subject: [PATCH] fix(SPG-742) Filter status, sumber, tipe pembayaran,
 pembayaran via, bank, tgl konfirmasi belum jalan

---
 .../domain/entities/base-filter.entity.ts     |  1 +
 .../usecase/managers/base-index.manager.ts    | 12 ++++--
 .../managers/index-reconciliation.manager.ts  | 37 +++++++++++++------
 3 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/src/core/modules/domain/entities/base-filter.entity.ts b/src/core/modules/domain/entities/base-filter.entity.ts
index 357412d..c447c41 100644
--- a/src/core/modules/domain/entities/base-filter.entity.ts
+++ b/src/core/modules/domain/entities/base-filter.entity.ts
@@ -22,6 +22,7 @@ export interface Param {
   data: string[];
   additional?: any[];
   leftJoin?: any[];
+  isStatus?: boolean;
 }
 
 export interface RelationParam {
diff --git a/src/core/modules/domain/usecase/managers/base-index.manager.ts b/src/core/modules/domain/usecase/managers/base-index.manager.ts
index 63a7c56..fb5ece5 100644
--- a/src/core/modules/domain/usecase/managers/base-index.manager.ts
+++ b/src/core/modules/domain/usecase/managers/base-index.manager.ts
@@ -52,10 +52,14 @@ export abstract class BaseIndexManager<Entity> extends BaseReadManager {
         // ? karena jika tidak, ketika dia search "active" maka "inactive" juga ikut
         return `'${STATUS[statusData.toUpperCase()]}'` ?? `'%${statusData}%'`;
       });
-      specificFilter.push({
-        cols: `${this.tableName}.status::text`,
-        data: data,
-      });
+
+      const exist = specificFilter.find((item) => item.isStatus);
+      if (!exist) {
+        specificFilter.push({
+          cols: `${this.tableName}.status::text`,
+          data: data,
+        });
+      }
     }
 
     new SpecificSearchFilter<Entity>(
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 ebb2c92..2e0ec56 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
@@ -65,6 +65,11 @@ export class IndexReconciliationManager extends BaseIndexManager<TransactionEnti
 
   get specificFilter(): Param[] {
     return [
+      {
+        cols: `${this.tableName}.reconciliation_status::text`,
+        data: this.filterParam.statuses,
+        isStatus: true,
+      },
       {
         cols: `${this.tableName}.customer_name`,
         data: this.filterParam.customer_names,
@@ -115,36 +120,46 @@ export class IndexReconciliationManager extends BaseIndexManager<TransactionEnti
 
     if (this.filterParam.payment_type) {
       queryBuilder.andWhere(
-        `${this.tableName}.creator_counter_no In (:...counters)`,
+        `${this.tableName}.payment_type::text In (:...paymentType)`,
         {
-          counters: [this.filterParam.couner_no],
+          paymentType: [this.filterParam.payment_type],
         },
       );
     }
 
     if (this.filterParam.payment_via) {
-      queryBuilder.andWhere(`${this.tableName}.payment_type In (:...type)`, {
-        type: [this.filterParam.payment_via],
-      });
+      queryBuilder.andWhere(
+        `${this.tableName}.payment_type::text In (:...type)`,
+        {
+          type: [`%${this.filterParam.payment_via}%`],
+        },
+      );
     }
 
     if (this.filterParam.payment_bank) {
       queryBuilder.andWhere(
-        `${this.tableName}.payment_type_method_name In (:...banks)`,
+        `${this.tableName}.payment_type_method_name::text In (:...banks)`,
         {
-          banks: [this.filterParam.payment_bank],
+          banks: [`%${this.filterParam.payment_bank}%`],
         },
       );
     }
 
     if (this.filterParam.confirmation_date_from) {
+      const confirmationDateFrom = new Date(
+        this.filterParam?.confirmation_date_from,
+      ).getTime();
+      const confirmationDateTo = new Date(
+        `${this.filterParam?.confirmation_date_to?.split(' ')[0]} 23:59:59`,
+      ).getTime();
+
       new BetweenQueryHelper(
         queryBuilder,
         this.tableName,
-        'payment_date',
-        this.filterParam.confirmation_date_from,
-        this.filterParam.confirmation_date_to,
-        'payment_created',
+        'reconciliation_confirm_date',
+        confirmationDateFrom,
+        confirmationDateTo,
+        'reconciliation_confirm_dated',
       ).getQuery();
     }