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
  • nilstesd/DatabaseTest
  • anderhi/DatabaseTest
  • kevinhd/DatabaseTest
  • ingelig/DatabaseTest
  • odderikf/DatabaseTest
  • mariunyg/DatabaseTest
  • sandern/DatabaseTest
  • sindrhpa/DatabaseTest
  • anettosi/DatabaseTest
  • sindrtho/DatabaseTest
  • hansjeig/DatabaseTest
  • magnudah/DatabaseTest
  • sarahjel/DatabaseTest
  • rubensv/DatabaseTest
  • albertla/DatabaseTest
  • elisamop/DatabaseTest
  • aadnees/DatabaseTest
  • janmariv/DatabaseTest
  • annabesa/DatabaseTest
  • fredrmon/DatabaseTest
  • kevinmh/DatabaseTest
  • chrismd/DatabaseTest
  • benos/DatabaseTest
  • martimoa/DatabaseTest
  • runevedo/DatabaseTest
  • stianaad/DatabaseTest
  • shanshaq/DatabaseTest
  • mariteil/DatabaseTest
  • simenten/DatabaseTest
  • jingyili/DatabaseTest
  • krisnyb/DatabaseTest
  • jorgaas/DatabaseTest
  • magnusrm/DatabaseTest
  • erlendsu/DatabaseTest
  • otskaug/DatabaseTest
  • sveinuov/DatabaseTest
  • aleksjoh/DatabaseTest
  • kevinah/DatabaseTest
  • hermanrm/DatabaseTest
  • vegaande/DatabaseTest
  • bjornost/DatabaseTest
  • jonaskri/DatabaseTest
  • sigurdhy/DatabaseTest
  • oivindhl/DatabaseTest
  • magomedb/DatabaseTest
  • williaan/DatabaseTest
  • magnewor/DatabaseTest
  • mathiakn/DatabaseTest
  • eyvindnh/DatabaseTest
  • haakodh/DatabaseTest
  • michame/DatabaseTest
  • bragew/DatabaseTest
  • trondjro/DatabaseTest
  • aadneny/DatabaseTest
  • hermanc/DatabaseTest
  • erlinrol/DatabaseTest
  • iliar/DatabaseTest
  • eivinhl/DatabaseTest
  • eivindaj/DatabaseTest
  • sigurlj/DatabaseTest
  • terhaug/DatabaseTest
  • sindretn/DatabaseTest
  • olehenfo/DatabaseTest
  • toberge/DatabaseTest
  • shahedsa/DatabaseTest
  • junill/DatabaseTest
  • helenegj/DatabaseTest
  • tirilbl/DatabaseTest
  • sivertut/DatabaseTest
  • ericy/DatabaseTest
  • perholts/DatabaseTest
  • torstehs/DatabaseTest
  • janloe/DatabaseTest
  • simoaa/DatabaseTest
  • lasseis/DatabaseTest
  • stineof/DatabaseTest
  • jorho/DatabaseTest
  • tdthorki/DatabaseTest
  • iaevange/DatabaseTest
  • chrisrik/DatabaseTest
  • mathiaao/DatabaseTest
  • heleneyj/DatabaseTest
  • haavasma/DatabaseTest
  • martijni/DatabaseTest
  • tobiaand/DatabaseTest
  • sebastel/DatabaseTest
  • sabines/DatabaseTest
  • andinel/DatabaseTest
  • henrimbe/DatabaseTest
  • brigittb/DatabaseTest
  • joakimad/DatabaseTest
  • eirikpl/DatabaseTest
  • alexac/DatabaseTest
  • magnubau/DatabaseTest
  • mahmouim/DatabaseTest
  • thombje/DatabaseTest
  • espkal/DatabaseTest
  • asbjorfk/DatabaseTest
  • eirikhem/DatabaseTest
  • jorgstei/DatabaseTest
  • gautewr/DatabaseTest
  • mariutor/DatabaseTest
  • jonbergq/DatabaseTest
  • jakoblm/DatabaseTest
  • kaspervg/DatabaseTest
  • vkharnes/DatabaseTest
  • abilashy/DatabaseTest
  • larsoos/DatabaseTest
  • lisawil/DatabaseTest
  • michaesl/DatabaseTest
  • krisvane/DatabaseTest
111 results
Select Git revision
  • master
