sigonasr2
/
sigcrafting_backend
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update endpoints to make them more modular and submit to both sides at the same time.

Browse Source
master
Nic0Nic0Nii 3 years ago
parent 3f0e5f81e3
commit 67ee65f803
2 changed files with 137 additions and 79 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 76
      server.js
  2. 140
      server_test.js

76
server.js
Unescape View File

@ -877,7 +877,7 @@ app.post(PREFIX+"/test/saveskilltree",(req,res)=>{
}) })
}) })
app.post(PREFIX+"/submitBuild",(req,res)=>{ function submitBuild(req,res,db,send) {
if (req.body.id) { if (req.body.id) {
db.query('select users.username from builds join users on users_id=users.id where builds.id=$1',[req.body.id]) db.query('select users.username from builds join users on users_id=users.id where builds.id=$1',[req.body.id])
.then((data)=>{ .then((data)=>{
@ -885,73 +885,61 @@ app.post(PREFIX+"/submitBuild",(req,res)=>{
if (data.rows.length>0&&data.rows[0].username===req.body.username) { if (data.rows.length>0&&data.rows[0].username===req.body.username) {
return db.query('update builds set creator=$1,build_name=$2,class1=(SELECT id from class WHERE name=$3 limit 1),class2=(SELECT id from class WHERE name=$4 limit 1),last_modified=$5,data=$6 where id=$7 returning id',[req.body.creator,req.body.build_name,req.body.class1,req.body.class2,new Date(),req.body.data,req.body.id]) return db.query('update builds set creator=$1,build_name=$2,class1=(SELECT id from class WHERE name=$3 limit 1),class2=(SELECT id from class WHERE name=$4 limit 1),last_modified=$5,data=$6 where id=$7 returning id',[req.body.creator,req.body.build_name,req.body.class1,req.body.class2,new Date(),req.body.data,req.body.id])
.then((data)=>{ .then((data)=>{
res.status(200).send(data.rows[0]) if (send) {
res.status(200).send(data.rows[0])
}
}) })
.catch((err)=>{ .catch((err)=>{
console.log(err.message) console.log(err.message)
res.status(500).send(err.message) if (send) {
res.status(500).send(err.message)
}
}) })
} else { } else {
return db.query('insert into builds(users_id,creator,build_name,class1,class2,created_on,last_modified,likes,data,editors_choice) values((SELECT id from users WHERE username=$1 limit 1),$2,$3,(SELECT id from class WHERE name=$4 limit 1),(SELECT id from class WHERE name=$5 limit 1),$6,$7,$8,$9,$10) returning id',[req.body.username,req.body.creator,req.body.build_name,req.body.class1,req.body.class2,new Date(),new Date(),0,req.body.data,0]) return db.query('insert into builds(users_id,creator,build_name,class1,class2,created_on,last_modified,likes,data,editors_choice) values((SELECT id from users WHERE username=$1 limit 1),$2,$3,(SELECT id from class WHERE name=$4 limit 1),(SELECT id from class WHERE name=$5 limit 1),$6,$7,$8,$9,$10) returning id',[req.body.username,req.body.creator,req.body.build_name,req.body.class1,req.body.class2,new Date(),new Date(),0,req.body.data,0])
.then((data)=>{ .then((data)=>{
res.status(200).send(data.rows[0]) if (send) {
res.status(200).send(data.rows[0])
}
}) })
.catch((err)=>{ .catch((err)=>{
console.log(err.message) console.log(err.message)
res.status(500).send(err.message) if (send) {
res.status(500).send(err.message)
}
}) })
} }
}) })
.catch((err)=>{ .catch((err)=>{
console.log(err.message) console.log(err.message)
res.status(500).send(err.message) if (send) {
res.status(500).send(err.message)
}
}) })
} else { } else {
return db.query('insert into builds(users_id,creator,build_name,class1,class2,created_on,last_modified,likes,data,editors_choice) values((SELECT id from users WHERE username=$1 limit 1),$2,$3,(SELECT id from class WHERE name=$4 limit 1),(SELECT id from class WHERE name=$5 limit 1),$6,$7,$8,$9,$10) returning id',[req.body.username,req.body.creator,req.body.build_name,req.body.class1,req.body.class2,new Date(),new Date(),0,req.body.data,0]) db.query('insert into builds(users_id,creator,build_name,class1,class2,created_on,last_modified,likes,data,editors_choice) values((SELECT id from users WHERE username=$1 limit 1),$2,$3,(SELECT id from class WHERE name=$4 limit 1),(SELECT id from class WHERE name=$5 limit 1),$6,$7,$8,$9,$10) returning id',[req.body.username,req.body.creator,req.body.build_name,req.body.class1,req.body.class2,new Date(),new Date(),0,req.body.data,0])
.then((data)=>{ .then((data)=>{
if (send) {
res.status(200).send(data.rows[0]) res.status(200).send(data.rows[0])
}) }
.catch((err)=>{ })
.catch((err)=>{
console.log(err.message) console.log(err.message)
if (send) {
res.status(500).send(err.message) res.status(500).send(err.message)
}) }
})
} }
}
app.post(PREFIX+"/submitBuild",(req,res)=>{
submitBuild(req,res,db,true)
submitBuild(req,res,db2,false)
}) })
app.post(PREFIX+"/test/submitBuild",(req,res)=>{ app.post(PREFIX+"/test/submitBuild",(req,res)=>{
if (req.body.id) { submitBuild(req,res,db,true)
db2.query('select users.username from builds join users on users_id=users.id where builds.id=$1',[req.body.id]) submitBuild(req,res,db2,false)
.then((data)=>{
if (data.rows[0].username===req.body.username) {
return db2.query('update builds set creator=$1,build_name=$2,class1=(SELECT id from class WHERE name=$3 limit 1),class2=(SELECT id from class WHERE name=$4 limit 1),last_modified=$5,data=$6 returning id',[req.body.creator,req.body.build_name,req.body.class1,req.body.class2,new Date(),req.body.data])
.then((data)=>{
res.status(200).send(data.rows[0])
})
.catch((err)=>{
res.status(500).send(err.message)
})
} else {
return db2.query('insert into builds(users_id,creator,build_name,class1,class2,created_on,last_modified,likes,data,editors_choice) values((SELECT id from users WHERE username=$1 limit 1),$2,$3,(SELECT id from class WHERE name=$4 limit 1),(SELECT id from class WHERE name=$5 limit 1),$6,$7,$8,$9,$10) returning id',[req.body.username,req.body.creator,req.body.build_name,req.body.class1,req.body.class2,new Date(),new Date(),0,req.body.data,0])
.then((data)=>{
res.status(200).send(data.rows[0])
})
.catch((err)=>{
res.status(500).send(err.message)
})
}
})
.catch((err)=>{
res.status(500).send(err.message)
})
} else {
return db2.query('insert into builds(users_id,creator,build_name,class1,class2,created_on,last_modified,likes,data,editors_choice) values((SELECT id from users WHERE username=$1 limit 1),$2,$3,(SELECT id from class WHERE name=$4 limit 1),(SELECT id from class WHERE name=$5 limit 1),$6,$7,$8,$9,$10) returning id',[req.body.username,req.body.creator,req.body.build_name,req.body.class1,req.body.class2,new Date(),new Date(),0,req.body.data,0])
.then((data)=>{
res.status(200).send(data.rows[0])
})
.catch((err)=>{
res.status(500).send(err.message)
})
}
}) })
//Generates our table schema: //Generates our table schema:

140
server_test.js
Unescape View File

@ -26,9 +26,6 @@ let allowCrossDomain = function(req, res, next) {
app.use(allowCrossDomain); app.use(allowCrossDomain);
app.listen(PORT, () => console.log(`Listening on ${ PORT }`)); app.listen(PORT, () => console.log(`Listening on ${ PORT }`));
var authenticated = true;
const PREFIX="" const PREFIX=""
const ENDPOINTDATA=[ const ENDPOINTDATA=[
@ -695,17 +692,19 @@ app.get(PREFIX+'/data',async(req,res)=>{
var finalresult = {} var finalresult = {}
var promises = [] var promises = []
for (var endpoint of ENDPOINTDATA) { for (var endpoint of ENDPOINTDATA) {
if (endpoint.requiredfields.includes("name")) { if (endpoint.endpoint!=="builds"&&endpoint.endpoint!=="users") {
await db.query('select * from (select distinct on (name) name,* from '+endpoint.endpoint+' order by name,id desc)t order by id asc') if (endpoint.requiredfields.includes("name")) {
.then((data)=>{ await db.query('select * from (select distinct on (name) name,* from '+endpoint.endpoint+' order by name,id desc)t order by id asc')
finalresult[endpoint.endpoint]={} .then((data)=>{
data.rows.forEach((val)=>{finalresult[endpoint.endpoint][val.name]=val}) finalresult[endpoint.endpoint]={}
}) data.rows.forEach((val)=>{finalresult[endpoint.endpoint][val.name]=val})
} else { })
await db.query('select * from '+endpoint.endpoint+" order by id desc") } else {
.then((data)=>{ await db.query('select * from '+endpoint.endpoint+" order by id desc")
finalresult[endpoint.endpoint]=data.rows .then((data)=>{
}) finalresult[endpoint.endpoint]=data.rows
})
}
} }
} }
res.status(200).json(finalresult) res.status(200).json(finalresult)
@ -715,17 +714,19 @@ app.get(PREFIX+'/test/data',async(req,res)=>{
var finalresult = {} var finalresult = {}
var promises = [] var promises = []
for (var endpoint of ENDPOINTDATA) { for (var endpoint of ENDPOINTDATA) {
if (endpoint.requiredfields.includes("name")) { if (endpoint.endpoint!=="builds"&&endpoint.endpoint!=="users") {
await db2.query('select distinct on (name) name,* from '+endpoint.endpoint+' order by name,id desc') if (endpoint.requiredfields.includes("name")) {
.then((data)=>{ await db2.query('select distinct on (name) name,* from '+endpoint.endpoint+' order by name,id desc')
finalresult[endpoint.endpoint]={} .then((data)=>{
data.rows.forEach((val)=>{finalresult[endpoint.endpoint][val.name]=val}) finalresult[endpoint.endpoint]={}
}) data.rows.forEach((val)=>{finalresult[endpoint.endpoint][val.name]=val})
} else { })
await db2.query('select * from '+endpoint.endpoint+" order by id desc") } else {
.then((data)=>{ await db2.query('select * from '+endpoint.endpoint+" order by id desc")
finalresult[endpoint.endpoint]=data.rows .then((data)=>{
}) finalresult[endpoint.endpoint]=data.rows
})
}
} }
} }
res.status(200).json(finalresult) res.status(200).json(finalresult)
@ -735,11 +736,13 @@ app.get(PREFIX+'/dataid',async(req,res)=>{
var finalresult = {} var finalresult = {}
var promises = [] var promises = []
for (var endpoint of ENDPOINTDATA) { for (var endpoint of ENDPOINTDATA) {
await db.query('select * from '+endpoint.endpoint+' order by id asc') if (endpoint.endpoint!=="builds"&&endpoint.endpoint!=="users") {
.then((data)=>{ await db.query('select * from '+endpoint.endpoint+' order by id asc')
finalresult[endpoint.endpoint]={} .then((data)=>{
data.rows.forEach((val)=>{finalresult[endpoint.endpoint][val.id]=val}) finalresult[endpoint.endpoint]={}
}) data.rows.forEach((val)=>{finalresult[endpoint.endpoint][val.id]=val})
})
}
} }
res.status(200).json(finalresult) res.status(200).json(finalresult)
}) })
@ -748,11 +751,13 @@ app.get(PREFIX+'/test/dataid',async(req,res)=>{
var finalresult = {} var finalresult = {}
var promises = [] var promises = []
for (var endpoint of ENDPOINTDATA) { for (var endpoint of ENDPOINTDATA) {
await db2.query('select * from '+endpoint.endpoint+' order by id asc') if (endpoint.endpoint!=="builds"&&endpoint.endpoint!=="users") {
.then((data)=>{ await db2.query('select * from '+endpoint.endpoint+' order by id asc')
finalresult[endpoint.endpoint]={} .then((data)=>{
data.rows.forEach((val)=>{finalresult[endpoint.endpoint][val.id]=val}) finalresult[endpoint.endpoint]={}
}) data.rows.forEach((val)=>{finalresult[endpoint.endpoint][val.id]=val})
})
}
} }
res.status(200).json(finalresult) res.status(200).json(finalresult)
}) })
@ -824,6 +829,71 @@ app.post(PREFIX+"/test/saveskilltree",(req,res)=>{
}) })
}) })
function submitBuild(req,res,db,send) {
if (req.body.id) {
db.query('select users.username from builds join users on users_id=users.id where builds.id=$1',[req.body.id])
.then((data)=>{
console.log(data.rows)
if (data.rows.length>0&&data.rows[0].username===req.body.username) {
return db.query('update builds set creator=$1,build_name=$2,class1=(SELECT id from class WHERE name=$3 limit 1),class2=(SELECT id from class WHERE name=$4 limit 1),last_modified=$5,data=$6 where id=$7 returning id',[req.body.creator,req.body.build_name,req.body.class1,req.body.class2,new Date(),req.body.data,req.body.id])
.then((data)=>{
if (send) {
res.status(200).send(data.rows[0])
}
})
.catch((err)=>{
console.log(err.message)
if (send) {
res.status(500).send(err.message)
}
})
} else {
return db.query('insert into builds(users_id,creator,build_name,class1,class2,created_on,last_modified,likes,data,editors_choice) values((SELECT id from users WHERE username=$1 limit 1),$2,$3,(SELECT id from class WHERE name=$4 limit 1),(SELECT id from class WHERE name=$5 limit 1),$6,$7,$8,$9,$10) returning id',[req.body.username,req.body.creator,req.body.build_name,req.body.class1,req.body.class2,new Date(),new Date(),0,req.body.data,0])
.then((data)=>{
if (send) {
res.status(200).send(data.rows[0])
}
})
.catch((err)=>{
console.log(err.message)
if (send) {
res.status(500).send(err.message)
}
})
}
})
.catch((err)=>{
console.log(err.message)
if (send) {
res.status(500).send(err.message)
}
})
} else {
db.query('insert into builds(users_id,creator,build_name,class1,class2,created_on,last_modified,likes,data,editors_choice) values((SELECT id from users WHERE username=$1 limit 1),$2,$3,(SELECT id from class WHERE name=$4 limit 1),(SELECT id from class WHERE name=$5 limit 1),$6,$7,$8,$9,$10) returning id',[req.body.username,req.body.creator,req.body.build_name,req.body.class1,req.body.class2,new Date(),new Date(),0,req.body.data,0])
.then((data)=>{
if (send) {
res.status(200).send(data.rows[0])
}
})
.catch((err)=>{
console.log(err.message)
if (send) {
res.status(500).send(err.message)
}
})
}
}
app.post(PREFIX+"/submitBuild",(req,res)=>{
submitBuild(req,res,db,true)
submitBuild(req,res,db2,false)
})
app.post(PREFIX+"/test/submitBuild",(req,res)=>{
submitBuild(req,res,db,true)
submitBuild(req,res,db2,false)
})
//Generates our table schema: //Generates our table schema:
ENDPOINTDATA.forEach((endpoint)=>{ ENDPOINTDATA.forEach((endpoint)=>{
console.log(endpoint.endpoint+":\n\t"+endpoint.requiredfields.join('\t')+(endpoint.optionalfields.length>0?"\t":"")+endpoint.optionalfields.join("\t")) console.log(endpoint.endpoint+":\n\t"+endpoint.requiredfields.join('\t')+(endpoint.optionalfields.length>0?"\t":"")+endpoint.optionalfields.join("\t"))

Write Preview
Loading…
Cancel
Save