Merge pull request #7 from voicenter/feature/OFC-3

Add dal import, use try/catch in methods
voicenter · Apr 9, 2019 · 1891213 · 1891213
2 parents 69cf41e + 23e5089
commit 1891213
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 39 deletions.
diff --git a/lib/splitter.js b/lib/splitter.js
@@ -103,7 +103,13 @@ async function split(source, className, path, dir) {
       });
       files[i].content = beautify(`'use strict';
 
-      /* auto-generated: ${file.file}.controller.js */
+      /* 
+        auto-generated: ${file.file}.controller.js
+      */
+      
+      /*
+        const dal = require('../../helpers/dal');
+      */
       
       module.exports = class {
         constructor(req = {}, res = {}, params = {}) {

diff --git a/templates/multi-method.mustache b/templates/multi-method.mustache
@@ -6,50 +6,56 @@
  * @param {object} res - response object
  */
 {{&className}}.prototype.{{&destination}}_{{&methodName}} = function(req, res) {
-  {{#parameters}}
-    {{#isQueryParameter}}
-      {{#x-AuthFieldType}}
-        var auth{{&x-AuthFieldType.propertyName}} = await_FieldValidator.validate('{{&x-AuthFieldType.value}}', req.query['{{&x-AuthFieldType.propertyName}}'], req, res);
-        if (!auth{{&x-AuthFieldType.propertyName}}) { return; }
-      {{/x-AuthFieldType}}
-      var {{name}} = req.query['{{name}}'];
-    {{/isQueryParameter}}
-    {{#isPathParameter}}
-      {{#x-AuthFieldType}}
-        var auth{{&x-AuthFieldType.propertyName}} = await_FieldValidator.validate('{{&x-AuthFieldType.value}}', req.params['{{&x-AuthFieldType.propertyName}}'], req, res);
-        if (!auth{{&x-AuthFieldType.propertyName}}) { return; }
-      {{/x-AuthFieldType}}
-      var {{name}} = req.params['{{name}}'];
-    {{/isPathParameter}}
-    {{#isBodyParameter}}
-      {{#x-AuthFieldType}}
-        var auth{{&x-AuthFieldType.propertyName}} = await_FieldValidator.validate('{{&x-AuthFieldType.value}}', req.body['{{&x-AuthFieldType.propertyName}}'], req, res);
-        if (!auth{{&x-AuthFieldType.propertyName}}) { return; }
-      {{/x-AuthFieldType}}
-      var {{name}} = new global.classes['{{tsType.target}}'](req, res, req.body);
-    {{/isBodyParameter}}
-    {{#isHeaderParameter}}
-      {{#isSingleton}}{{/isSingleton}}
-      {{^isSingleton}}{{/isSingleton}}
-    {{/isHeaderParameter}}
-    {{#isFormParameter}}
-      {{#isSingleton}}{{/isSingleton}}
-      {{^isSingleton}}{{/isSingleton}}
-    {{/isFormParameter}}
-  {{/parameters}}
+  try {
+{{#parameters}}
+  {{#isQueryParameter}}
+    {{#x-AuthFieldType}}
+      var auth{{&x-AuthFieldType.propertyName}} = await_FieldValidator.validate('{{&x-AuthFieldType.value}}', req.query['{{&x-AuthFieldType.propertyName}}'], req, res);
+      if (!auth{{&x-AuthFieldType.propertyName}}) { return; }
+    {{/x-AuthFieldType}}
+    var {{name}} = req.query['{{name}}'];
+  {{/isQueryParameter}}
+  {{#isPathParameter}}
+    {{#x-AuthFieldType}}
+      var auth{{&x-AuthFieldType.propertyName}} = await_FieldValidator.validate('{{&x-AuthFieldType.value}}', req.params['{{&x-AuthFieldType.propertyName}}'], req, res);
+      if (!auth{{&x-AuthFieldType.propertyName}}) { return; }
+    {{/x-AuthFieldType}}
+    var {{name}} = req.params['{{name}}'];
+  {{/isPathParameter}}
+  {{#isBodyParameter}}
+    {{#x-AuthFieldType}}
+      var auth{{&x-AuthFieldType.propertyName}} = await_FieldValidator.validate('{{&x-AuthFieldType.value}}', req.body['{{&x-AuthFieldType.propertyName}}'], req, res);
+      if (!auth{{&x-AuthFieldType.propertyName}}) { return; }
+    {{/x-AuthFieldType}}
+    var {{name}} = new global.classes['{{tsType.target}}'](req, res, req.body);
+  {{/isBodyParameter}}
+  {{#isHeaderParameter}}
+    {{#isSingleton}}{{/isSingleton}}
+    {{^isSingleton}}{{/isSingleton}}
+  {{/isHeaderParameter}}
+  {{#isFormParameter}}
+    {{#isSingleton}}{{/isSingleton}}
+    {{^isSingleton}}{{/isSingleton}}
+  {{/isFormParameter}}
+{{/parameters}}
 
-  {{#query}}
+    {{#query}}
     /*
       {{&query}}
     */
-  {{/query}}
-  {{^query}}
+    {{/query}}
+    {{^query}}
     /*
       Method logic
     */
-  {{/query}}
+    {{/query}}
 
-  {{#responses}}
-    {{#200}}{{{code}}}{{/200}}
-  {{/responses}}
+    {{#responses}}
+      {{#200}}{{{code}}}{{/200}}
+    {{/responses}}
+  } catch (err) {
+    /*
+      handle errors
+    */
+  }
 };