From 96b6f603469d83342cf993dc9ae4e354f0b502ba Mon Sep 17 00:00:00 2001 From: vkharnes <vkharnes@stud.ntnu.no> Date: Thu, 26 Sep 2019 11:34:18 +0200 Subject: [PATCH] push --- dao/persondao.js | 18 +++++++----------- dao/persondao.test.js | 15 ++++++--------- server.js | 2 +- 3 files changed, 14 insertions(+), 21 deletions(-) diff --git a/dao/persondao.js b/dao/persondao.js index 3d652f3..2b0e965 100644 --- a/dao/persondao.js +++ b/dao/persondao.js @@ -13,23 +13,19 @@ module.exports = class PersonDao extends Dao { ); } - deleteOne(id, callback) { - super.query( - "delete from person where id=?", - [id], - callback - ); - } -//updater en person - update(json, callback) { - var val =[json.navn, json.adresse, json.alder, json.id]; + updateOne(json, callback) { + var val = [json.navn, json.adresse, json.alder, json.id]; super.query( - "Update person set navn = ?, adresse = ?, alder = ? where id= ?", + "update person set navn = ?, adresse = ?, alder = ? where id = ?", val, callback ); } + deleteOne(id, callback) { + super.query("delete from person where id = ?", [id], callback); + } + createOne(json, callback) { var val = [json.navn, json.adresse, json.alder]; super.query( diff --git a/dao/persondao.test.js b/dao/persondao.test.js index d8ae887..02a99d8 100644 --- a/dao/persondao.test.js +++ b/dao/persondao.test.js @@ -66,22 +66,22 @@ test("add person to db", done => { ); }); -test("delete person from db", done => { +test("update 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).toBe(1); done(); } - personDao.deleteOne( - 2, + personDao.updateOne( + { navn: "pondus", alder: 99, adresse: "sola", id: 2 }, callback ); }); -test("Update person from db", done => { +test("delete person from db", done => { function callback(status, data) { console.log( "Test callback: status=" + status + ", data=" + JSON.stringify(data) @@ -90,10 +90,7 @@ test("Update person from db", done => { done(); } - personDao.update( - {navn: "Vetle Harnes", alder: 20, adresse: "Stavnevegen 8", id: 2}, - callback - ); + personDao.deleteOne(2, callback); }); test("get all persons from db", done => { diff --git a/server.js b/server.js index f70e614..a87ee9c 100644 --- a/server.js +++ b/server.js @@ -43,7 +43,7 @@ app.post("/person", (req, res) => { app.put("/person/:personId", (req, res) => { console.log("/person/:personId: fikk request fra klient"); - personDao.update(req.body, req.param.personId, (status, data) => { + personDao.updateOne(req.body, req.param.personId, (status, data) => { res.status(status); res.json(data); }); -- GitLab