From 78d7d23ee0070dd1dab9101563714b5fce0c7d1a Mon Sep 17 00:00:00 2001
From: Sander Nicolausson <sandern@stud.ntnu.no>
Date: Tue, 25 Sep 2018 09:28:13 +0200
Subject: [PATCH] fix

---
 dao/persondao.js      |  5 ++---
 dao/persondao.test.js | 10 +++++-----
 server.js             | 11 ++++++-----
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/dao/persondao.js b/dao/persondao.js
index 9f4312c..c277c5e 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 da76a62..277d42c 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 91a1a8c..3fefa08 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) =>{
-- 
GitLab