fix last day issues + log errors

This commit is contained in:
Ivan Socolsky 2016-06-22 16:46:57 -03:00
parent a743f1949a
commit dbea849e76
No known key found for this signature in database
GPG Key ID: FAECE6A05FAA4F56
1 changed files with 29 additions and 17 deletions

View File

@ -82,6 +82,7 @@ Stats.prototype._getNewWallets = function(cb) {
}; };
function updateStats(from, cb) { function updateStats(from, cb) {
var to = moment().subtract(1, 'day').endOf('day');
var map = function() { var map = function() {
var day = new Date(this.createdOn * 1000); var day = new Date(this.createdOn * 1000);
day.setHours(0); day.setHours(0);
@ -91,16 +92,25 @@ Stats.prototype._getNewWallets = function(cb) {
day: +day, day: +day,
network: this.network, network: this.network,
}; };
var value = 1; var value = {
count: 1
};
emit(key, value); emit(key, value);
}; };
var reduce = function(k, v) { var reduce = function(k, v) {
return v.length; var count = 0;
for (var i = 0; i < v.length; i++) {
count += v[i].count;
}
return {
count: count,
};
}; };
var opts = { var opts = {
query: { query: {
createdOn: { createdOn: {
$gt: from.unix(), $gt: from.unix(),
$lte: to.unix(),
}, },
}, },
out: { out: {
@ -127,11 +137,12 @@ Stats.prototype._getNewWallets = function(cb) {
}) })
.toArray(function(err, results) { .toArray(function(err, results) {
if (err) return cb(err); if (err) return cb(err);
var stats = _.map(results, function(record) { var stats = {};
stats.byDay = _.map(results, function(record) {
var day = moment(record._id.day).format('YYYYMMDD'); var day = moment(record._id.day).format('YYYYMMDD');
return { return {
day: day, day: day,
count: record.value count: record.value.count,
}; };
}); });
return cb(null, stats); return cb(null, stats);
@ -154,16 +165,13 @@ Stats.prototype._getNewWallets = function(cb) {
}); });
}, },
function(next) { function(next) {
queryStats(function(err, result) { queryStats(next);
if (err) return next(err);
var stats = {
byDay: result
};
return next(null, stats);
});
}, },
], ],
function(err, res) { function(err, res) {
if (err) {
log.error(err);
}
return cb(err, res[1]); return cb(err, res[1]);
}); });
}; };
@ -185,6 +193,7 @@ Stats.prototype._getTxProposals = function(cb) {
}; };
function updateStats(from, cb) { function updateStats(from, cb) {
var to = moment().subtract(1, 'day').endOf('day');
var map = function() { var map = function() {
var day = new Date(this.broadcastedOn * 1000); var day = new Date(this.broadcastedOn * 1000);
day.setHours(0); day.setHours(0);
@ -201,12 +210,14 @@ Stats.prototype._getTxProposals = function(cb) {
emit(key, value); emit(key, value);
}; };
var reduce = function(k, v) { var reduce = function(k, v) {
var amount = 0; var count = 0,
amount = 0;
for (var i = 0; i < v.length; i++) { for (var i = 0; i < v.length; i++) {
count += v[i].count;
amount += v[i].amount; amount += v[i].amount;
} }
return { return {
count: v.length, count: count,
amount: amount, amount: amount,
}; };
}; };
@ -215,6 +226,7 @@ Stats.prototype._getTxProposals = function(cb) {
status: 'broadcasted', status: 'broadcasted',
broadcastedOn: { broadcastedOn: {
$gt: from.unix(), $gt: from.unix(),
$lte: to.unix(),
}, },
}, },
out: { out: {
@ -277,13 +289,13 @@ Stats.prototype._getTxProposals = function(cb) {
}); });
}, },
function(next) { function(next) {
queryStats(function(err, result) { queryStats(next);
if (err) return next(err);
return next(null, result);
});
}, },
], ],
function(err, res) { function(err, res) {
if (err) {
log.error(err);
}
return cb(err, res[1]); return cb(err, res[1]);
}); });
}; };