diff --git a/dao/persondao.js b/dao/persondao.js index 9f4312c9e33384960c6466ef1e1c7e7217d1ec02..c277c5eff3876cdfa7c7f0e663926f495e244ee4 100644 --- a/dao/persondao.js +++ b/dao/persondao.js @@ -22,8 +22,8 @@ module.exports = class PersonDao extends Dao { ); } - updateOne(json, id, callback) { - var val = [json.navn, json.adresse, json.alder, id]; + updateOne(json, callback){ + var val = [json.navn, json.adresse, json.alder, json.id]; super.query( "update person set navn = ?, adresse = ?, alder = ? WHERE id = ?", val, @@ -31,7 +31,6 @@ module.exports = class PersonDao extends Dao { ); } - deleteOne(id, callback){ super.query( "delete from person where id = ?", diff --git a/dao/persondao.test.js b/dao/persondao.test.js index da76a62f4f5cb93535117bc982ee3691b0dd0596..277d42c550c25fe095b9cc64ed64ecdf4883419f 100644 --- a/dao/persondao.test.js +++ b/dao/persondao.test.js @@ -90,17 +90,17 @@ test("delete person from db", done => { personDao.deleteOne({id: 1}, callback); }); -test("Update in db", done => { +test("update person 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); done(); } + personDao.updateOne( - { navn: "Donald Nilsen", alder: 34, adresse: "Apalveien 11"}, - 1, - callback + { navn: "Donald Duck", adresse: "Apalveien 11", alder: 22, id: 1}, + callback ); }); diff --git a/server.js b/server.js index 91a1a8ce27ecdb27200cd9a6e478c1533bcb4be9..3fefa086961ceaedebd44e33fc9a4452419c20c1 100644 --- a/server.js +++ b/server.js @@ -41,14 +41,15 @@ app.post("/person", (req, res) => { }); }); -app.put("/person/:personId", (req, res) => { - console.log("/person/:personId: fikk request fra klient"); - personDao.updateOne(req.body, req.params.personId, (status, data) => { - res.status(status); - res.json(data); +app.put("/person/:personId", (req,res)=> { + console.log("Fikk PUT-request fra klienten"); + personDao.updateOne(req.body, (status,data) =>{ + res.status(status); + res.json(data); }); }); + app.delete("/person/:personId", (req, res) => { console.log("/person/:personId: fikk request fra klient"); personDao.deleteOne(req.params.personId, (status, data) =>{