From ebabd76b0c888c7ceffec036609fb9dbe4cf5ffd Mon Sep 17 00:00:00 2001
From: Mahmoud Ibrahim <mahmouim@stud.ntnu.no>
Date: Tue, 24 Sep 2019 14:49:03 +0200
Subject: [PATCH] Testing update and delete person
---
dao/persondao.js | 5 +++++
dao/persondao.test.js | 6 +++---
server.js | 8 ++++++++
3 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/dao/persondao.js b/dao/persondao.js
index 3472f63..f843bb3 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 598bea5..9731cb4 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 0351a3d..80cba75 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);
--
GitLab