Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
  • master
1 result

Target

Select target project
No results found
Select Git revision
  • master
1 result
Show changes

Commits on Source 1

4 files
+ 80
− 2
Compare changes
  • Side-by-side
  • Inline

Files

dao/create_testdata.sql

+4 −1
Original line number Original line Diff line number Diff line 
INSERT INTO person (id, navn, alder, adresse) VALUES

INSERT INTO person (id, navn, alder, adresse) VALUES

    (1, 'Hei Sveisen', 21, 'Gata 1'),

    (1, 'Hei Sveisen', 21, 'Gata 1'),

    (2, 'Hei Heisen', 22, 'Gata 2');
 
    (2, 'Hei Leisen', 21, 'Gata 2'),

    (3, 'Hei Meisen', 21, 'Gata 3'),

    (4, 'Hei Peisen', 21, 'Gata 4'),

    (5, 'Hei Heisen', 22, 'Gata 5');

dao/persondao.js

+19 −1
Original line number Original line Diff line number Diff line
@@ -13,6 +13,24 @@ module.exports = class PersonDao extends Dao { 
    );

    );

  }

  }





  updateOne(json, id, callback) {

    var val = [json.navn, json.adresse, json.alder, id];

    super.query(

      "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) {

  createOne(json, callback) {

    var val = [json.navn, json.adresse, json.alder];

    var val = [json.navn, json.adresse, json.alder];

    super.query(

    super.query(
@@ -21,4 +39,4 @@ module.exports = class PersonDao extends Dao { 
      callback

      callback

    );

    );

  }

  }

};
 
}

dao/persondao.test.js

+41 −0
Original line number Original line Diff line number Diff line
@@ -77,3 +77,44 @@ test("get all persons from db", done => { 




  personDao.getAll(callback);

  personDao.getAll(callback);

});

});



test("delete one person 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(1, callback);

});



test("get all persons from db after delete", done => {

  function callback(status, data) {

    console.log(

      "Test callback: status=" + status + ", data.length=" + data.length

    );

    expect(data.length).toBe(5);

    done();

  }



  personDao.getAll(callback);

});



test("update one person from db", done => {

  function callback(status, data) {

    console.log(

      "Test callback: status=" + status + ", data=" + JSON.stringify(data)

    );

    expect(data.affectedRows).toBeGreaterThanOrEqual(1);

    done();

  }



  personDao.updateOne(

    { navn: "Billy Bob", adresse: "Gata 3", alder: "34"},

    {id:"1"},

    callback

  );

});

server.js

+16 −0
Original line number Original line Diff line number Diff line
@@ -41,4 +41,20 @@ app.post("/person", (req, res) => { 
  });

  });

});

});





pp.delete("/person/:personId", (req, res) => {

  console.log("/person/:personId: fikk delete-request fra klient");

  personDao.deleteOne(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, req.params.personId, (status, data) => {

    res.status(status);

    res.json(data);

  });

});



var server = app.listen(8080);
 
var server = app.listen(8080);