Fix report order on push-task-prepaid

Adhidarma Hadiwinoto
1 parent f75a562118
Showing 1 changed file with 21 additions and 16 deletions Side-by-side Diff
lib/client/push-task-prepaid.js
@@ -40,10 +40,11 @@ const pusher = (xid, task, gwName, retry) =&gt; {
                 rc: '68',
                 message: {
                     xid,
-                    'KOMODO-GW-POOL': {
+                    'KOMODO-SDK-PUSH-TRX': {
                         msg: 'B7B937A2 Invalid websocket on pushing to related gateway, will retry',
+                        gwOrigin: config.partner.handler_name,
+                        gwTarget: gwName,
                         retried: retry || 0,
-                        gwName,
                     },
                 },
             }, xid);
@@ -67,10 +68,11 @@ const pusher = (xid, task, gwName, retry) =&gt; {
                 rc: '91',
                 message: {
                     xid,
-                    'KOMODO-GW-POOL': {
+                    'KOMODO-SDK-PUSH-TRX': {
                         msg: '7151F200 Invalid websocket on pushing to related gateway, retry exceeded',
+                        gwOrigin: config.partner.handler_name,
+                        gwTarget: gwName,
                         retried: retry || 0,
-                        gwName,
                     },
                 },
             }, xid);
@@ -79,10 +81,24 @@ const pusher = (xid, task, gwName, retry) =&gt; {
         return;
     }
  
-    logger.verbose(`${MODULE_NAME} 1E8EB9B9: Pushing task`, {
+    const pushReportMsg = `${MODULE_NAME} 1E8EB9B9: Pushing task to related gateway`;
+    logger.verbose(pushReportMsg, {
         xid, gwName, task,
     });
  
+    report({
+        trx_id: task.trx_id,
+        rc: '68',
+        message: {
+            xid,
+            'KOMODO-SDK-PUSH-TRX': {
+                msg: pushReportMsg,
+                gwOrigin: config.partner.handler_name,
+                gwTarget: gwName,
+            },
+        },
+    });
+
     ws.send(JSON.stringify({
         type: 'TASK',
         ts: new Date(),
@@ -92,17 +108,6 @@ const pusher = (xid, task, gwName, retry) =&gt; {
     }));
  
     logger.verbose(`${MODULE_NAME} 7D3CECCA: Task pushed`, { xid, gwName });
-    report({
-        trx_id: task.trx_id,
-        rc: '68',
-        message: {
-            xid,
-            'KOMODO-GW-POOL': {
-                msg: '7D3CECCA Task pushed to related gateway',
-                gwName,
-            },
-        },
-    });
 };
  
 module.exports = pusher;
...	...	@@ -40,10 +40,11 @@ const pusher = (xid, task, gwName, retry) => {
40	40	rc: '68',
41	41	message: {
42	42	xid,
43		- 'KOMODO-GW-POOL': {
	43	+ 'KOMODO-SDK-PUSH-TRX': {
44	44	msg: 'B7B937A2 Invalid websocket on pushing to related gateway, will retry',
	45	+ gwOrigin: config.partner.handler_name,
	46	+ gwTarget: gwName,
45	47	retried: retry \|\| 0,
46		- gwName,
47	48	},
48	49	},
49	50	}, xid);
...	...	@@ -67,10 +68,11 @@ const pusher = (xid, task, gwName, retry) => {
67	68	rc: '91',
68	69	message: {
69	70	xid,
70		- 'KOMODO-GW-POOL': {
	71	+ 'KOMODO-SDK-PUSH-TRX': {
71	72	msg: '7151F200 Invalid websocket on pushing to related gateway, retry exceeded',
	73	+ gwOrigin: config.partner.handler_name,
	74	+ gwTarget: gwName,
72	75	retried: retry \|\| 0,
73		- gwName,
74	76	},
75	77	},
76	78	}, xid);
...	...	@@ -79,10 +81,24 @@ const pusher = (xid, task, gwName, retry) => {
79	81	return;
80	82	}
81	83
82		- logger.verbose(`${MODULE_NAME} 1E8EB9B9: Pushing task`, {
	84	+ const pushReportMsg = `${MODULE_NAME} 1E8EB9B9: Pushing task to related gateway`;
	85	+ logger.verbose(pushReportMsg, {
83	86	xid, gwName, task,
84	87	});
85	88
	89	+ report({
	90	+ trx_id: task.trx_id,
	91	+ rc: '68',
	92	+ message: {
	93	+ xid,
	94	+ 'KOMODO-SDK-PUSH-TRX': {
	95	+ msg: pushReportMsg,
	96	+ gwOrigin: config.partner.handler_name,
	97	+ gwTarget: gwName,
	98	+ },
	99	+ },
	100	+ });
	101	+
86	102	ws.send(JSON.stringify({
87	103	type: 'TASK',
88	104	ts: new Date(),
...	...	@@ -92,17 +108,6 @@ const pusher = (xid, task, gwName, retry) => {
92	108	}));
93	109
94	110	logger.verbose(`${MODULE_NAME} 7D3CECCA: Task pushed`, { xid, gwName });
95		- report({
96		- trx_id: task.trx_id,
97		- rc: '68',
98		- message: {
99		- xid,
100		- 'KOMODO-GW-POOL': {
101		- msg: '7D3CECCA Task pushed to related gateway',
102		- gwName,
103		- },
104		- },
105		- });
106	111	};
107	112
108	113	module.exports = pusher;