From 0e786fbb667450b385c46a1981b6f9b630dc0b65 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 12 Aug 2017 18:02:28 +0900 Subject: [PATCH] =?UTF-8?q?=E3=81=9D=E3=81=AE=E6=97=A5=E3=81=94=E3=81=A8?= =?UTF-8?q?=E3=81=AE=E3=80=8C=E3=82=A2=E3=82=AB=E3=82=A6=E3=83=B3=E3=83=88?= =?UTF-8?q?=E3=81=8C=E4=BD=9C=E6=88=90=E3=81=95=E3=82=8C=E3=81=9F=E5=9B=9E?= =?UTF-8?q?=E6=95=B0=E3=80=8D=E3=82=82=E3=82=B0=E3=83=A9=E3=83=95=E3=81=AB?= =?UTF-8?q?=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/endpoints/aggregation/users.ts | 41 +++++++++++++------------- src/web/app/stats/tags/index.tag | 13 ++++++-- 2 files changed, 30 insertions(+), 24 deletions(-) diff --git a/src/api/endpoints/aggregation/users.ts b/src/api/endpoints/aggregation/users.ts index 9be4ca12a..9eb2d035e 100644 --- a/src/api/endpoints/aggregation/users.ts +++ b/src/api/endpoints/aggregation/users.ts @@ -15,15 +15,8 @@ module.exports = params => new Promise(async (res, rej) => { const [limit = 365, limitErr] = $(params.limit).optional.number().range(1, 365).$; if (limitErr) return rej('invalid limit param'); - const startTime = new Date(new Date().setMonth(new Date().getMonth() - 1)); - const users = await User - .find({ - $or: [ - { deleted_at: { $exists: false } }, - { deleted_at: { $gt: startTime } } - ] - }, { + .find({}, { _id: false, created_at: true, deleted_at: true @@ -34,24 +27,30 @@ module.exports = params => new Promise(async (res, rej) => { const graph = []; for (let i = 0; i < limit; i++) { - let day = new Date(new Date().setDate(new Date().getDate() - i)); - day = new Date(day.setMilliseconds(999)); - day = new Date(day.setSeconds(59)); - day = new Date(day.setMinutes(59)); - day = new Date(day.setHours(23)); + let dayStart = new Date(new Date().setDate(new Date().getDate() - i)); + dayStart = new Date(dayStart.setMilliseconds(0)); + dayStart = new Date(dayStart.setSeconds(0)); + dayStart = new Date(dayStart.setMinutes(0)); + dayStart = new Date(dayStart.setHours(0)); + + let dayEnd = new Date(new Date().setDate(new Date().getDate() - i)); + dayEnd = new Date(dayEnd.setMilliseconds(999)); + dayEnd = new Date(dayEnd.setSeconds(59)); + dayEnd = new Date(dayEnd.setMinutes(59)); + dayEnd = new Date(dayEnd.setHours(23)); // day = day.getTime(); - const count = users.filter(f => - f.created_at < day && (f.deleted_at == null || f.deleted_at > day) + const total = users.filter(u => + u.created_at < dayEnd && (u.deleted_at == null || u.deleted_at > dayEnd) + ).length; + + const created = users.filter(u => + u.created_at < dayEnd && u.created_at > dayStart ).length; graph.push({ - date: { - year: day.getFullYear(), - month: day.getMonth() + 1, // In JavaScript, month is zero-based. - day: day.getDate() - }, - count: count + total: total, + created: created }); } diff --git a/src/web/app/stats/tags/index.tag b/src/web/app/stats/tags/index.tag index 0adf58b0b..134fad3c0 100644 --- a/src/web/app/stats/tags/index.tag +++ b/src/web/app/stats/tags/index.tag @@ -168,7 +168,12 @@ + @@ -187,7 +192,8 @@ this.viewBoxY = 80; this.data = this.opts.data.reverse(); - const peak = Math.max.apply(null, this.data.map(d => d.count)); + const totalPeak = Math.max.apply(null, this.data.map(d => d.total)); + const createdPeak = Math.max.apply(null, this.data.map(d => d.created)); this.on('mount', () => { this.render(); @@ -195,7 +201,8 @@ this.render = () => { this.update({ - points: this.data.map((d, i) => `${i},${(1 - (d.count / peak)) * this.viewBoxY}`).join(' ') + totalPoints: this.data.map((d, i) => `${i},${(1 - (d.total / totalPeak)) * this.viewBoxY}`).join(' '), + createdPoints: this.data.map((d, i) => `${i},${(1 - (d.created / createdPeak)) * this.viewBoxY}`).join(' ') }); };