added alias to fn querier.

expose data.

lib/expose.js

@@ -40,30 +40,30 @@ function expose(definitions, methods, path, directory) {
                 if (items['$ref']) {
                   const refName = items['$ref'].split('/').slice(-1)[0];
                   parameters = `${parameters}
-                    this['${prop}'] = [];
+                    this.data['${prop}'] = [];
                     if (params['${prop}'].length && params['${prop}'].length > 0) {
                       params['${prop}'].forEach((object) => {
                       const ${refName} = new global.classes['${refName}'](req, res, object);
-                      this.${prop}.push(${refName});
+                      this.data.${prop}.push(${refName});
                     });
                   }`;
                 } else {
                   parameters = `${parameters}
-                    this['${prop}'] = req.body['${prop}'];`;
+                    this.data['${prop}'] = req.body['${prop}'];`;
                 }
               } else {
                 parameters = `${parameters}
-                  this['${prop}'] = req.body['${prop}'];`;
+                  this.data['${prop}'] = req.body['${prop}'];`;
               }
             } else {
               parameters = `${parameters}
-                this['${prop}'] = req.body['${prop}'];`;
+                this.data['${prop}'] = req.body['${prop}'];`;
             }
           } else {
             if (definitions[definition].properties[prop]['$ref']) {
               const refName = definitions[definition].properties[prop]['$ref'].split('/').slice(-1)[0];
               parameters = `${parameters}
-                this['${prop}'] = new global.classes['${refName}'](req, res, req.body['${prop}']);`;
+                this.data['${prop}'] = new global.classes['${refName}'](req, res, req.body['${prop}']);`;
             }
           }
         });
@@ -137,6 +137,7 @@ function expose(definitions, methods, path, directory) {
             this.req = req;
             this.res = res;
             this.params = params;
+            this.data = {};
             ${parameters}
             ${validation}  
             this.schema = ${inspect(definitions[definition], { showHidden: false, depth: null })}; 
@@ -151,12 +152,12 @@ function expose(definitions, methods, path, directory) {
 
       // create file in the destination folder
       fs.writeFileSync(`${destination}/${definition}.js`,
-        beauty(content, { indent_size: 2 }),
-        (err) => {
-          if (err) {
-            throw new Error(err.message || err);
-          }
-        });
+          beauty(content, { indent_size: 2 }),
+          (err) => {
+            if (err) {
+              throw new Error(err.message || err);
+            }
+          });
     });
   } catch (err) {
     throw new Error(err.message || err);

lib/querier.js

@@ -8,18 +8,21 @@ const specialKeys = ['Add', 'Create', 'Delete', 'Disable', 'Update'];
  * @returns {object} - { parameters: {string}, questions: {string} }
  */
 function getProperties(params) {
-  const parameters = [];
-  const questions = [];
-  params.forEach((param) => {
-    if (param.name) {
-      parameters.push(param.name);
+    const parameters = [];
+    const questions = [];
+    params.forEach((param) => {
+        if (param.name) {
+            if(param.in === 'body')
+                parameters.push(param.name + '.data');
+            else
+                parameters.push(param.name);
+        }
+        questions.push('?');
+    });
+    return {
+        parameters: parameters.join(', '),
+        questions: questions.join(', '),
     }
-    questions.push('?');
-  });
-  return {
-    parameters: parameters.join(', '),
-    questions: questions.join(', '),
-  }
 }
 
 /**
@@ -28,31 +31,37 @@ function getProperties(params) {
  * @returns {object} - same as data, but with updated methods
  */
 function querier(data) {
-  try {
-    const mutable = _.cloneDeep(data);
-    const { methods, definitions } = mutable;
-
-    if (!(methods && methods.length > 0 && definitions && definitions.length > 0)) {
-      return new Error('Methods and definitions should not be empty!');
-    }
+    try {
+        const mutable = _.cloneDeep(data);
+        const { methods, definitions } = mutable;
 
-    methods.forEach((method, m) => {
-      let special = false;
-      specialKeys.forEach((key) => {
-        if (method.methodName.includes(key)) {
-          special = true;
+        if (!(methods && methods.length > 0 && definitions && definitions.length > 0)) {
+            return new Error('Methods and definitions should not be empty!');
         }
-      });
 
-      const { parameters, questions } = getProperties(method.parameters, special);
-      mutable.methods[m].query = `const results = await dal.query("${special ? 'CALL SP_' : 'SELECT FN_'}${method.methodName}(${questions})", `
-        + `[${parameters}], { redis: ${!special} });`;
-    });
+        methods.forEach((method, m) => {
+            let special = false;
+            specialKeys.forEach((key) => {
+                if (method.methodName.includes(key)) {
+                    special = true;
+                }
+            });
+
+            const { parameters, questions } = getProperties(method.parameters, special);
+            let query ='';
+            if(special){
+                query = `CALL SP_${method.methodName}(${questions})`;
+            }else{
+                query = `SELECT FN_${method.methodName}(${questions}) as Response`;
+            }
+            mutable.methods[m].query = `const results = await dal.query("${query}", `
+                + `[${parameters}], { redis: ${!special} });`;
+        });
 
-    return mutable;
-  } catch (err) {
-    throw new Error(err.message || err);
-  }
+        return mutable;
+    } catch (err) {
+        throw new Error(err.message || err);
+    }
 }
 
 module.exports = querier;

templates/multi-method.mustache

@@ -42,6 +42,7 @@
     {{#query}}
     /*
       {{&query}}
+      return res.code(results.Status).send(results);
     */
     {{/query}}
     {{^query}}