From 75f5b46a8eeba4a8315f8a5af6a177610a0249fa Mon Sep 17 00:00:00 2001
From: Himani Raghav <himani.raghav@wipro.com>
Date: Wed, 18 Jan 2023 18:28:09 +0530
Subject: [PATCH] updated payload

---
 src/app.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/app.js b/src/app.js
index 80b2a3f..2723fb5 100644
--- a/src/app.js
+++ b/src/app.js
@@ -64,7 +64,8 @@ const dataHandler = (messageSet, topic, partition) => Promise.each(messageSet, a
     const m2mToken = await helper.getM2MToken()
     const v5Challenge = await helper.getRequest(`${config.V5_CHALLENGE_API_URL}/${challengeUuid}`, m2mToken)
     // TODO : Cleanup. Pulling the billingAccountId from the payload, it's not part of the challenge object
-    messageJSON.payload = { billingAccountId: messageJSON.payload.billingAccountId, ...v5Challenge.body }
+    const billingAccountId= _.get(v5Challenge, 'billing.billingAccountId', messageJSON.payload.billingAccountId)
+    messageJSON.payload = { billingAccountId, ...v5Challenge.body }
   } catch (err) {
     logger.debug('Failed to fetch challenge information')
     logger.logFullError(err)