diff --git a/dao/persondao.js b/dao/persondao.js index 3472f63095bf98a8ec2a3f0932e3b6d3ad63b60c..f843bb3bf311aecd16cb0368b552e8fc0bf8f284 100644 --- a/dao/persondao.js +++ b/dao/persondao.js @@ -37,4 +37,9 @@ module.exports = class PersonDao extends Dao { callback ); } + countAll(callback){ + super.query( + "SELECT COUNT(*) FROM person;",[],callback + ) + } }; diff --git a/dao/persondao.test.js b/dao/persondao.test.js index 598bea54b31d1414d2541aa226bc8752271a9265..9731cb4c3be75c48f69e5e451562fd03cd124f42 100644 --- a/dao/persondao.test.js +++ b/dao/persondao.test.js @@ -83,7 +83,7 @@ test("oppdater person to db", done => { console.log( "Test callback: status=" + status + ", data=" + JSON.stringify(data) ); - expect(data.affectedRows).toBeGreaterThanOrEqual(1); + expect(data.affectedRows).toBe(1); done(); } @@ -92,11 +92,11 @@ test("oppdater person to db", done => { }); test("slett person to db", done => { - function callback(status, data) { + function callback(status) { console.log( "Test callback: status=" + status + ", data=" + JSON.stringify(data) ); - expect(data.affectedRows).toBeGreaterThanOrEqual(1); + expect(personDao.countAll((status, data))).toEqual(1); done(); } diff --git a/server.js b/server.js index 0351a3d9ca7041399cb6264f4046434f236eae1d..80cba75a895fabb29c79e619217e4a190f2cf193 100644 --- a/server.js +++ b/server.js @@ -57,4 +57,12 @@ app.delete("/person/:personId", (req, res) => { }); }); +app.get("/person", (req, res) => { + console.log("/person: fikk request fra klient"); + personDao.countAll((status, data) => { + res.status(status); + res.json(data); + }); +}); + var server = app.listen(8080);