From e014b70f6c720085af006fef4c0d2ea200d39555 Mon Sep 17 00:00:00 2001
From: Fadli <muhammad.fadli@bangun-kreatif.com>
Date: Fri, 1 Jul 2022 02:29:14 +0700
Subject: [PATCH] -fix bugs in add condition for ppob_callback can't hit 2
 times if the transaction is already success or failed (only pending)

---
 src/transaction/ppob_callback.controller.ts | 14 +++++-----
 src/transaction/transaction.service.ts      | 30 ++++++++++++---------
 2 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/src/transaction/ppob_callback.controller.ts b/src/transaction/ppob_callback.controller.ts
index 90c5eae..d415de3 100644
--- a/src/transaction/ppob_callback.controller.ts
+++ b/src/transaction/ppob_callback.controller.ts
@@ -23,14 +23,14 @@ export class PpobCallbackController {
               response['clientid'],
               response,
           );
+    } else {
+
+      //TODO: UPDATE BERHASIL
+      await this.transactionService.checkCallbackOrderSuccess(
+          response['clientid'],
+          response,
+      );
     }
-
-    //TODO: UPDATE BERHASIL
-        await this.transactionService.checkCallbackOrderSuccess(
-            response['clientid'],
-            response,
-        );
-
   }
 
   @Public()
diff --git a/src/transaction/transaction.service.ts b/src/transaction/transaction.service.ts
index 4059304..48f2b1c 100644
--- a/src/transaction/transaction.service.ts
+++ b/src/transaction/transaction.service.ts
@@ -1077,18 +1077,19 @@ export class TransactionService {
           HttpStatus.BAD_REQUEST,
       );
     } else {
-
-      const updateTransaction =
-          await this.callbackOrderFailed(
+      const updateTransaction = await this.callbackOrderFailed(
               supplier_trx_id,
               callback,
           );
 
-      return {
-        updateTransaction,
-        statusCode: HttpStatus.BAD_REQUEST,
-        message: 'failed to proccess',
-      };
+      throw new HttpException(
+          {
+            updateTransaction,
+            statusCode: HttpStatus.BAD_REQUEST,
+            error: 'updated transaction to failed',
+          },
+          HttpStatus.BAD_REQUEST,
+      );
 
     }
 
@@ -1124,11 +1125,14 @@ export class TransactionService {
               callback,
           );
 
-      return {
-        updateTransaction,
-        statusCode: HttpStatus.OK,
-        message: 'success',
-      };
+      throw new HttpException(
+          {
+            updateTransaction,
+            statusCode: HttpStatus.OK,
+            error: 'success',
+          },
+          HttpStatus.OK,
+      );
 
     }