paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-01 04:23:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

models: Replace __id syntax with _id where possible.

Browse Source 
model__id syntax implies needing a JOIN on the model table to fetch the
id. That's usually redundant, because the first table in the query
simply has a 'model_id' column, so the id can be fetched directly.
Django is actually smart enough to not do those redundant joins, but we
should still avoid this misguided syntax.

The exceptions are ManytoMany fields and queries doing a backward
relationship lookup. If "streams" is a many-to-many relationship, then
streams_id is invalid - streams__id syntax is needed. If "y" is a
foreign fields from X to Y:
class X:
  y = models.ForeignKey(Y)

then object x of class X has the field x.y_id, but y of class Y doesn't
have y.x_id. Thus Y queries need to be done like
Y.objects.filter(x__id__in=some_list)
This commit is contained in:
Mateusz Mandera
2021-04-22 16:23:09 +02:00
committed by Tim Abbott
parent 11177a40da
commit 1a8ad796f8
12 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
zerver/lib/presence.py
View File

@@ -21,13 +21,13 @@ def get_status_dicts_for_rows(
# here prevents us from having to assume the caller is playing nice.
all_rows = sorted(
all_rows,
key=lambda row: (row["user_profile__id"], row["timestamp"]),
key=lambda row: (row["user_profile_id"], row["timestamp"]),
)
if slim_presence:
# Stringify user_id here, since it's gonna be turned
# into a string anyway by JSON, and it keeps mypy happy.
get_user_key = lambda row: str(row["user_profile__id"])
get_user_key = lambda row: str(row["user_profile_id"])
get_user_info = get_modern_user_info
else:
get_user_key = lambda row: row["user_profile__email"]
@@ -88,7 +88,7 @@ def get_legacy_user_info(
dt = row["timestamp"]
timestamp = datetime_to_timestamp(dt)
push_enabled = row["user_profile__enable_offline_push_notifications"]
has_push_devices = row["user_profile__id"] in mobile_user_ids
has_push_devices = row["user_profile_id"] in mobile_user_ids
pushable = push_enabled and has_push_devices
info = dict(
@@ -129,7 +129,7 @@ def get_presence_for_user(
"status",
"timestamp",
"user_profile__email",
"user_profile__id",
"user_profile_id",
"user_profile__enable_offline_push_notifications",
)
presence_rows = list(query)
@@ -156,7 +156,7 @@ def get_status_dict_by_realm(
"status",
"timestamp",
"user_profile__email",
"user_profile__id",
"user_profile_id",
"user_profile__enable_offline_push_notifications",
)
@@ -167,7 +167,7 @@ def get_status_dict_by_realm(
flat=True,
)
user_profile_ids = [presence_row["user_profile__id"] for presence_row in presence_rows]
user_profile_ids = [presence_row["user_profile_id"] for presence_row in presence_rows]
if len(user_profile_ids) == 0:
# This conditional is necessary because query_for_ids
# throws an exception if passed an empty list.