Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions server/mergin/stats/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ class ServerCallhomeData:
server_version: Optional[str]
monthly_contributors: Optional[int]
editors: Optional[int]
sso_connections: Optional[int]


class MerginInfo(db.Model):
Expand Down
1 change: 1 addition & 0 deletions server/mergin/stats/tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ def get_callhome_data(info: MerginInfo | None = None) -> ServerCallhomeData:
server_version=current_app.config["VERSION"],
monthly_contributors=current_app.ws_handler.monthly_contributors_count(),
editors=current_app.ws_handler.server_editors_count(),
sso_connections=current_app.ws_handler.sso_connections_count(),
)
return data

Expand Down
5 changes: 5 additions & 0 deletions server/mergin/sync/workspace.py
Original file line number Diff line number Diff line change
Expand Up @@ -373,3 +373,8 @@ def server_editors_count(self) -> int:
.group_by(ProjectUser.user_id)
.count()
)

@staticmethod
def sso_connections_count() -> int:
"""Number of SSO connections for the server"""
return 0
2 changes: 2 additions & 0 deletions server/mergin/tests/test_statistics.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ def test_send_statistics(app, caplog):
"server_version",
"monthly_contributors",
"editors",
"sso_connections",
}
assert data["workspaces_count"] == 1
assert data["service_uuid"] == app.config["SERVICE_ID"]
Expand All @@ -72,6 +73,7 @@ def test_send_statistics(app, caplog):
assert data["projects_count"] == 2
assert data["contact_email"] == "test@example.com"
assert data["editors"] == 2
assert data["sso_connections"] == 0

# repeated action does not do anything
task = send_statistics.s().apply()
Expand Down
Loading