Push yah

.gitlab-ci.yml

@@ -6,8 +6,8 @@ services:
 
 # Configure test-database
 variables:
-  MYSQL_DATABASE: supertestdb
-  MYSQL_ROOT_PASSWORD: secret
+  MYSQL_DATABASE: asbjorfk
+  MYSQL_ROOT_PASSWORD: 749iiMiA
 
 # Install node libraries
 before_script:

dao/create_testdata.sql

 INSERT INTO person (id, navn, alder, adresse) VALUES
     (1, 'Hei Sveisen', 21, 'Gata 1'),
     (2, 'Hei Heisen', 22, 'Gata 2');
+

dao/persondao.js

@@ -21,4 +21,23 @@ module.exports = class PersonDao extends Dao {
       callback
     );
   }
+
+  deleteOne(json, callback) {
+    var val = [json.id];
+    super.query(
+        "DELETE FROM person WHERE id = ?",
+        val,
+        callback
+    );
+  }
+
+  updateOne(json, callback) {
+    var val = [json.navn, json.alder, json.adresse, json.id];
+    super.query(
+        "UPDATE person SET navn =?, alder=?, adresse=? WHERE id = ?",
+        val,
+        callback
+    );
+  }
+
 };

dao/persondao.test.js

@@ -6,10 +6,10 @@ const runsqlfile = require("./runsqlfile.js");
 // GitLab CI Pool
 var pool = mysql.createPool({
   connectionLimit: 1,
-  host: "mysql",
-  user: "root",
-  password: "secret",
-  database: "supertestdb",
+  host: "mysql-ait.stud.idi.ntnu.no",
+  user: "asbjorfk",
+  password: "749iiMiA",
+  database: "asbjorfk",
   debug: false,
   multipleStatements: true
 });
@@ -74,6 +74,41 @@ test("get all persons from db", done => {
     expect(data.length).toBeGreaterThanOrEqual(2);
     done();
   }
-
   personDao.getAll(callback);
 });
+
+//Må man sjekke for alle verdier til en person?
+test("Update a row", done => {
+  function callback(status, data) {
+    console.log(
+        "Test callback: status=" + status + ", data=" + JSON.stringify(data)
+    );
+    expect(data.affectedRows).toBeGreaterThanOrEqual(1);
+    done();
+  }
+  personDao.updateOne(
+      {
+        navn:'Asbjorn',
+        alder : 21,
+        adresse: 'olegunnarvei',
+        id: 2},
+      callback
+  );
+});
+
+//Skal man telle alle resterende personer
+test("Delete, one row from db", done => {
+  function callback(status, data) {
+      console.log(
+          "Test callback: status=" + status + ", data.length=" + data.length
+      );
+    expect(data.affectedRows).toBeGreaterThanOrEqual(1);
+    done();
+  }
+  personDao.deleteOne(
+      {'id':1},
+      callback);
+
+});
+
+

server.js

@@ -9,9 +9,9 @@ const PersonDao = require("./dao/persondao.js");
 var pool = mysql.createPool({
   connectionLimit: 2,
   host: "mysql.stud.iie.ntnu.no",
-  user: "nilstesd",
-  password: "lqqWcMzq",
-  database: "nilstesd",
+  user: "asbjorfk",
+  password: "749iiMiA",
+  database: "asbjorfk",
   debug: false
 });
 
@@ -41,4 +41,23 @@ app.post("/person", (req, res) => {
   });
 });
 
+
+//Riktig HTTP-verb? dao?
+
+app.delete("/person/:personId", (req, res) => {
+  console.log("Fikk Delete-request fra klienten");
+  personDao.deleteOne(req.body, (status, data) => {
+    res.status(status);
+    res.json(data);
+  });
+});
+
+app.put("/person/:personId", (req, res) => {
+  console.log("Fikk Update-request fra klienten");
+  personDao.updateOne(req.body, (status, data) => {
+    res.status(status);
+    res.json(data);
+  });
+});
+
 var server = app.listen(8080);