clean uriTemplate from query string parameter

nazieb · Apr 11, 2017 · b346625 · b346625
1 parent 815749d
commit b346625
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "optimusjs",
-  "version": "0.1.9",
+  "version": "0.1.11",
   "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
@@ -43,8 +43,7 @@ function processResourceGroups(resourceGroups, defaultTag) {
         result.tags.push(tag);
 
         for (let resource of group.resources) {
-            const uri = resource.uriTemplate;
-
+            const uri = cleanQueryParam(resource.uriTemplate);
             const params = getResourceParams(resource);
 
             const actions = getActions(resource.actions);
@@ -53,7 +52,11 @@ function processResourceGroups(resourceGroups, defaultTag) {
                 actions[method]["parameters"] = mergeResourceAndActionParams(params, actions[method]["parameters"]);
             }
 
-            result.paths[uri] = actions;
+            if (!result.paths.hasOwnProperty(uri)) {
+                result.paths[uri] = actions;
+            } else {
+                result.paths[uri] = Object.assign(result.paths[uri], actions);
+            }
         }
     }
 
@@ -415,4 +418,11 @@ function isDateTimeValue(dateString) {
         }
     }
     return false;
+}
+
+function cleanQueryParam(uri) {
+    uri = uri.replace(/\{\?.*}/g, "");
+    uri = uri.replace(/\?.*}/g, "}");
+
+    return uri;
 }