push

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(

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 => {

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);
   });