BTCPrivate
/
bitcore-wallet-service
mirror of https://github.com/BTCPrivate/bitcore-wallet-service.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixing minor issues

This commit is contained in:
Matias Pando 2015-05-07 19:21:09 -03:00
parent 2873fd8e40
commit ade91a5612
2 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/expressapp.js
View File

@ -320,7 +320,7 @@ ExpressApp.prototype.start = function(opts, cb) {
var opts = {}; var opts = {};
opts.from = req.params['from']; opts.from = req.params['from'];
opts.to = req.params['to']; opts.to = req.params['to'];
var data = stats.getStats(opts, function(err, data) { stats.getStats(opts, function(err, data) {
if (err) return returnError(err, res, req); if (err) return returnError(err, res, req);
res.json(data); res.json(data);
res.end(); res.end();

38
scripts/stats.js
View File

@ -16,9 +16,7 @@ var startDate = moment();
var endDate = moment(); var endDate = moment();
var stats = {}; var stats = {};
var wallets = {}; var wallets = {};
var bwsStats = {}; var bwsStats = {};
bwsStats.cleanUp = function() { bwsStats.cleanUp = function() {
@ -26,7 +24,7 @@ bwsStats.cleanUp = function() {
'livenet': {}, 'livenet': {},
'testnet': {} 'testnet': {}
}; };
} };
bwsStats.AddingWalletToCache = function(data) { bwsStats.AddingWalletToCache = function(data) {
@ -34,7 +32,7 @@ bwsStats.AddingWalletToCache = function(data) {
wallets[data.id] = data.network; wallets[data.id] = data.network;
}; };
bwsStats.TotalNewWalletForToday = function(data) { bwsStats.TotalNewWallets = function(data) {
if (!data) return; if (!data) return;
var day = moment(data.createdOn * 1000).format('YYYYMMDD'); var day = moment(data.createdOn * 1000).format('YYYYMMDD');
if (!stats[data.network][day]) { if (!stats[data.network][day]) {
@ -47,7 +45,7 @@ bwsStats.TotalNewWalletForToday = function(data) {
stats[data.network][day].totalNewWallets++; stats[data.network][day].totalNewWallets++;
}; };
bwsStats.TotalTxpForToday = function(data) { bwsStats.TotalTxps = function(data) {
if (!data) return; if (!data) return;
var day = moment(data.createdOn * 1000).format('YYYYMMDD'); var day = moment(data.createdOn * 1000).format('YYYYMMDD');
var network = wallets[data.walletId]; var network = wallets[data.walletId];
@ -62,21 +60,22 @@ bwsStats.TotalTxpForToday = function(data) {
stats[network][day].totalAmount += data.amount; stats[network][day].totalAmount += data.amount;
}; };
bwsStats.ProcessData = function(DB, cb) { bwsStats.ProcessData = function(DB, cb) {
bwsStats.ProccesWallets(DB, function() { bwsStats.ProccesWallets(DB, function() {
bwsStats.ProccesNewWallets(DB, function() { bwsStats.ProccesNewWallets(DB, function() {
bwsStats.ProccesTxs(DB, cb); bwsStats.ProccesTxs(DB, function() {
cb();
});
}); });
}); });
}; };
bwsStats.ProccesWallets = function(DB, cb) { bwsStats.ProccesWallets = function(DB, cb) {
var collection = DB.collection('wallets'); var collection = DB.collection('wallets');
collection.find({}).toArray(function(err, items) { collection.find({}).toArray(function(err, items) {
if (err) { if (err) {
console.log('Error.', err); console.log('Error.', err);
cb(err);
} }
items.forEach(function(it) { items.forEach(function(it) {
@ -99,9 +98,10 @@ bwsStats.ProccesNewWallets = function(DB, cb) {
}).toArray(function(err, items) { }).toArray(function(err, items) {
if (err) { if (err) {
console.log('Error.', err); console.log('Error.', err);
cb(err);
} }
items.forEach(function(it) { items.forEach(function(it) {
bwsStats.TotalNewWalletForToday(it); bwsStats.TotalNewWallets(it);
}); });
cb(); cb();
}); });
@ -113,17 +113,18 @@ bwsStats.ProccesTxs = function(DB, cb) {
var end = Math.floor(endDate.endOf('day').valueOf() / 1000); var end = Math.floor(endDate.endOf('day').valueOf() / 1000);
collection.find({ collection.find({
createdOn: { createdOn: {
$gt: start, $gt: start,
$lt: end $lt: end
} }
}, }).toArray(
function(err, items) { function(err, items) {
if (err || !items) { if (err) {
console.log("No items found."); console.log('Error.', err);
cb(err);
} else { } else {
items.forEach(function(it) { items.forEach(function(it) {
bwsStats.TotalTxpForToday(it); bwsStats.TotalTxps(it);
}); });
} }
cb(); cb();
@ -140,6 +141,7 @@ bwsStats.getStats = function(opts, cb) {
mongodb.MongoClient.connect(url, function(err, db) { mongodb.MongoClient.connect(url, function(err, db) {
if (err) { if (err) {
console.log('Unable to connect to the mongoDB server. Error:', err); console.log('Unable to connect to the mongoDB server. Error:', err);
cb(err, null);
return; return;
} }
console.log('Connection established to ', url); console.log('Connection established to ', url);
@ -152,6 +154,6 @@ bwsStats.getStats = function(opts, cb) {
cb(null, stats); cb(null, stats);
}); });
}); });
} };
module.exports = bwsStats; module.exports = bwsStats;