From ab488010b38d09a67f91f922fe3cdbdfee682ff6 Mon Sep 17 00:00:00 2001 From: Sahil Batra Date: Fri, 21 Jul 2023 16:41:48 +0530 Subject: [PATCH] models: Pass args to select_related in get_stream_by_id_in_realm. This commit updates the code to pass "realm" and "recipient" as arguments to select_related call in get_stream_by_id_in_realm. Previously, since there was no arguments, it fetched can_remove_subscribers_group and the related fields of "Realm" model as well which were not being used, but did not fetch "recipient" as it is a nullable field. --- zerver/models.py | 2 +- zerver/tests/test_message_edit.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/zerver/models.py b/zerver/models.py index 92f4fcfe57..69ec1c4476 100644 --- a/zerver/models.py +++ b/zerver/models.py @@ -2867,7 +2867,7 @@ def get_stream(stream_name: str, realm: Realm) -> Stream: def get_stream_by_id_in_realm(stream_id: int, realm: Realm) -> Stream: - return Stream.objects.select_related().get(id=stream_id, realm=realm) + return Stream.objects.select_related("realm", "recipient").get(id=stream_id, realm=realm) def bulk_get_streams(realm: Realm, stream_names: Set[str]) -> Dict[str, Any]: diff --git a/zerver/tests/test_message_edit.py b/zerver/tests/test_message_edit.py index 5e30765413..3f9693ed09 100644 --- a/zerver/tests/test_message_edit.py +++ b/zerver/tests/test_message_edit.py @@ -3690,7 +3690,7 @@ class EditMessageTest(EditMessageTestCase): "iago", "test move stream", "new stream", "test" ) - with self.assert_database_query_count(57), cache_tries_captured() as cache_tries: + with self.assert_database_query_count(56), cache_tries_captured() as cache_tries: result = self.client_patch( f"/json/messages/{msg_id}", {