1 result
Show changes
Commits on Source (8)
CREATE TABLE person ( CREATE TABLE person (
id int(11) NOT NULL AUTO_INCREMENT, id int(11) NOT NULL AUTO_INCREMENT,
navn varchar(256) NOT NULL, navn varchar(256) NOT NULL,
......
...@@ -21,4 +21,30 @@ module.exports = class PersonDao extends Dao { ...@@ -21,4 +21,30 @@ module.exports = class PersonDao extends Dao {
callback callback
); );
} }
//Herfra
updateOne(id, json, callback) {
var val = [json.adresse, json.alder, json.navn, id];
super.query(
"update person set adresse=?, alder=?, navn=? where id=?",
val,
callback
);
}
deleteOne(id, callback) {
super.query(
"delete from person where id=?",
[id],
callback
);
}
getTest(callback) {
super.query(
"get from test",
[],
callback
);
}
}; };
...@@ -4,9 +4,30 @@ const PersonDao = require("./persondao.js"); ...@@ -4,9 +4,30 @@ const PersonDao = require("./persondao.js");
const runsqlfile = require("./runsqlfile.js"); 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.stud.iie.ntnu.no", //"localhost" if u wonna be on local db
user: "sindrhpa",
password: "6XgiA9XF",
database: "sindrhpa",
debug: false,
multipleStatements: true
});*/
/*
var pool = mysql.createPool({
connectionLimit: 1,
host: "localhost", //"localhost" if u wonna be on local db
user: "root",
password: "sindre123",
database: "sysut2_ov5",
debug: false,
multipleStatements: true
});*/
var pool = mysql.createPool({
connectionLimit: 1,
host: "mysql", //"localhost" if u wonna be on local db
user: "root", user: "root",
password: "secret", password: "secret",
database: "supertestdb", database: "supertestdb",
...@@ -73,3 +94,42 @@ test("get all persons from db", done => { ...@@ -73,3 +94,42 @@ test("get all persons from db", done => {
personDao.getAll(callback); personDao.getAll(callback);
}); });
//Øving5: Skrevet selv
test("update person in db", done => {
personDao.updateOne(
1,
{ navn: "Bob Bobsen", alder: 50, adresse: "Gata 2" },
callback =>{
personDao.getOne(1, (status, data) =>{
console.log(
"Test callback: status=" + status + ", data=" + JSON.stringify(data)
);
expect(data[0].navn).toBe("Bob Bobsen");
done();
})
}
);
});
test("delete user from db", done => {
var val = 0;
personDao.getAll((status, data) => {
val = data.length;
console.log(
"Test callback: status=" + status + ", data.length=" + data.length
);
personDao.deleteOne(1, callback => {
console.log(
"Test callback: status=" + callback.status
);
personDao.getAll((status, data)=> {
console.log(
"Test callback: status=" + status + ", length=" + data.length
);
expect(data.length).toBe(val - 1);
done();
});
});
});
});
...@@ -6,6 +6,7 @@ var apiRoutes = express.Router(); ...@@ -6,6 +6,7 @@ var apiRoutes = express.Router();
app.use(bodyParser.json()); // for å tolke JSON app.use(bodyParser.json()); // for å tolke JSON
const PersonDao = require("./dao/persondao.js"); 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",
...@@ -13,6 +14,15 @@ var pool = mysql.createPool({ ...@@ -13,6 +14,15 @@ var pool = mysql.createPool({
password: "lqqWcMzq", password: "lqqWcMzq",
database: "nilstesd", database: "nilstesd",
debug: false debug: false
});*/
var pool = mysql.createPool({
connectionLimit: 2,
host: "databases-auth.000webhost.com",
user: "id7459014_admin",
password: "admin",
database: "id7459014_classicwow",
debug: false
}); });
let personDao = new PersonDao(pool); let personDao = new PersonDao(pool);
...@@ -33,6 +43,7 @@ app.get("/person/:personId", (req, res) => { ...@@ -33,6 +43,7 @@ app.get("/person/:personId", (req, res) => {
}); });
}); });
//Oppgave
app.post("/person", (req, res) => { app.post("/person", (req, res) => {
console.log("Fikk POST-request fra klienten"); console.log("Fikk POST-request fra klienten");
personDao.createOne(req.body, (status, data) => { personDao.createOne(req.body, (status, data) => {
...@@ -41,4 +52,30 @@ app.post("/person", (req, res) => { ...@@ -41,4 +52,30 @@ app.post("/person", (req, res) => {
}); });
}); });
//herfa
app.put("/person/:personId", (req, res) => {
console.log("/person/:personId: update-request fra klienten");
personDao.updateOne(req.params.personId, req.body, (status, data) => {
res.status(status);
res.json(data);
});
});
app.delete("/person/:personId", (req, res) => {
console.log("/person/:personId: delete-request fra klienten");
personDao.deleteOne(req.params.personId, (status, data) => {
res.status(status);
res.json(data);
});
});
//testing
app.get("/test", (req, res) => {
console.log("/test: fikk request fra klient");
personDao.getTest((status, data) => {
res.status(status);
res.json(data);
});
});
var server = app.listen(8080); var server = app.listen(8080);