Skip to content

armgit / zulip

Public Imported from GitHub
0

Zulip server and web application. Open-source team chat that helps teams stay productive and focused.

users: Batch CustomProfileField lookups in validation.

Tim Abbott6cbe79e637b1
diff --git a/zerver/lib/users.py b/zerver/lib/users.py
index cda2e9020ad..1849328ab92 100644
--- a/zerver/lib/users.py
+++ b/zerver/lib/users.py
@@ -542,12 +542,16 @@ def validate_user_custom_profile_data(
realm_id: int, profile_data: list[ProfileDataElementUpdateDict], acting_user: UserProfile
) -> None:
# This function validate all custom field values according to their field type.
+ field_ids = [item["id"] for item in profile_data]
+ fields_by_id = {
+ field.id: field
+ for field in CustomProfileField.objects.filter(realm_id=realm_id, id__in=field_ids)
+ }
for item in profile_data:
field_id = item["id"]
- try:
- field = CustomProfileField.objects.get(realm_id=realm_id, id=field_id)
- except CustomProfileField.DoesNotExist:
+ if field_id not in fields_by_id:
raise JsonableError(_("Field id {id} not found.").format(id=field_id))
+ field = fields_by_id[field_id]
if not acting_user.is_realm_admin and not field.editable_by_user:
raise JsonableError(