diff --git a/dao/persondao.js b/dao/persondao.js index 17c07cc8425ed0edaabc1977c67eef94c89eb23c..2dfd6cfe7012069261b9d1f75a12b6eae01f3916 100644 --- a/dao/persondao.js +++ b/dao/persondao.js @@ -22,15 +22,16 @@ module.exports = class PersonDao extends Dao { ); } - updateOne(json, callback){ - var val = [json.navn, json.alder, json.adresse, json.id]; + updateOne(json, id, callback) { + var val = [json.navn, json.adresse, json.alder]; super.query( - "update person set navn=?, alder=?, adresse=? where id=?", - val, + "UPDATE person SET (navn,adresse,alder) values(?,?,?) WHERE id=?", + [id], callback ); } + deleteOne(id, callback){ super.query( "delete from person where id = ?", @@ -39,5 +40,5 @@ module.exports = class PersonDao extends Dao { ); } - + }; diff --git a/dao/persondao.test.js b/dao/persondao.test.js index c47de4224ebee89be003183ed4932c9dd64f9471..b6d6d897695f5144ae222152f86387f9b54a1631 100644 --- a/dao/persondao.test.js +++ b/dao/persondao.test.js @@ -90,15 +90,17 @@ test("delete person from db", done => { personDao.deleteOne({id: 1}, callback); }); -test("Update person with id from db", done => { +test("Update in db", done => { function callback(status, data) { console.log( - "Test callback: status=" + status + ", data=" + JSON.stringify(data) + "Test callback: status= " + status + ", data=" + JSON.stringify(data) ); - expect(data.affectedRows).toBeGreaterThanOrEqual(1); + expect(data[0].navn).toBe("Donald Nilsen"); done(); } - - personDao.updateOne({navn:"Test", id:1}, callback); - + personDao.updateOne( + { navn: "Donald Nilsen", alder: 34, adresse: "Apalveien 11" }, + 0, + callback + ); }); diff --git a/server.js b/server.js index 8c3b21d85602363b2d373e10ed7fef054a78243b..91a1a8ce27ecdb27200cd9a6e478c1533bcb4be9 100644 --- a/server.js +++ b/server.js @@ -43,14 +43,14 @@ app.post("/person", (req, res) => { app.put("/person/:personId", (req, res) => { console.log("/person/:personId: fikk request fra klient"); - personDao.updateOne(req.body, (status, data) => { + personDao.updateOne(req.body, req.params.personId, (status, data) => { res.status(status); res.json(data); }); }); app.delete("/person/:personId", (req, res) => { - console.log("/perosn/:personId: fikk request fra klient"); + console.log("/person/:personId: fikk request fra klient"); personDao.deleteOne(req.params.personId, (status, data) =>{ res.status(status); res.json(data);