Skip to content

Commit

Permalink
update config-multipaas to 0.2.0, modularize db support #6
Browse files Browse the repository at this point in the history
  • Loading branch information
@ryanj
ryanj committed Jan 19, 2016
1 parent 5d97df5 commit 0633b99
Show file tree
Hide file tree
Showing 4 changed files with 134 additions and 118 deletions.
18 changes: 18 additions & 0 deletions bin/config.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
var multipaas = require('config-multipaas');
var autoconfig = function (config_overrides){
var config = multipaas(config_overrides).add({
collection_name : process.env.MONGODB_DATABASE || process.env.COLLECTION_NAME || process.env.OPENSHIFT_APP_NAME || 'parks',
db_svc_name : process.env.DATABASE_SERVICE_NAME || "mongodb"
})

var db_config = config.get('MONGODB_DB_URL'),
collection = config.get('collection_name');

//normalize db connection string
if(db_config[db_config.length - 1] !== "/"){
db_config += '/';
}
config.add({db_config: db_config+collection});
return config;
}
exports = module.exports = autoconfig();
129 changes: 12 additions & 117 deletions bin/db.js
View file
Original file line number Diff line number Diff line change
@@ -1,119 +1,14 @@
var cc = require('config-multipaas'),
mongojs = require('mongojs'),
path = require('path');

var config = cc({
collection_name : process.env.MONGODB_DATABASE || process.env.COLLECTION_NAME || process.env.OPENSHIFT_APP_NAME || 'parks',
db_service_name : process.env.DATABASE_SERVICE_NAME || "mongodb"
})

var db_config = config.get('MONGODB_DB_URL'),
collection_name = config.get('collection_name');
db_service = config.get('db_service_name').toUpperCase();

//kubernetes and openshiftV3 config
if( process.env[db_service+'_USER'] && process.env[db_service+'_PASSWORD'] &&
process.env[db_service+'_SERVICE_HOST'] && process.env[db_service+'_SERVICE_PORT'] ){
db_config = process.env[db_service+'_USER']+":"+process.env[db_service+'_PASSWORD']+"@"+process.env[db_service+'_SERVICE_HOST']+":"+process.env[db_service+'_SERVICE_PORT']+"/";
var config = require('./config.js');
var db_svc = config.get('db_svc_name'),
db_export = {};

// Attempt to autoconfigure for PG and MongoDB
if( db_svc == "postgresql"){
db_export = require('./pgdb.js');
}else if( db_svc == "mongodb"){
db_export = require('./mongodb.js');
}else{
console.log("ERROR: DB Configuration missing! Failed to autoconfigure database");
}
//normalize db connection string
if(db_config[db_config.length - 1] !== "/"){
db_config += '/';
}
db_config +=collection_name;
console.log("DB connection: " + db_config);
var db = mongojs(db_config, [collection_name] );

db.on('error', function (err) {
console.log('database error', err)
})

db.on('connect', function () {
console.log('database connected')
})

function init_db(persist_db_connection){
var points = require(path.resolve('./parkcoord.json'));
db[collection_name].ensureIndex({'pos':"2d"}, function(err, doc){
if(err){
console.log(err);
return persist_db_connection || db.close();
}else{
console.log("index added on 'pos'");
db[collection_name].count(function(errr, count){
if(errr){
console.log(errr);
return persist_db_connection || db.close();
}else if(count > 0){
console.log("data already exists - bypassing db initialization work...");
return persist_db_connection || db.close();
}else{
console.log("Importing map points...");
db[collection_name].insert(points, function(errrr){
if(errr){
console.log(errr);
}else{
console.log("points imported");
}
return persist_db_connection || db.close();
});
}
});
}
});
}

function flush_db(persist_db_connection){
console.log("Dropping the DB...");
db[collection_name].drop(function(err){
if(err){
console.log(err);
}
return persist_db_connection || db.close();
});
}

function select_box(req, res, next){
//clean these variables:
var query = req.query;
var lat1 = Number(query.lat1),
lon1 = Number(query.lon1),
lat2 = Number(query.lat2),
lon2 = Number(query.lon2);
var limit = (typeof(query.limit) !== "undefined") ? query.limit : 40;
if(!(Number(query.lat1)
&& Number(query.lon1)
&& Number(query.lat2)
&& Number(query.lon2)
&& Number(limit)))
{
res.send(500, {http_status:400,error_msg: "this endpoint requires two pair of lat, long coordinates: lat1 lon1 lat2 lon2\na query 'limit' parameter can be optionally specified as well."});
return console.error('could not connect to the database', err);
}
db[collection_name].find( {"pos" : {'$geoWithin': { '$box': [[lon1,lat1],[lon2,lat2]]}}}).limit(limit).toArray(function(err,rows){
if(err) {
res.send(500, {http_status:500,error_msg: err})
return console.error('error running query', err);
}
res.send(rows);
return rows;
});
};
function select_all(req, res, next){
console.log(db);
db[collection_name].find(function(err, rows){
if(err) {
res.send(500, {http_status:500,error_msg: err})
return console.error('error running query', err);
}
res.send(rows);
return rows;
});
};

module.exports = exports = {
selectAll: select_all,
selectBox: select_box,
flushDB: flush_db,
initDB: init_db
};
module.exports = exports = db_export;
103 changes: 103 additions & 0 deletions bin/mongodb.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
var config = require('./config.js'),
mongojs = require('mongojs'),
path = require('path');

var db_config = config.get('db_config'),
collection = config.get('collection_name');

console.log("DB connection: " + db_config);
var db = mongojs(db_config, [collection] );

db.on('error', function (err) {
console.log('database error', err)
})

db.on('connect', function () {
console.log('database connected')
})

function init_db(persist_db_connection){
var points = require(path.resolve('./parkcoord.json'));
db[collection].ensureIndex({'pos':"2d"}, function(err, doc){
if(err){
console.log(err);
return persist_db_connection || db.close();
}else{
console.log("index added on 'pos'");
db[collection].count(function(errr, count){
if(errr){
console.log(errr);
return persist_db_connection || db.close();
}else if(count > 0){
console.log("data already exists - bypassing db initialization work...");
return persist_db_connection || db.close();
}else{
console.log("Importing map points...");
db[collection].insert(points, function(errrr){
if(errr){
console.log(errr);
}else{
console.log("points imported");
}
return persist_db_connection || db.close();
});
}
});
}
});
}

function flush_db(persist_db_connection){
console.log("Dropping the DB...");
db[collection].drop(function(err){
if(err){
console.log(err);
}
return persist_db_connection || db.close();
});
}

function select_box(req, res, next){
//clean these variables:
var query = req.query;
var lat1 = Number(query.lat1),
lon1 = Number(query.lon1),
lat2 = Number(query.lat2),
lon2 = Number(query.lon2);
var limit = (typeof(query.limit) !== "undefined") ? query.limit : 40;
if(!(Number(query.lat1)
&& Number(query.lon1)
&& Number(query.lat2)
&& Number(query.lon2)
&& Number(limit)))
{
res.send(500, {http_status:400,error_msg: "this endpoint requires two pair of lat, long coordinates: lat1 lon1 lat2 lon2\na query 'limit' parameter can be optionally specified as well."});
return console.error('could not connect to the database', err);
}
db[collection].find( {"pos" : {'$geoWithin': { '$box': [[lon1,lat1],[lon2,lat2]]}}}).limit(limit).toArray(function(err,rows){
if(err) {
res.send(500, {http_status:500,error_msg: err})
return console.error('error running query', err);
}
res.send(rows);
return rows;
});
};
function select_all(req, res, next){
console.log(db);
db[collection].find(function(err, rows){
if(err) {
res.send(500, {http_status:500,error_msg: err})
return console.error('error running query', err);
}
res.send(rows);
return rows;
});
};

module.exports = exports = {
selectAll: select_all,
selectBox: select_box,
flushDB: flush_db,
initDB: init_db
};
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"npm": "1.2.x"
},
"dependencies": {
"config-multipaas": "^0.1.0",
"config-multipaas": "^0.2.0",
"mongojs": "^2.2.2",
"restify": "^4.0.3"
},
Expand Down

0 comments on commit 0633b99

Please sign in to comment.