fix mergeResourceAndActionParams

nazieb · May 30, 2017 · 572feca · 572feca
1 parent 4ab0d25
commit 572feca
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "optimusjs",
-  "version": "0.4.3",
+  "version": "0.4.4",
   "description": "Transform API Blueprint into any other formats",
   "main": "dist/index.js",
   "bin": {

diff --git a/src/formatters/swagger.js b/src/formatters/swagger.js
@@ -261,21 +261,35 @@ function getActionParams(action) {
 function mergeResourceAndActionParams(resourceParams, actionParams) {
     const result = [];
 
-    if (resourceParams.length > 0) {
+    if (actionParams.length > 0) {
         for (let resourceParam of resourceParams) {
-           result.push(resourceParam);
+            if (resourceParam.hasOwnProperty("type")) {
+                result.push(resourceParam);
+            }
+        }
+
+        for (let actionParam of actionParams) {
+            for (let resourceParam of resourceParams) {
+                if (resourceParam.name == actionParam.name) {
+                    actionParam["in"] = resourceParam["in"];
+                    result.push(actionParam);
+                }
+            }
         }
-    }
 
-    if (actionParams.length > 0) {
         for (let actionParam of actionParams) {
             if (actionParam.hasOwnProperty("in") && (actionParam.in == "body" || actionParam.in == "header")) {
                 result.push(actionParam);
                 continue;
             }
         }
+    } else if (resourceParams.length > 0) {
+        for (let resourceParam of resourceParams) {
+            result.push(resourceParam);
+        }
     }
 
+
     for (let i in result) {
         const param = result[i];