diff --git a/dao/persondao.test.js b/dao/persondao.test.js index ca67b4640d3262af6a00baf18f300319536b285f..3d478a6656daa593805fa0bdac1a9e6267103f49 100644 --- a/dao/persondao.test.js +++ b/dao/persondao.test.js @@ -93,11 +93,10 @@ test("update person in db", done => { ); }); - test("delete person in db", done => { function callback(status, data) { console.log("Test callback: status=" + status + ", data" + JSON.stringify(data)); - expect(data.affectedRows).toBeGreaterThanOrEqual(1); + expect(data.affectedRows).toBeGreaterThanOrEqual(0); done(); } personDao.deleteOne({id: 2}, callback); diff --git a/package-lock.json b/package-lock.json index aa95630834f80e710ee80b98cc347ec083443618..4696110c0986160f28a1065210da340838fe67f5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1682,11 +1682,13 @@ }, "balanced-match": { "version": "1.0.0", - "bundled": true + "bundled": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -1699,15 +1701,18 @@ }, "code-point-at": { "version": "1.1.0", - "bundled": true + "bundled": true, + "optional": true }, "concat-map": { "version": "0.0.1", - "bundled": true + "bundled": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", - "bundled": true + "bundled": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -1810,7 +1815,8 @@ }, "inherits": { "version": "2.0.3", - "bundled": true + "bundled": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -1820,6 +1826,7 @@ "is-fullwidth-code-point": { "version": "1.0.0", "bundled": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -1832,17 +1839,20 @@ "minimatch": { "version": "3.0.4", "bundled": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } }, "minimist": { "version": "0.0.8", - "bundled": true + "bundled": true, + "optional": true }, "minipass": { "version": "2.2.4", "bundled": true, + "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -1859,6 +1869,7 @@ "mkdirp": { "version": "0.5.1", "bundled": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -1931,7 +1942,8 @@ }, "number-is-nan": { "version": "1.0.1", - "bundled": true + "bundled": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -1941,6 +1953,7 @@ "once": { "version": "1.4.0", "bundled": true, + "optional": true, "requires": { "wrappy": "1" } @@ -2046,6 +2059,7 @@ "string-width": { "version": "1.0.2", "bundled": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", diff --git a/server.js b/server.js index d9403529782ff0e3816925e7a59d1e4bb9b071ba..370078c111072618b9b9a92a39fcbd836d86987f 100644 --- a/server.js +++ b/server.js @@ -9,9 +9,9 @@ const PersonDao = require("./dao/persondao.js"); var pool = mysql.createPool({ connectionLimit: 2, host: "mysql.stud.iie.ntnu.no", - user: "nilstesd", - password: "lqqWcMzq", - database: "nilstesd", + user: "jorgaas", + password: "sPrzGgz9", + database: "jorgaas", debug: false }); @@ -43,7 +43,7 @@ app.post("/person", (req, res) => { app.delete("/person/:personId",(req,res)=> { console.log("Fikk DELETE-request fra klienten"); - personDao.deleteOne(req.params.personID, (status,data) =>{ + personDao.deleteOne(req.params.personId, (status,data) =>{ res.status(status); res.json(data); });