From 1f4bf80908229d12400c854c078cfd2b9ab5e75c Mon Sep 17 00:00:00 2001
From: Aswin Ashar Abdullah <asharaswin@gmail.com>
Date: Fri, 26 Jul 2024 16:28:25 +0700
Subject: [PATCH] fix(SPG-661) Filter rekonsiliasi exclude status draft

---
 .../managers/batch-cancel-reconciliation.manager.ts         | 2 +-
 .../usecases/managers/cancel-reconciliation.manager.ts      | 2 +-
 .../usecases/managers/index-reconciliation.manager.ts       | 6 +++++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/modules/transaction/reconciliation/domain/usecases/managers/batch-cancel-reconciliation.manager.ts b/src/modules/transaction/reconciliation/domain/usecases/managers/batch-cancel-reconciliation.manager.ts
index 44e87ff..abd89f6 100644
--- a/src/modules/transaction/reconciliation/domain/usecases/managers/batch-cancel-reconciliation.manager.ts
+++ b/src/modules/transaction/reconciliation/domain/usecases/managers/batch-cancel-reconciliation.manager.ts
@@ -23,7 +23,7 @@ export class BatchCancelReconciliationManager extends BaseBatchUpdateStatusManag
       },
     });
 
-    if (transaction.status != STATUS.SETTLED) {
+    if ([STATUS.SETTLED, STATUS.WAITING].includes(transaction.status)) {
       throw new UnprocessableEntityException({
         statusCode: HttpStatus.UNPROCESSABLE_ENTITY,
         message: `Failed! cant cancel transaction not settled`,
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 7550736..b3464b9 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
@@ -27,7 +27,7 @@ export class CancelReconciliationManager extends BaseUpdateStatusManager<Transac
       },
     });
 
-    if (transaction.status != STATUS.SETTLED) {
+    if ([STATUS.SETTLED, STATUS.WAITING].includes(transaction.status)) {
       throw new UnprocessableEntityException({
         statusCode: HttpStatus.UNPROCESSABLE_ENTITY,
         message: `Failed! cant cancel transaction not settled`,
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 6eba3a6..e1ce839 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
@@ -7,6 +7,7 @@ import {
 } from 'src/core/modules/domain/entities/base-filter.entity';
 import { TransactionEntity } from 'src/modules/transaction/transaction/domain/entities/transaction.entity';
 import { BetweenQueryHelper } from 'src/core/helpers/query/between-query.helper';
+import { STATUS } from 'src/core/strings/constants/base.constants';
 
 @Injectable()
 export class IndexReconciliationManager extends BaseIndexManager<TransactionEntity> {
@@ -145,7 +146,10 @@ export class IndexReconciliationManager extends BaseIndexManager<TransactionEnti
     }
 
     queryBuilder.andWhere(
-      `${this.tableName}.reconciliation_status Is Not Null`,
+      `${this.tableName}.reconciliation_status Not In (:...statuses)`,
+      {
+        statuses: [STATUS.DRAFT],
+      },
     );
     return queryBuilder;
   }