updated

app.js

@@ -1,57 +1,37 @@
-var restify = require('restify');
-var errs = require('restify-errors');
+const restify = require('restify');
+const errs = require('restify-errors');
+const cal = require('./src/cal.js');
 
 const server = restify.createServer({
-    name: 'myapp',
+    name: 'bsharp-quiz',
     version: '1.0.0'
 });
 
 server.use(restify.plugins.acceptParser(server.acceptable));
 server.use(restify.plugins.queryParser());
 server.use(restify.plugins.bodyParser());
 
-function cal(operator, x, y) {
-    let answer;
-    switch (operator) {
-        case "+":
-            answer = parseFloat(x) + parseFloat(y);
-            break;
-        case "-":
-            answer = parseFloat(x) - parseFloat(y);
-            break;
-        case "*":
-            answer = parseFloat(x) * parseFloat(y);
-            break;
-        case "/":
-            if (y == "0") {
-                answer = "Divide by zero";
-                break;
-            } else {
-                answer = parseFloat(x) / parseFloat(y);
-                break;
-            }
-        default:
-            answer = "Invalid Operator";
-    }
-    return answer;
-}
-
 server.post('/calculator', function (req, res, next) {
-    let cal_res = cal(req.body.operator, req.body.x, req.body.y);
+    try {
+        if (!req.body.operator || !req.body.x || !req.body.y) return next(new errs.BadRequestError("body required"));
+
+        let cal_res = cal(req.body.operator, req.body.x, req.body.y);
+        if (cal_res == "Divide by zero") {
+            return next(new errs.BadRequestError("Divide by zero"));
+        } else if (cal_res == "Invalid Operator") {
+            return next(new errs.BadRequestError("Invalid operator"));
+        } else {
+            const obj = { value: cal_res }
+            res.send(obj);
+            return next();
+        }
 
-    if (cal_res == "Divide by zero") {
-        return next(new errs.BadRequestError("Divide by zero"));
-    } else if (cal_res == "Invalid Operator") {
-        return next(new errs.BadRequestError("Invalid operator"));
-    } else {
-        const obj = { value: cal_res }
-        res.send(obj);
-        return next();
+    } catch (error) {
+        return next(new errs.InternalServerError(error));
     }
 });
 
 server.listen(8080, function () {
+    console.clear();
     console.log('%s listening at %s', server.name, server.url);
-});
-
-module.exports = cal;
+});

app.test.js

@@ -1,4 +1,4 @@
-const cal = require('./app.js')
+const cal = require('./src/cal.js')
 
 describe('Calculation Test', () => {
     let opt = ["+", "-", "*", "/"];

package.json

@@ -1,8 +1,8 @@
 {
-  "name": "proj.test",
+  "name": "bsharp-quiz",
   "version": "1.0.0",
   "description": "",
-  "main": "index.js",
+  "main": "app.js",
   "scripts": {
     "test": "jest"
   },

src/cal.js

@@ -0,0 +1,27 @@
+function cal(operator, x, y) {
+    let answer;
+    switch (operator) {
+        case "+":
+            answer = parseFloat(x) + parseFloat(y);
+            break;
+        case "-":
+            answer = parseFloat(x) - parseFloat(y);
+            break;
+        case "*":
+            answer = parseFloat(x) * parseFloat(y);
+            break;
+        case "/":
+            if(y == "0") {
+                answer = "Divide by zero";
+                break;
+            } else {
+                answer = parseFloat(x) / parseFloat(y);
+                break;
+            }
+        default:
+            answer = "Invalid Operator";
+    }
+    return answer;
+}
+
+module.exports = cal;