a_adli/colouring-montreal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix GET building by toid/uprn

Browse Source
This commit is contained in:
Tom Russell 2018-10-20 14:51:39 +01:00
parent f460aaeef6
commit 1b3fe36e05
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/building.js
View File

@ -40,7 +40,13 @@ function queryBuildingsAtPoint(lng, lat) {
function queryBuildingsByReference(key, id) { function queryBuildingsByReference(key, id) {
if (key === 'toid'){ if (key === 'toid'){
return db.manyOrNone( return db.manyOrNone(
"SELECT * FROM buildings WHERE b.ref_toid = $1", `SELECT
*
FROM
buildings
WHERE
ref_toid = $1
`,
[id] [id]
).catch(function(error){ ).catch(function(error){
console.error(error); console.error(error);
@ -49,8 +55,10 @@ function queryBuildingsByReference(key, id) {
} }
if (key === 'uprn') { if (key === 'uprn') {
return db.manyOrNone( return db.manyOrNone(
`SELECT b.* `SELECT
FROM buildings as b, building_properties as p b.*
FROM
buildings as b, building_properties as p
WHERE WHERE
b.building_id = p.building_id b.building_id = p.building_id
AND AND

6
app/src/server.js
View File

@ -177,11 +177,7 @@ server.route('/building/:building_id.json')
.get(function (req, res) { .get(function (req, res) {
const { building_id } = req.params; const { building_id } = req.params;
getBuildingById(building_id).then(function(result){ getBuildingById(building_id).then(function(result){
if (result && result.length) { res.send(result);
res.send(result)
} else {
res.status(404).send({error:'Not Found'})
}
}).catch(function(error){ }).catch(function(error){
console.error(error); console.error(error);
res.send({error:'Database error'}) res.send({error:'Database error'})