Merge pull request #117 from Optum/master

Fix Fix for SOAP services returning only first response (stable)
Optum · Nov 6, 2018 · 4ef52cf · 4ef52cf
2 parents 0eef372 + 92b453c
commit 4ef52cf
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 46 deletions.
diff --git a/app.js b/app.js
@@ -149,13 +149,6 @@ function init() {
   const users = require('./routes/users');
   app.use('/api/users', users);
 
-  //Error Handling
-  app.use(function(err, req, res, next){ 
-    console.log(err.stack); 
-    res.status(404).send(err.message); 
-  });
-
-
   // ready for testing (see test/test.js)
   app.emit('started');
 }

diff --git a/routes/virtual.js b/routes/virtual.js
@@ -61,53 +61,58 @@ function registerRRPair(service, rrpair) {
         }
       }
 
-      // match request body based on template
-      let templates = service.matchTemplates;
+      // try exact math
+      match = deepEquals(payload, reqData);
 
-      if (templates && templates.length) {
-        for (let template of templates) {
-          if (rrpair.payloadType === 'XML') {
-            xml2js.parseString(template, function(err, xmlTemplate) {
-              if (err) {
-                debug(err);
-                return;
+      if (!match) {
+        // match based on template
+        let templates = service.matchTemplates;
+
+        if (templates && templates.length) {
+          for (let template of templates) {
+            if (!template) {
+              break;
+            }
+
+            if (rrpair.payloadType === 'XML') {
+              xml2js.parseString(template, function(err, xmlTemplate) {
+                if (err) {
+                  debug(err);
+                  return;
+                }
+                template = xmlTemplate;
+              });
+            }
+            else if (rrpair.payloadType === 'JSON') {
+              try {
+                template = JSON.parse(template);
+              }
+              catch(e) {
+                debug(e);
+                continue;
               }
-              template = xmlTemplate;
-            });
-          }
-          else if (rrpair.payloadType === 'JSON') {
-            try {
-              template = JSON.parse(template);
             }
-            catch(e) {
-              debug(e);
-              continue;
+
+            const flatTemplate = flattenObject(template);
+            const flatPayload  = flattenObject(payload);
+            const flatReqData  = flattenObject(reqData);
+
+            const trimmedPayload = {}; const trimmedReqData = {};
+
+            for (let field in flatTemplate) {
+              trimmedPayload[field] = flatPayload[field];
+              trimmedReqData[field] = flatReqData[field];
             }
-          }
-
-          const flatTemplate = flattenObject(template);
-          const flatPayload  = flattenObject(payload);
-          const flatReqData  = flattenObject(reqData);
-
-          const trimmedPayload = {}; const trimmedReqData = {};
 
-          for (let field in flatTemplate) {
-            trimmedPayload[field] = flatPayload[field];
-            trimmedReqData[field] = flatReqData[field];
+            debug('received payload (from template): ' + JSON.stringify(trimmedPayload, null, 2));
+            debug('expected payload (from template): ' + JSON.stringify(trimmedReqData, null, 2));
+
+            match = deepEquals(trimmedPayload, trimmedReqData);
+
+            if (match) break;
           }
-
-          debug('received payload (from template): ' + JSON.stringify(trimmedPayload, null, 2));
-          debug('expected payload (from template): ' + JSON.stringify(trimmedReqData, null, 2));
-
-          match = deepEquals(trimmedPayload, trimmedReqData);
-
-          if (match) break;
         }
       }
-      // else match against all fields
-      else {
-        match = deepEquals(payload, reqData);
-      }
 
       if (!rrpair.reqData || match) {
         // check request queries