graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-10 02:03:08 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix(server): fix aggregation of retention

Browse source
This commit is contained in:
syuilo 2023-01-27 11:10:37 +09:00
parent 7cb13cf839
commit d37a734379
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
packages/backend/src/queue/processors/AggregateRetentionProcessorService.ts
View file

@ -57,8 +57,15 @@ export class AggregateRetentionProcessorService {
usersCount: targetUserIds.length, usersCount: targetUserIds.length,
}); });
// 今日活動したユーザーを全て取得
const activeUsers = await this.usersRepository.findBy({
host: IsNull(),
lastActiveDate: MoreThan(new Date(Date.now() - (1000 * 60 * 60 * 24))),
});
const activeUsersIds = activeUsers.map(u => u.id);
for (const record of pastRecords) { for (const record of pastRecords) {
const retention = record.userIds.filter(id => targetUserIds.includes(id)).length; const retention = record.userIds.filter(id => activeUsersIds.includes(id)).length;
const data = deepClone(record.data); const data = deepClone(record.data);
data[dateKey] = retention; data[dateKey] = retention;