Building postBody routeParams urlParams in a consistence way.

Author: lygstate

lib/angular2/index.js

@@ -499,20 +499,46 @@ module.exports = function generate(ctx) {
     }
     return output.join(', ');
   }
+  /**
+   * @method paramIsRoute
+   * @description
+   * Testing if the param is route type
+   */
+  function paramIsRoute(param) {
+    return (param.http && param.http.source === 'path') || (param.arg && param.arg.match(/(id|fk|file|container)/));
+  }
+  /**
+   * @method paramIsFunction
+   * @description
+   * Testing if the param is function type
+   */
+  function paramIsFunction(param) {
+    return typeof param.http === 'function'
+  }
   /**
    * @method buildPostBody
    * @description
    * Define which properties should be passed while posting data (POST, PUT, PATCH)
    */
   function buildPostBody(postData) {
     let output = [];
-    if (postData && postData.length > 0) {
-      output.push('');
-      let l = postData.length;
-      postData.forEach((property, i) => {
-        output.push(`      ${property.arg}: ${property.arg}${(i < l - 1) ? ',' : ''}`);
-      });
-      output.push('    ');
+    if (Array.isArray(postData)) {
+      postData = postData.filter(param => {
+        // Filter out route params and function params
+        if (paramIsRoute(param) || paramIsFunction(param)) {
+          return false
+        }
+        // Make sure the param is body
+        return param.http && param.http.source == 'body'
+      })
+      if (postData.length > 0) {
+        output.push('');
+        let l = postData.length;
+        postData.forEach((property, i) => {
+          output.push(`      ${property.arg}: ${property.arg}${(i < l - 1) ? ',' : ''}`);
+        });
+        output.push('    ');
+      }
     }
     return output.join('\n');
   }
@@ -525,13 +551,12 @@ module.exports = function generate(ctx) {
     let output = [''];
     // filter params that should not go over url query string
     urlParams = urlParams.filter(param => {
-      let isRouteParam = (param.http && param.http.source === 'path') || (param.arg && param.arg.match(/(id|fk|file|container)/))
-      // Filter out route params
-      if (isRouteParam) {
-        return false
-      }
-      // Filter out body params
-      return (!param.http || param.http.source != 'body')
+        // Filter out route params and function params
+        if (paramIsRoute(param) || paramIsFunction(param)) {
+          return false
+        }
+        // Filter out body params
+        return (!param.http || param.http.source != 'body')
     });
     if (model.isUser && methodName === 'logout')
       output.push(`       urlParams.access_token = this.auth.getAccessTokenId();`);
@@ -549,12 +574,15 @@ module.exports = function generate(ctx) {
    */
   function buildRouteParams(routeParams) {
     let output = [];
-    if (routeParams && routeParams.length > 0) {
-      output.push('');
-      routeParams.forEach((param, i) => {
-        output.push(`      ${param.arg}: ${param.arg}${(i < routeParams.length - 1) ? ',' : ''}`);
-      });
-      output.push('    ');
+    if (routeParams) {
+      routeParams = routeParams.filter(paramIsRoute)
+      if (routeParams.length > 0) {
+        output.push('');
+        routeParams.forEach((param, i) => {
+          output.push(`      ${param.arg}: ${param.arg}${(i < routeParams.length - 1) ? ',' : ''}`);
+        });
+        output.push('    ');
+      }
     }
     return output.join('\n');
   }

lib/angular2/shared/services/custom/service.ejs

@@ -52,21 +52,14 @@ export class <%-: modelName %>Api extends BaseLoopBackApi {
   }
 
   // SET URL PARAMS
-  var urlParams = action.accepts.filter(function(param) {
-    return !(param.arg === "access_token" && methodName === "logout") && !(param.http && param.http.source === 'path');
-  });
+  var urlParams = action.accepts;
   // SET POST BODY
   var postData;
   if (httpVerb == 'POST' || httpVerb == 'PUT' || httpVerb == 'PATCH') {
-    postData = action.accepts.filter(function(param) {
-      return !(param.http && (param.http.source == 'query' || param.http.source == 'path'))
-        && !(param.arg === "access_token" && methodName === "logout");
-    });
+    postData = action.accepts;
   }
   // SET ROUTE PARAMS
-  var routeParams = action.accepts.filter(function(param) {
-    return (param.http && param.http.source === 'path') || (param.arg && param.arg.match(/(id|fk|file|container)/));
-  });
+  var routeParams = action.accepts
 -%>
   public <%- normalizeMethodName(methodName) %>(<%- buildMethodParams(model, methodName, action.accepts) %>): Observable<<%- buildObservableType(modelName, methodName)  %>> {
     let method: string = <%-: httpVerb | q %>;