Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

remote-activity: Use constants for columns when iterating over rows. 

This will help with updating this function for updating/changing
the columns in the chart as only the constant needs to be updated
and not every instance the integer is used in the loops over the
rows of data.
This commit is contained in:
Lauryn Menard 2024-01-18 11:40:25 +01:00 committed by Tim Abbott
parent 440b60b261
commit 8310d1f0be
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
analytics/views/remote_activity.py
View File

@ -72,14 +72,20 @@ def get_remote_server_activity(request: HttpRequest) -> HttpResponse:
"Links", "Links",
] ]
# If the column order above changes, update the constants below
SERVER_ID = 0
SERVER_HOSTNAME = 1
LAST_AUDIT_LOG_DATE = 4
MOBILE_USER_COUNT = 5
MOBILE_PUSH_COUNT = 6
rows = get_query_data(query) rows = get_query_data(query)
total_row = [] total_row = []
totals_columns = [5, 6]
plan_data_by_remote_server = get_plan_data_by_remote_server() plan_data_by_remote_server = get_plan_data_by_remote_server()
for row in rows: for row in rows:
# Add estimated revenue for server # Add estimated revenue for server
server_plan_data = plan_data_by_remote_server.get(row[0]) server_plan_data = plan_data_by_remote_server.get(row[SERVER_ID])
if server_plan_data is None: if server_plan_data is None:
row.append("---") row.append("---")
row.append("---") row.append("---")
@ -90,22 +96,23 @@ def get_remote_server_activity(request: HttpRequest) -> HttpResponse:
row.append(server_plan_data.current_status) row.append(server_plan_data.current_status)
row.append(f"${revenue}") row.append(f"${revenue}")
# Add user counts # Add user counts
remote_server_counts = get_remote_server_guest_and_non_guest_count(row[0]) remote_server_counts = get_remote_server_guest_and_non_guest_count(row[SERVER_ID])
row.append(remote_server_counts.non_guest_user_count) row.append(remote_server_counts.non_guest_user_count)
row.append(remote_server_counts.guest_user_count) row.append(remote_server_counts.guest_user_count)
# Add links # Add links
stats = remote_installation_stats_link(row[0]) stats = remote_installation_stats_link(row[SERVER_ID])
support = remote_installation_support_link(row[1]) support = remote_installation_support_link(row[SERVER_HOSTNAME])
links = stats + " " + support links = stats + " " + support
row.append(links) row.append(links)
# Format column data and add total row
for i, col in enumerate(cols): for i, col in enumerate(cols):
if col == "Last audit log update": if i == LAST_AUDIT_LOG_DATE:
fix_rows(rows, i, format_date_for_activity_reports) fix_rows(rows, i, format_date_for_activity_reports)
if col in ["Mobile users", "Mobile pushes forwarded"]: if i in [MOBILE_USER_COUNT, MOBILE_PUSH_COUNT]:
fix_rows(rows, i, format_none_as_zero) fix_rows(rows, i, format_none_as_zero)
if i == 0: if i == SERVER_ID:
total_row.append("Total") total_row.append("Total")
elif i in totals_columns: elif i in [MOBILE_USER_COUNT, MOBILE_PUSH_COUNT]:
total_row.append(str(sum(row[i] for row in rows if row[i] is not None))) total_row.append(str(sum(row[i] for row in rows if row[i] is not None)))
else: else:
total_row.append("") total_row.append("")