Skip to content

Commit 943a592

Browse files
rezk2llrezk2ll
authored
🐛 fix monthly and weekly new users not being calculated correctly (#152)
* 🐛 fix: monthly and weekly new users not being calculated correctly * 🧪 chore: fix tests * 🏷️ chore: fix types * 🧪 chore: fix controller unit test * 🧪 chore: fix tests * 🧪 chore: fix tests
1 parent 4c8e9b9 commit 943a592

File tree

4 files changed

+222
-51
lines changed

4 files changed

+222
-51
lines changed

‎packages/tom-server/src/metrics-api/services/index.ts

+6-5
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ class MetricsService implements IMetricsService {
9292

9393
matrixUsers.push({
9494
...user,
95+
creation_ts: user.creation_ts * 1000,
9596
last_seen_ts: lastSeenTs
9697
})
9798
})
@@ -227,11 +228,11 @@ class MetricsService implements IMetricsService {
227228
}
228229
)) as unknown as MatrixUserIpInfo[]
229230

230-
const latestSeenTime = queryResult.reduce((latestTime, userIpInfo) => {
231-
const parsedLastSeen = parseInt(userIpInfo.last_seen, 10)
232-
233-
return parsedLastSeen > latestTime ? parsedLastSeen : latestTime
234-
}, 0)
231+
const latestSeenTime = queryResult.reduce(
232+
(latestTime, userIpInfo) =>
233+
userIpInfo.last_seen > latestTime ? userIpInfo.last_seen : latestTime,
234+
0
235+
)
235236

236237
return latestSeenTime
237238
} catch (error) {

‎packages/tom-server/src/metrics-api/tests/controller.test.ts

+61-21
Original file line numberDiff line numberDiff line change
@@ -12,25 +12,25 @@ const ONE_WEEK_IN_MS = 7 * ONE_DAY_IN_MS
1212
const ONE_MONTH_IN_MS = 30 * ONE_DAY_IN_MS
1313

1414
const TODAY_USER = {
15-
creation_ts: 1,
15+
creation_ts: new Date().getTime() / 1000,
1616
last_seen_ts: new Date().getTime(),
1717
name: 'user1'
1818
} satisfies MatrixUserInfo
1919

2020
const PRE_TODAY_USER = {
21-
creation_ts: 1,
21+
creation_ts: (new Date().getTime() - ONE_DAY_IN_MS - 1) / 1000,
2222
last_seen_ts: new Date().getTime() - ONE_DAY_IN_MS - 1,
2323
name: 'user2'
2424
}
2525

2626
const PRE_WEEK_USER = {
27-
creation_ts: 1,
27+
creation_ts: (new Date().getTime() - ONE_WEEK_IN_MS - 1) / 1000,
2828
last_seen_ts: new Date().getTime() - ONE_WEEK_IN_MS - 1,
2929
name: 'user3'
3030
}
3131

3232
const PRE_MONTH_USER = {
33-
creation_ts: 1,
33+
creation_ts: (new Date().getTime() - ONE_MONTH_IN_MS - 1) / 1000,
3434
last_seen_ts: new Date().getTime() - ONE_MONTH_IN_MS - 1,
3535
name: 'user4'
3636
}
@@ -129,11 +129,21 @@ describe('the mectrics API controller', () => {
129129

130130
expect(response.status).toBe(200)
131131
expect(response.body).toEqual({
132-
dailyActiveUsers: [TODAY_USER],
133-
weeklyActiveUsers: [TODAY_USER],
134-
monthlyActiveUsers: [TODAY_USER],
135-
weeklyNewUsers: [],
136-
monthlyNewUsers: []
132+
dailyActiveUsers: [
133+
{ ...TODAY_USER, creation_ts: TODAY_USER.creation_ts * 1000 }
134+
],
135+
weeklyActiveUsers: [
136+
{ ...TODAY_USER, creation_ts: TODAY_USER.creation_ts * 1000 }
137+
],
138+
monthlyActiveUsers: [
139+
{ ...TODAY_USER, creation_ts: TODAY_USER.creation_ts * 1000 }
140+
],
141+
weeklyNewUsers: [
142+
{ ...TODAY_USER, creation_ts: TODAY_USER.creation_ts * 1000 }
143+
],
144+
monthlyNewUsers: [
145+
{ ...TODAY_USER, creation_ts: TODAY_USER.creation_ts * 1000 }
146+
]
137147
})
138148
})
139149

@@ -167,11 +177,25 @@ describe('the mectrics API controller', () => {
167177

168178
expect(response.status).toBe(200)
169179
expect(response.body).toEqual({
170-
dailyActiveUsers: [TODAY_USER],
171-
weeklyActiveUsers: [TODAY_USER, PRE_TODAY_USER],
172-
monthlyActiveUsers: [TODAY_USER, PRE_TODAY_USER],
173-
weeklyNewUsers: [],
174-
monthlyNewUsers: []
180+
dailyActiveUsers: [
181+
{ ...TODAY_USER, creation_ts: TODAY_USER.creation_ts * 1000 }
182+
],
183+
weeklyActiveUsers: [
184+
{ ...TODAY_USER, creation_ts: TODAY_USER.creation_ts * 1000 },
185+
{ ...PRE_TODAY_USER, creation_ts: PRE_TODAY_USER.creation_ts * 1000 }
186+
],
187+
monthlyActiveUsers: [
188+
{ ...TODAY_USER, creation_ts: TODAY_USER.creation_ts * 1000 },
189+
{ ...PRE_TODAY_USER, creation_ts: PRE_TODAY_USER.creation_ts * 1000 }
190+
],
191+
weeklyNewUsers: [
192+
{ ...TODAY_USER, creation_ts: TODAY_USER.creation_ts * 1000 },
193+
{ ...PRE_TODAY_USER, creation_ts: PRE_TODAY_USER.creation_ts * 1000 }
194+
],
195+
monthlyNewUsers: [
196+
{ ...TODAY_USER, creation_ts: TODAY_USER.creation_ts * 1000 },
197+
{ ...PRE_TODAY_USER, creation_ts: PRE_TODAY_USER.creation_ts * 1000 }
198+
]
175199
})
176200
})
177201

@@ -206,11 +230,23 @@ describe('the mectrics API controller', () => {
206230

207231
expect(response.status).toBe(200)
208232
expect(response.body).toEqual({
209-
dailyActiveUsers: [TODAY_USER],
210-
weeklyActiveUsers: [TODAY_USER],
211-
monthlyActiveUsers: [TODAY_USER, PRE_WEEK_USER],
212-
weeklyNewUsers: [],
213-
monthlyNewUsers: []
233+
dailyActiveUsers: [
234+
{ ...TODAY_USER, creation_ts: TODAY_USER.creation_ts * 1000 }
235+
],
236+
weeklyActiveUsers: [
237+
{ ...TODAY_USER, creation_ts: TODAY_USER.creation_ts * 1000 }
238+
],
239+
monthlyActiveUsers: [
240+
{ ...TODAY_USER, creation_ts: TODAY_USER.creation_ts * 1000 },
241+
{ ...PRE_WEEK_USER, creation_ts: PRE_WEEK_USER.creation_ts * 1000 }
242+
],
243+
weeklyNewUsers: [
244+
{ ...TODAY_USER, creation_ts: TODAY_USER.creation_ts * 1000 }
245+
],
246+
monthlyNewUsers: [
247+
{ ...TODAY_USER, creation_ts: TODAY_USER.creation_ts * 1000 },
248+
{ ...PRE_WEEK_USER, creation_ts: PRE_WEEK_USER.creation_ts * 1000 }
249+
]
214250
})
215251
})
216252

@@ -247,9 +283,13 @@ describe('the mectrics API controller', () => {
247283
expect(response.body).toEqual({
248284
dailyActiveUsers: [],
249285
weeklyActiveUsers: [],
250-
monthlyActiveUsers: [PRE_WEEK_USER],
286+
monthlyActiveUsers: [
287+
{ ...PRE_WEEK_USER, creation_ts: PRE_WEEK_USER.creation_ts * 1000 }
288+
],
251289
weeklyNewUsers: [],
252-
monthlyNewUsers: []
290+
monthlyNewUsers: [
291+
{ ...PRE_WEEK_USER, creation_ts: PRE_WEEK_USER.creation_ts * 1000 }
292+
]
253293
})
254294
})
255295

‎packages/tom-server/src/metrics-api/tests/service.test.ts

+154-24
Original file line numberDiff line numberDiff line change
@@ -22,25 +22,25 @@ const ONE_WEEK_IN_MS = 7 * ONE_DAY_IN_MS
2222
const ONE_MONTH_IN_MS = 30 * ONE_DAY_IN_MS
2323

2424
const TODAY_USER = {
25-
creation_ts: 1,
25+
creation_ts: new Date().getTime() / 1000,
2626
last_seen_ts: new Date().getTime(),
2727
name: 'user1'
2828
}
2929

3030
const PRE_TODAY_USER = {
31-
creation_ts: 1,
31+
creation_ts: (new Date().getTime() - ONE_DAY_IN_MS - 1) / 1000,
3232
last_seen_ts: new Date().getTime() - ONE_DAY_IN_MS - 1,
3333
name: 'user2'
3434
}
3535

3636
const PRE_WEEK_USER = {
37-
creation_ts: 1,
37+
creation_ts: (new Date().getTime() - ONE_WEEK_IN_MS - 1) / 1000,
3838
last_seen_ts: new Date().getTime() - ONE_WEEK_IN_MS - 1,
3939
name: 'user3'
4040
}
4141

4242
const PRE_MONTH_USER = {
43-
creation_ts: 1,
43+
creation_ts: (new Date().getTime() - ONE_MONTH_IN_MS - 1) / 1000,
4444
last_seen_ts: new Date().getTime() - ONE_MONTH_IN_MS - 1,
4545
name: 'user4'
4646
}
@@ -103,11 +103,21 @@ describe('the Metrics API Service', () => {
103103
const result = await metricsService.getUserActivityStats()
104104

105105
expect(result).toEqual({
106-
dailyActiveUsers: [TODAY_USER],
107-
weeklyActiveUsers: [TODAY_USER],
108-
monthlyActiveUsers: [TODAY_USER],
109-
weeklyNewUsers: [],
110-
monthlyNewUsers: []
106+
dailyActiveUsers: [
107+
{ ...TODAY_USER, creation_ts: TODAY_USER.creation_ts * 1000 }
108+
],
109+
weeklyActiveUsers: [
110+
{ ...TODAY_USER, creation_ts: TODAY_USER.creation_ts * 1000 }
111+
],
112+
monthlyActiveUsers: [
113+
{ ...TODAY_USER, creation_ts: TODAY_USER.creation_ts * 1000 }
114+
],
115+
weeklyNewUsers: [
116+
{ ...TODAY_USER, creation_ts: TODAY_USER.creation_ts * 1000 }
117+
],
118+
monthlyNewUsers: [
119+
{ ...TODAY_USER, creation_ts: TODAY_USER.creation_ts * 1000 }
120+
]
111121
})
112122
})
113123

@@ -155,11 +165,25 @@ describe('the Metrics API Service', () => {
155165
const result = await metricsService.getUserActivityStats()
156166

157167
expect(result).toEqual({
158-
dailyActiveUsers: [TODAY_USER],
159-
weeklyActiveUsers: [TODAY_USER, PRE_TODAY_USER],
160-
monthlyActiveUsers: [TODAY_USER, PRE_TODAY_USER],
161-
weeklyNewUsers: [],
162-
monthlyNewUsers: []
168+
dailyActiveUsers: [
169+
{ ...TODAY_USER, creation_ts: TODAY_USER.creation_ts * 1000 }
170+
],
171+
weeklyActiveUsers: [
172+
{ ...TODAY_USER, creation_ts: TODAY_USER.creation_ts * 1000 },
173+
{ ...PRE_TODAY_USER, creation_ts: PRE_TODAY_USER.creation_ts * 1000 }
174+
],
175+
monthlyActiveUsers: [
176+
{ ...TODAY_USER, creation_ts: TODAY_USER.creation_ts * 1000 },
177+
{ ...PRE_TODAY_USER, creation_ts: PRE_TODAY_USER.creation_ts * 1000 }
178+
],
179+
weeklyNewUsers: [
180+
{ ...TODAY_USER, creation_ts: TODAY_USER.creation_ts * 1000 },
181+
{ ...PRE_TODAY_USER, creation_ts: PRE_TODAY_USER.creation_ts * 1000 }
182+
],
183+
monthlyNewUsers: [
184+
{ ...TODAY_USER, creation_ts: TODAY_USER.creation_ts * 1000 },
185+
{ ...PRE_TODAY_USER, creation_ts: PRE_TODAY_USER.creation_ts * 1000 }
186+
]
163187
})
164188
})
165189

@@ -205,11 +229,27 @@ describe('the Metrics API Service', () => {
205229
const result = await metricsService.getUserActivityStats()
206230

207231
expect(result).toEqual({
208-
dailyActiveUsers: [TODAY_USER],
209-
weeklyActiveUsers: [TODAY_USER, PRE_TODAY_USER],
210-
monthlyActiveUsers: [TODAY_USER, PRE_TODAY_USER, PRE_WEEK_USER],
211-
weeklyNewUsers: [],
212-
monthlyNewUsers: []
232+
dailyActiveUsers: [
233+
{ ...TODAY_USER, creation_ts: TODAY_USER.creation_ts * 1000 }
234+
],
235+
weeklyActiveUsers: [
236+
{ ...TODAY_USER, creation_ts: TODAY_USER.creation_ts * 1000 },
237+
{ ...PRE_TODAY_USER, creation_ts: PRE_TODAY_USER.creation_ts * 1000 }
238+
],
239+
monthlyActiveUsers: [
240+
{ ...TODAY_USER, creation_ts: TODAY_USER.creation_ts * 1000 },
241+
{ ...PRE_TODAY_USER, creation_ts: PRE_TODAY_USER.creation_ts * 1000 },
242+
{ ...PRE_WEEK_USER, creation_ts: PRE_WEEK_USER.creation_ts * 1000 }
243+
],
244+
weeklyNewUsers: [
245+
{ ...TODAY_USER, creation_ts: TODAY_USER.creation_ts * 1000 },
246+
{ ...PRE_TODAY_USER, creation_ts: PRE_TODAY_USER.creation_ts * 1000 }
247+
],
248+
monthlyNewUsers: [
249+
{ ...TODAY_USER, creation_ts: TODAY_USER.creation_ts * 1000 },
250+
{ ...PRE_TODAY_USER, creation_ts: PRE_TODAY_USER.creation_ts * 1000 },
251+
{ ...PRE_WEEK_USER, creation_ts: PRE_WEEK_USER.creation_ts * 1000 }
252+
]
213253
})
214254
})
215255

@@ -263,11 +303,101 @@ describe('the Metrics API Service', () => {
263303
const result = await metricsService.getUserActivityStats()
264304

265305
expect(result).toEqual({
266-
dailyActiveUsers: [TODAY_USER],
267-
weeklyActiveUsers: [TODAY_USER, PRE_TODAY_USER],
268-
monthlyActiveUsers: [TODAY_USER, PRE_TODAY_USER, PRE_WEEK_USER],
269-
weeklyNewUsers: [],
270-
monthlyNewUsers: []
306+
dailyActiveUsers: [
307+
{ ...TODAY_USER, creation_ts: TODAY_USER.creation_ts * 1000 }
308+
],
309+
weeklyActiveUsers: [
310+
{ ...TODAY_USER, creation_ts: TODAY_USER.creation_ts * 1000 },
311+
{ ...PRE_TODAY_USER, creation_ts: PRE_TODAY_USER.creation_ts * 1000 }
312+
],
313+
monthlyActiveUsers: [
314+
{ ...TODAY_USER, creation_ts: TODAY_USER.creation_ts * 1000 },
315+
{ ...PRE_TODAY_USER, creation_ts: PRE_TODAY_USER.creation_ts * 1000 },
316+
{ ...PRE_WEEK_USER, creation_ts: PRE_WEEK_USER.creation_ts * 1000 }
317+
],
318+
weeklyNewUsers: [
319+
{ ...TODAY_USER, creation_ts: TODAY_USER.creation_ts * 1000 },
320+
{ ...PRE_TODAY_USER, creation_ts: PRE_TODAY_USER.creation_ts * 1000 }
321+
],
322+
monthlyNewUsers: [
323+
{ ...TODAY_USER, creation_ts: TODAY_USER.creation_ts * 1000 },
324+
{ ...PRE_TODAY_USER, creation_ts: PRE_TODAY_USER.creation_ts * 1000 },
325+
{ ...PRE_WEEK_USER, creation_ts: PRE_WEEK_USER.creation_ts * 1000 }
326+
]
327+
})
328+
})
329+
330+
it('should return the weekly and monthly new users list', async () => {
331+
dbMock.getAll.mockResolvedValue([
332+
TODAY_USER,
333+
PRE_TODAY_USER,
334+
PRE_WEEK_USER,
335+
PRE_MONTH_USER
336+
])
337+
338+
dbMock.get.mockImplementation(
339+
async (
340+
_table: string,
341+
_fields: string[],
342+
filters: Record<string, string | number>
343+
) => {
344+
switch (filters.user_id) {
345+
case TODAY_USER.name:
346+
return await Promise.resolve([
347+
{
348+
user_id: TODAY_USER.name,
349+
last_seen: TODAY_USER.last_seen_ts
350+
}
351+
])
352+
case PRE_TODAY_USER.name:
353+
return await Promise.resolve([
354+
{
355+
user_id: PRE_TODAY_USER.name,
356+
last_seen: PRE_TODAY_USER.last_seen_ts
357+
}
358+
])
359+
case PRE_WEEK_USER.name:
360+
return await Promise.resolve([
361+
{
362+
user_id: PRE_WEEK_USER.name,
363+
last_seen: PRE_WEEK_USER.last_seen_ts
364+
}
365+
])
366+
case PRE_MONTH_USER.name:
367+
return await Promise.resolve([
368+
{
369+
user_id: PRE_MONTH_USER.name,
370+
last_seen: PRE_MONTH_USER.last_seen_ts
371+
}
372+
])
373+
}
374+
}
375+
)
376+
377+
const result = await metricsService.getUserActivityStats()
378+
379+
expect(result).toEqual({
380+
dailyActiveUsers: [
381+
{ ...TODAY_USER, creation_ts: TODAY_USER.creation_ts * 1000 }
382+
],
383+
weeklyActiveUsers: [
384+
{ ...TODAY_USER, creation_ts: TODAY_USER.creation_ts * 1000 },
385+
{ ...PRE_TODAY_USER, creation_ts: PRE_TODAY_USER.creation_ts * 1000 }
386+
],
387+
monthlyActiveUsers: [
388+
{ ...TODAY_USER, creation_ts: TODAY_USER.creation_ts * 1000 },
389+
{ ...PRE_TODAY_USER, creation_ts: PRE_TODAY_USER.creation_ts * 1000 },
390+
{ ...PRE_WEEK_USER, creation_ts: PRE_WEEK_USER.creation_ts * 1000 }
391+
],
392+
weeklyNewUsers: [
393+
{ ...TODAY_USER, creation_ts: TODAY_USER.creation_ts * 1000 },
394+
{ ...PRE_TODAY_USER, creation_ts: PRE_TODAY_USER.creation_ts * 1000 }
395+
],
396+
monthlyNewUsers: [
397+
{ ...TODAY_USER, creation_ts: TODAY_USER.creation_ts * 1000 },
398+
{ ...PRE_TODAY_USER, creation_ts: PRE_TODAY_USER.creation_ts * 1000 },
399+
{ ...PRE_WEEK_USER, creation_ts: PRE_WEEK_USER.creation_ts * 1000 }
400+
]
271401
})
272402
})
273403
})

‎packages/tom-server/src/metrics-api/types.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,5 @@ export interface UserMessageEvent {
3939
export interface MatrixUserIpInfo {
4040
user_id: string
4141
device_id: string
42-
last_seen: string
42+
last_seen: number
4343
}

0 commit comments

Comments
 (0)