From 0ed2b06bc4e12fabae45b5be554892b9e3846c91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=BE=E3=81=A3=E3=81=A1=E3=82=83=E3=81=A8=E3=83=BC?= =?UTF-8?q?=E3=81=AB=E3=82=85?= <17376330+u1-liquid@users.noreply.github.com> Date: Tue, 17 Sep 2024 08:07:37 +0900 Subject: [PATCH] =?UTF-8?q?fix(api/users):=20=E3=83=9A=E3=83=BC=E3=82=B8?= =?UTF-8?q?=E3=83=93=E3=83=A5=E3=83=BC=E3=81=AE=E3=83=87=E3=83=BC=E3=82=BF?= =?UTF-8?q?=E3=81=AE=E5=8F=96=E5=BE=97=E7=AF=84=E5=9B=B2=E3=81=8C=E7=8B=AD?= =?UTF-8?q?=E3=81=99=E3=81=8E=E3=82=8B=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3=20(MisskeyIO#734)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 46e4b8f8e1a7ba77c12360e62623975e3d0f1151) --- .../src/core/chart/charts/per-user-pv.ts | 31 ++++++++++-- packages/backend/src/core/chart/core.ts | 47 ++----------------- .../backend/src/server/api/endpoints/users.ts | 32 ++++++------- 3 files changed, 45 insertions(+), 65 deletions(-) diff --git a/packages/backend/src/core/chart/charts/per-user-pv.ts b/packages/backend/src/core/chart/charts/per-user-pv.ts index 02baa5ec1d..3ad90b0904 100644 --- a/packages/backend/src/core/chart/charts/per-user-pv.ts +++ b/packages/backend/src/core/chart/charts/per-user-pv.ts @@ -7,6 +7,7 @@ import { Injectable, Inject } from '@nestjs/common'; import { DataSource } from 'typeorm'; import type { MiUser } from '@/models/User.js'; import { AppLockService } from '@/core/AppLockService.js'; +import { addTime, dateUTC, subtractTime } from '@/misc/prelude/time.js'; import { DI } from '@/di-symbols.js'; import { bindThis } from '@/decorators.js'; import Chart from '../core.js'; @@ -54,10 +55,30 @@ export default class PerUserPvChart extends Chart { // eslint-dis } @bindThis - public async getChartUsers(span: 'hour' | 'day', order: 'ASC' | 'DESC', amount: number, cursor: Date | null, limit = 0, offset = 0): Promise<{ - userId: string; - count: number; -}[]> { - return await this.getChartPv(span, amount, cursor, limit, offset, order); + public async getUsersRanking(span: 'hour' | 'day', order: 'ASC' | 'DESC', amount: number, cursor: Date | null, limit = 0, offset = 0): Promise<{ userId: string; count: number; }[]> { + const [y, m, d, h, _m, _s, _ms] = cursor ? Chart.parseDate(subtractTime(addTime(cursor, 1, span), 1)) : Chart.getCurrentDate(); + const [y2, m2, d2, h2] = cursor ? Chart.parseDate(addTime(cursor, 1, span)) : [] as never; + + const lt = dateUTC([y, m, d, h, _m, _s, _ms]); + + const gt = + span === 'day' ? subtractTime(cursor ? dateUTC([y2, m2, d2, 0]) : dateUTC([y, m, d, 0]), amount - 1, 'day') : + span === 'hour' ? subtractTime(cursor ? dateUTC([y2, m2, d2, h2]) : dateUTC([y, m, d, h]), amount - 1, 'hour') : + new Error('not happen') as never; + + const repository = + span === 'hour' ? this.repositoryForHour : + span === 'day' ? this.repositoryForDay : + new Error('not happen') as never; + + // ログ取得 + return await repository.createQueryBuilder() + .select('"group" as "userId", sum("___upv_user" + "___upv_visitor") as "count"') + .where('date BETWEEN :gt AND :lt', { gt: Chart.dateToTimestamp(gt), lt: Chart.dateToTimestamp(lt) }) + .groupBy('"userId"') + .orderBy('"count"', order) + .offset(offset) + .limit(limit) + .getRawMany<{ userId: string, count: number }>(); } } diff --git a/packages/backend/src/core/chart/core.ts b/packages/backend/src/core/chart/core.ts index 44613b5223..deae0bcfbb 100644 --- a/packages/backend/src/core/chart/core.ts +++ b/packages/backend/src/core/chart/core.ts @@ -150,10 +150,8 @@ export default abstract class Chart { // ↓にしたいけどfindOneとかで型エラーになる //private repositoryForHour: MiAndOrmRepository>; //private repositoryForDay: MiAndOrmRepository>; - private repositoryForHour: MiAndOrmRepository<{ id: number; group?: string | null; date: number;}>; - private repositoryForDay: MiAndOrmRepository<{ id: number; group?: string | null; date: number;}>; - private repositoryUserPvForHour: MiAndOrmRepository<{ id: number; group?: string | null; date: number; ___pv_user:number; ___upv_user:number; ___pv_visitor:number; ___upv_visitor:number;}>; - private repositoryUserPvForDay: MiAndOrmRepository<{ id: number; group?: string | null; date: number; ___pv_user:number; ___upv_user:number; ___pv_visitor:number; ___upv_visitor:number;}>; + protected repositoryForHour: MiAndOrmRepository<{ id: number; group?: string | null; date: number; }>; + protected repositoryForDay: MiAndOrmRepository<{ id: number; group?: string | null; date: number; }>; /** * 1日に一回程度実行されれば良いような計算処理を入れる(主にCASCADE削除などアプリケーション側で感知できない変動によるズレの修正用) */ @@ -189,11 +187,11 @@ export default abstract class Chart { return columns; } - private static dateToTimestamp(x: Date): number { + protected static dateToTimestamp(x: Date): number { return Math.floor(x.getTime() / 1000); } - private static parseDate(date: Date): [number, number, number, number, number, number, number] { + protected static parseDate(date: Date): [number, number, number, number, number, number, number] { const y = date.getUTCFullYear(); const m = date.getUTCMonth(); const d = date.getUTCDate(); @@ -205,7 +203,7 @@ export default abstract class Chart { return [y, m, d, h, _m, _s, _ms]; } - private static getCurrentDate() { + protected static getCurrentDate() { return Chart.parseDate(new Date()); } @@ -281,8 +279,6 @@ export default abstract class Chart { const { hour, day } = Chart.schemaToEntity(name, schema, grouped); this.repositoryForHour = db.getRepository<{ id: number; group?: string | null; date: number; }>(hour).extend(miRepository); this.repositoryForDay = db.getRepository<{ id: number; group?: string | null; date: number; }>(day).extend(miRepository); - this.repositoryUserPvForHour = db.getRepository<{ id: number; group?: string | null; date: number; ___pv_user:number; ___upv_user:number; ___pv_visitor:number; ___upv_visitor:number;}>(hour).extend(miRepository); - this.repositoryUserPvForDay = db.getRepository<{ id: number; group?: string | null; date: number; ___pv_user:number; ___upv_user:number; ___pv_visitor:number; ___upv_visitor:number;}>(day).extend(miRepository); } @bindThis @@ -732,37 +728,4 @@ export default abstract class Chart { } return object as Unflatten>; } - - @bindThis - public async getChartPv(span: 'hour' | 'day', amount: number, cursor: Date | null, limit: number, offset: number, order: 'ASC' | 'DESC'): Promise< - { - userId: string, - count: number, - }[] - > { - const [y, m, d, h, _m, _s, _ms] = cursor ? Chart.parseDate(subtractTime(addTime(cursor, 1, span), 1)) : Chart.getCurrentDate(); - const [y2, m2, d2, h2] = cursor ? Chart.parseDate(addTime(cursor, 1, span)) : [] as never; - - const lt = dateUTC([y, m, d, h, _m, _s, _ms]); - - const gt = - span === 'day' ? subtractTime(cursor ? dateUTC([y2, m2, d2, 0]) : dateUTC([y, m, d, 0]), amount - 1, 'day') : - span === 'hour' ? subtractTime(cursor ? dateUTC([y2, m2, d2, h2]) : dateUTC([y, m, d, h]), amount - 1, 'hour') : - new Error('not happen') as never; - - const repository = - span === 'hour' ? this.repositoryUserPvForHour : - span === 'day' ? this.repositoryUserPvForDay : - new Error('not happen') as never; - - // ログ取得 - return await repository.createQueryBuilder() - .select('"group" as "userId", sum("___upv_user" + "___upv_visitor") as "count"') - .where('date BETWEEN :gt AND :lt', { gt: Chart.dateToTimestamp(gt), lt: Chart.dateToTimestamp(lt) }) - .groupBy('"userId"') - .orderBy('"count"', order) - .offset(offset) - .limit(limit) - .getRawMany<{ userId: string, count: number }>(); - } } diff --git a/packages/backend/src/server/api/endpoints/users.ts b/packages/backend/src/server/api/endpoints/users.ts index f09b0de687..8c02b9ed54 100644 --- a/packages/backend/src/server/api/endpoints/users.ts +++ b/packages/backend/src/server/api/endpoints/users.ts @@ -72,12 +72,16 @@ export default class extends Endpoint { // eslint- if (ps.hostname) { query.andWhere('user.host = :hostname', { hostname: ps.hostname.toLowerCase() }); } - const chartUsers: { userId: string; count: number; }[] = []; + + let pvUsers: { userId: string; count: number; }[] | undefined = undefined; if (ps.sort?.endsWith('pv')) { - await this.perUserPvChart.getChartUsers('day', ps.sort === '+pv' ? 'DESC' : 'ASC', 0, null, ps.limit, ps.offset).then(users => { - chartUsers.push(...users); - }); + // 直近12時間のPVランキングを取得 + pvUsers = await this.perUserPvChart.getUsersRanking( + 'hour', ps.sort.startsWith('+') ? 'DESC' : 'ASC', + 12, null, ps.limit, ps.offset, + ); } + switch (ps.sort) { case '+follower': query.orderBy('user.followersCount', 'DESC'); break; case '-follower': query.orderBy('user.followersCount', 'ASC'); break; @@ -85,16 +89,8 @@ export default class extends Endpoint { // eslint- case '-createdAt': query.orderBy('user.id', 'ASC'); break; case '+updatedAt': query.andWhere('user.updatedAt IS NOT NULL').orderBy('user.updatedAt', 'DESC'); break; case '-updatedAt': query.andWhere('user.updatedAt IS NOT NULL').orderBy('user.updatedAt', 'ASC'); break; - case '+pv': - if (chartUsers.length > 0) { - query.andWhere('user.id IN (:...userIds)', { userIds: chartUsers.map(user => user.userId) }); - } - break; - case '-pv': - if (chartUsers.length > 0) { - query.andWhere('user.id IN (:...userIds)', { userIds: chartUsers.map(user => user.userId) }); - } - break; + case '+pv': query.andWhere('user.id IN (:...userIds)', { userIds: pvUsers?.map(user => user.userId) ?? [] }); break; + case '-pv': query.andWhere('user.id IN (:...userIds)', { userIds: pvUsers?.map(user => user.userId) ?? [] }); break; default: query.orderBy('user.id', 'ASC'); break; } @@ -107,14 +103,14 @@ export default class extends Endpoint { // eslint- const users = await query.getMany(); if (ps.sort === '+pv') { users.sort((a, b) => { - const aPv = chartUsers.find(user => user.userId === a.id)?.count ?? 0; - const bPv = chartUsers.find(user => user.userId === b.id)?.count ?? 0; + const aPv = pvUsers?.find(u => u.userId === a.id)?.count ?? 0; + const bPv = pvUsers?.find(u => u.userId === b.id)?.count ?? 0; return bPv - aPv; }); } else if (ps.sort === '-pv') { users.sort((a, b) => { - const aPv = chartUsers.find(user => user.userId === a.id)?.count ?? 0; - const bPv = chartUsers.find(user => user.userId === b.id)?.count ?? 0; + const aPv = pvUsers?.find(u => u.userId === a.id)?.count ?? 0; + const bPv = pvUsers?.find(u => u.userId === b.id)?.count ?? 0; return aPv - bPv; }); }