Skip to content
Snippets Groups Projects
Unverified Commit aa780648 authored by reivilibre's avatar reivilibre Committed by GitHub
Browse files

Minor changes to `user_daily_visits` (#10324)


* Use fake time in tests in _get_start_of_day.

* Change the inequality of last_seen in user_daily_visits

Co-authored-by: default avatarErik Johnston <erik@matrix.org>
parent 225be777
No related branches found
No related tags found
No related merge requests found
Minor change to the code that populates `user_daily_visits`.
...@@ -320,7 +320,7 @@ class ServerMetricsStore(EventPushActionsWorkerStore, SQLBaseStore): ...@@ -320,7 +320,7 @@ class ServerMetricsStore(EventPushActionsWorkerStore, SQLBaseStore):
""" """
Returns millisecond unixtime for start of UTC day. Returns millisecond unixtime for start of UTC day.
""" """
now = time.gmtime() now = time.gmtime(self._clock.time())
today_start = calendar.timegm((now.tm_year, now.tm_mon, now.tm_mday, 0, 0, 0)) today_start = calendar.timegm((now.tm_year, now.tm_mon, now.tm_mday, 0, 0, 0))
return today_start * 1000 return today_start * 1000
...@@ -352,7 +352,7 @@ class ServerMetricsStore(EventPushActionsWorkerStore, SQLBaseStore): ...@@ -352,7 +352,7 @@ class ServerMetricsStore(EventPushActionsWorkerStore, SQLBaseStore):
) udv ) udv
ON u.user_id = udv.user_id AND u.device_id=udv.device_id ON u.user_id = udv.user_id AND u.device_id=udv.device_id
INNER JOIN users ON users.name=u.user_id INNER JOIN users ON users.name=u.user_id
WHERE last_seen > ? AND last_seen <= ? WHERE ? <= last_seen AND last_seen < ?
AND udv.timestamp IS NULL AND users.is_guest=0 AND udv.timestamp IS NULL AND users.is_guest=0
AND users.appservice_id IS NULL AND users.appservice_id IS NULL
GROUP BY u.user_id, u.device_id GROUP BY u.user_id, u.device_id
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment