Add db factory

Author: dmacjam

Diff for: README.md

@@ -51,6 +51,6 @@ npm start
 - ~~display map~~
 - ~~db connection~~
 - ~~web interface - Angular~~
-- db module
+- ~~db module~~
 - zoom, pan to detail
 

Diff for: db-config.js

@@ -1,3 +1,7 @@
+var pgp = require('pg-promise')();
+var conString = "postgres://postgres@localhost:5432/pdt-gis";
+var db = pgp(conString);
+
 module.exports = {
-    conString: "postgres://postgres@localhost:5432/pdt-gis"
+    db: db
 };

Diff for: package.json

@@ -1,6 +1,6 @@
 {
   "name": "perfect-school",
-  "version": "0.0.0",
+  "version": "0.0.1",
   "private": true,
   "scripts": {
     "pretest": "jshint routes",
@@ -13,6 +13,8 @@
     "express": "^4.13.3",
     "jade": "~1.11.0",
     "morgan": "~1.6.1",
+    "pg": "^4.4.3",
+    "pg-promise": "^2.3.1",
     "serve-favicon": "~2.3.0"
   },
   "jshintConfig": {

Diff for: routes/api.js

@@ -1,25 +1,13 @@
-var pg = require('pg');
-var config = require('../db-config');
-
+var dbFactory = require('../db-config');
 
 exports.identify = function(req, res){
-    console.log("Getting nearest school");
-    pg.connect(config.conString, function(err, client, done) {
-
-        if (err) {
-            return console.error('error fetching client from pool', err);
-        }
-        var query = "SELECT *, st_asgeojson(way) as geojson FROM schools s " +
-            "WHERE st_dwithin(ST_SetSRID(ST_MakePoint("+req.query.lon+","+req.query.lat+"),4326)::geography,s.way::geography, 1000)";
-        console.log("Query is:", query);
-        client.query(query, function(err, result) {
-            done();
-            if (err) {
-                return console.error('error running query', err);
-            }
-            console.log(result.rows);
-            res.send(result.rows);
-        });
-
-    });
+  console.log("Getting nearest schools");
+  var query = "SELECT *, st_asgeojson(way) as geojson FROM schools s WHERE st_dwithin(ST_SetSRID(ST_MakePoint($1, $2),4326)::geography,s.way::geography, 1000)";
+  return dbFactory.db.query(query, [req.query.lon, req.query.lat ]).then(function(results){
+      return res.send(results);
+  }).catch(function (e) {
+      return res.status(500, {
+          error: e
+      });
+  });
 };

Diff for: routes/schools.js

@@ -1,8 +1,8 @@
 var express = require('express');
-var pg = require('pg');
 var router = express.Router();
 
-var config = require('../db-config');
+var dbFactory = require('../db-config');
+
 
 /* GET schools listing. */
 router.get('/', function(req, res, next) {
@@ -14,20 +14,13 @@ router.get('/:id', getSchool);
 
 function getSchool(req, res, next){
     console.log("Getting school");
-    pg.connect(config.conString, function(err, client, done) {
-
-        if (err) {
-            return console.error('error fetching client from pool', err);
-        }
-        client.query("SELECT *, st_asgeojson(way) as geojson FROM schools WHERE urn='"+req.params.id+"'", function(err, result) {
-            done();
-            if (err) {
-                return console.error('error running query', err);
-            }
-            console.log(result.rows);
-            res.send(result.rows[0]);
+    var query = "SELECT *, st_asgeojson(way) as geojson FROM schools WHERE urn=$1";
+    return dbFactory.db.one(query, req.params.id).then(function(results){
+        return res.send(results);
+    }).catch(function (e) {
+        return res.status(500, {
+            error: e
         });
-
     });
 }