Add storage and module API methods to get monthly active users and their appservices (#12838)

This commit is contained in:
Matt C 2022-05-27 20:25:57 +10:00 committed by GitHub
parent 3503f42741
commit a7da00d4f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 149 additions and 0 deletions

View File

@ -0,0 +1 @@
Add storage and module API methods to get monthly active users (and their corresponding appservices) within an optionally specified time range.

View File

@ -1429,6 +1429,26 @@ class ModuleApi:
user_id, spec, {"actions": actions}
)
async def get_monthly_active_users_by_service(
self, start_timestamp: Optional[int] = None, end_timestamp: Optional[int] = None
) -> List[Tuple[str, str]]:
"""Generates list of monthly active users and their services.
Please see corresponding storage docstring for more details.
Arguments:
start_timestamp: If specified, only include users that were first active
at or after this point
end_timestamp: If specified, only include users that were first active
at or before this point
Returns:
A list of tuples (appservice_id, user_id)
"""
return await self._store.get_monthly_active_users_by_service(
start_timestamp, end_timestamp
)
class PublicRoomListManager:
"""Contains methods for adding to, removing from and querying whether a room

View File

@ -122,6 +122,51 @@ class MonthlyActiveUsersWorkerStore(RegistrationWorkerStore):
"count_users_by_service", _count_users_by_service
)
async def get_monthly_active_users_by_service(
self, start_timestamp: Optional[int] = None, end_timestamp: Optional[int] = None
) -> List[Tuple[str, str]]:
"""Generates list of monthly active users and their services.
Please see "get_monthly_active_count_by_service" docstring for more details
about services.
Arguments:
start_timestamp: If specified, only include users that were first active
at or after this point
end_timestamp: If specified, only include users that were first active
at or before this point
Returns:
A list of tuples (appservice_id, user_id). "native" is emitted as the
appservice for users that don't come from appservices (i.e. native Matrix
users).
"""
if start_timestamp is not None and end_timestamp is not None:
where_clause = 'WHERE "timestamp" >= ? and "timestamp" <= ?'
query_params = [start_timestamp, end_timestamp]
elif start_timestamp is not None:
where_clause = 'WHERE "timestamp" >= ?'
query_params = [start_timestamp]
elif end_timestamp is not None:
where_clause = 'WHERE "timestamp" <= ?'
query_params = [end_timestamp]
else:
where_clause = ""
query_params = []
def _list_users(txn: LoggingTransaction) -> List[Tuple[str, str]]:
sql = f"""
SELECT COALESCE(appservice_id, 'native'), user_id
FROM monthly_active_users
LEFT JOIN users ON monthly_active_users.user_id=users.name
{where_clause};
"""
txn.execute(sql, query_params)
return cast(List[Tuple[str, str]], txn.fetchall())
return await self.db_pool.runInteraction("list_users", _list_users)
async def get_registered_reserved_users(self) -> List[str]:
"""Of the reserved threepids defined in config, retrieve those that are associated
with registered users

View File

@ -407,3 +407,86 @@ class MonthlyActiveUsersTestCase(unittest.HomeserverTestCase):
self.assertEqual(result[service1], 2)
self.assertEqual(result[service2], 1)
self.assertEqual(result[native], 1)
def test_get_monthly_active_users_by_service(self):
# (No users, no filtering) -> empty result
result = self.get_success(self.store.get_monthly_active_users_by_service())
self.assertEqual(len(result), 0)
# (Some users, no filtering) -> non-empty result
appservice1_user1 = "@appservice1_user1:example.com"
appservice2_user1 = "@appservice2_user1:example.com"
service1 = "service1"
service2 = "service2"
self.get_success(
self.store.register_user(
user_id=appservice1_user1, password_hash=None, appservice_id=service1
)
)
self.get_success(self.store.upsert_monthly_active_user(appservice1_user1))
self.get_success(
self.store.register_user(
user_id=appservice2_user1, password_hash=None, appservice_id=service2
)
)
self.get_success(self.store.upsert_monthly_active_user(appservice2_user1))
result = self.get_success(self.store.get_monthly_active_users_by_service())
self.assertEqual(len(result), 2)
self.assertIn((service1, appservice1_user1), result)
self.assertIn((service2, appservice2_user1), result)
# (Some users, end-timestamp filtering) -> non-empty result
appservice1_user2 = "@appservice1_user2:example.com"
timestamp1 = self.reactor.seconds()
self.reactor.advance(5)
timestamp2 = self.reactor.seconds()
self.get_success(
self.store.register_user(
user_id=appservice1_user2, password_hash=None, appservice_id=service1
)
)
self.get_success(self.store.upsert_monthly_active_user(appservice1_user2))
result = self.get_success(
self.store.get_monthly_active_users_by_service(
end_timestamp=round(timestamp1 * 1000)
)
)
self.assertEqual(len(result), 2)
self.assertNotIn((service1, appservice1_user2), result)
# (Some users, start-timestamp filtering) -> non-empty result
result = self.get_success(
self.store.get_monthly_active_users_by_service(
start_timestamp=round(timestamp2 * 1000)
)
)
self.assertEqual(len(result), 1)
self.assertIn((service1, appservice1_user2), result)
# (Some users, full-timestamp filtering) -> non-empty result
native_user1 = "@native_user1:example.com"
native = "native"
timestamp3 = self.reactor.seconds()
self.reactor.advance(100)
self.get_success(
self.store.register_user(
user_id=native_user1, password_hash=None, appservice_id=native
)
)
self.get_success(self.store.upsert_monthly_active_user(native_user1))
result = self.get_success(
self.store.get_monthly_active_users_by_service(
start_timestamp=round(timestamp2 * 1000),
end_timestamp=round(timestamp3 * 1000),
)
)
self.assertEqual(len(result), 1)
self.assertIn((service1, appservice1_user2), result)