Skip to content
Snippets Groups Projects
Commit 19f9300b authored by Asbjørn Fiksdal Kallestad's avatar Asbjørn Fiksdal Kallestad
Browse files

Push yah

parent 006d767c
Branches
No related tags found
No related merge requests found
Pipeline #49604 passed
...@@ -6,8 +6,8 @@ services: ...@@ -6,8 +6,8 @@ services:
# Configure test-database # Configure test-database
variables: variables:
MYSQL_DATABASE: supertestdb MYSQL_DATABASE: asbjorfk
MYSQL_ROOT_PASSWORD: secret MYSQL_ROOT_PASSWORD: 749iiMiA
# Install node libraries # Install node libraries
before_script: before_script:
......
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 Heisen', 22, 'Gata 2');
...@@ -21,4 +21,23 @@ module.exports = class PersonDao extends Dao { ...@@ -21,4 +21,23 @@ module.exports = class PersonDao extends Dao {
callback 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
);
}
}; };
...@@ -6,10 +6,10 @@ const runsqlfile = require("./runsqlfile.js"); ...@@ -6,10 +6,10 @@ const runsqlfile = require("./runsqlfile.js");
// GitLab CI Pool // GitLab CI Pool
var pool = mysql.createPool({ var pool = mysql.createPool({
connectionLimit: 1, connectionLimit: 1,
host: "mysql", host: "mysql-ait.stud.idi.ntnu.no",
user: "root", user: "asbjorfk",
password: "secret", password: "749iiMiA",
database: "supertestdb", database: "asbjorfk",
debug: false, debug: false,
multipleStatements: true multipleStatements: true
}); });
...@@ -74,6 +74,41 @@ test("get all persons from db", done => { ...@@ -74,6 +74,41 @@ test("get all persons from db", done => {
expect(data.length).toBeGreaterThanOrEqual(2); expect(data.length).toBeGreaterThanOrEqual(2);
done(); done();
} }
personDao.getAll(callback); 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);
});
...@@ -9,9 +9,9 @@ const PersonDao = require("./dao/persondao.js"); ...@@ -9,9 +9,9 @@ const PersonDao = require("./dao/persondao.js");
var pool = mysql.createPool({ var pool = mysql.createPool({
connectionLimit: 2, connectionLimit: 2,
host: "mysql.stud.iie.ntnu.no", host: "mysql.stud.iie.ntnu.no",
user: "nilstesd", user: "asbjorfk",
password: "lqqWcMzq", password: "749iiMiA",
database: "nilstesd", database: "asbjorfk",
debug: false debug: false
}); });
...@@ -41,4 +41,23 @@ app.post("/person", (req, res) => { ...@@ -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); var server = app.listen(8080);
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment