Merge pull request #61 from lamchakchan/master

Refactored logic around payload transform
xogroup · Mar 4, 2017 · aaf9783 · aaf9783
2 parents 7a271f7 + e931e81
commit aaf9783
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 11 deletions.
diff --git a/lib/helpers/index.js b/lib/helpers/index.js
@@ -8,6 +8,7 @@ module.exports = {
     getPackageData         : require('./getPackageData'),
     isMajorCompatible      : require('./isMajorCompatible'),
     cleanObject            : require('./cleanObject'),
+    parsePayload           : require('./parsePayload'),
     reduceRouteKey         : require('./reduceRouteKey'),
     reduceCallback         : require('./reduceCallback'),
     validateLoggerContract : require('./validateLoggerContract'),

diff --git a/lib/helpers/parsePayload.js b/lib/helpers/parsePayload.js
@@ -0,0 +1,13 @@
+'use strict';
+
+const parsePayload = (payload) => {
+
+    return {
+        message : payload.properties.headers.isBuffer ? payload.content : JSON.parse(payload.content.toString()),
+        metaData : {
+            headers : Object.assign({}, payload.properties.headers)
+        }
+    };
+};
+
+module.exports = parsePayload;
diff --git a/lib/index.js b/lib/index.js
@@ -472,8 +472,8 @@ class BunnyBus extends EventEmitter{
 
                         $.logger.trace(payload);
 
-                        const message = payload.properties.headers.isBuffer ? payload.content : JSON.parse(payload.content.toString());
-                        const routeKey = Helpers.reduceRouteKey(payload, null, message);
+                        const parsedPayload = Helpers.parsePayload(payload);
+                        const routeKey = Helpers.reduceRouteKey(payload, null, parsedPayload.message);
                         const currentRetryCount = payload.properties.headers.retryCount || -1;
                         const errorQueue = `${queue}_error`;
 
@@ -491,22 +491,17 @@ class BunnyBus extends EventEmitter{
                             }
                             else if (currentRetryCount < maxRetryCount) {
                                 if (meta) {
-                                    //TODO: put this into a helper function as a refactor
-                                    const metadata = {
-                                        headers : Object.assign({}, payload.properties.headers)
-                                    };
-
                                     handlers[routeKey](
-                                        message,
-                                        metadata,
+                                        parsedPayload.message,
+                                        parsedPayload.metaData,
                                         $._ack.bind(null, payload),
                                         $._reject.bind(null, payload, errorQueue),
                                         $._requeue.bind(null, payload, queue, { routeKey })
                                     );
                                 }
                                 else {
                                     handlers[routeKey](
-                                        message,
+                                        parsedPayload.message,
                                         $._ack.bind(null, payload),
                                         $._reject.bind(null, payload, errorQueue),
                                         $._requeue.bind(null, payload, queue)

diff --git a/test/integration-edge-case.js b/test/integration-edge-case.js
@@ -46,7 +46,7 @@ describe('positive integration tests - Callback api', () => {
             });
         });
 
-        it.only('should pass when get pushes a message to a subscribed queue', (done) => {
+        it('should pass when get pushes a message to a subscribed queue', (done) => {
 
             const message = { event : 'ea', name : 'bunnybus' };
             const queueName = 'edge-case-get-to-subscribe';