Skip to content

Commit 43771ac

Browse files
committed
Address review
1 parent a30a562 commit 43771ac

File tree

2 files changed

+10
-13
lines changed

2 files changed

+10
-13
lines changed

django_mongodb_backend/schema.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -534,9 +534,8 @@ def _get_encrypted_fields(
534534
# An EmbeddedModelField may not have any encrypted fields.
535535
if embedded_result:
536536
field_list.extend(embedded_result["fields"])
537-
continue
538537
# Populate data for encrypted field.
539-
if getattr(field, "encrypted", False):
538+
elif getattr(field, "encrypted", False):
540539
if create_data_keys:
541540
data_key = connection.client_encryption.create_data_key(
542541
kms_provider=kms_provider,

django_mongodb_backend/utils.py

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -203,14 +203,12 @@ def model_has_encrypted_fields(model):
203203
"""
204204
from django_mongodb_backend.fields import EmbeddedModelField # noqa: PLC0415
205205

206-
for field in model._meta.fields:
207-
if getattr(field, "encrypted", False):
208-
return True
209-
210-
# Recursively check embedded models.
211-
if isinstance(field, EmbeddedModelField) and model_has_encrypted_fields(
212-
field.embedded_model
213-
):
214-
return True
215-
216-
return False
206+
# Recursively check embedded models.
207+
return any(
208+
getattr(field, "encrypted", False)
209+
or (
210+
isinstance(field, EmbeddedModelField)
211+
and model_has_encrypted_fields(field.embedded_model)
212+
)
213+
for field in model._meta.fields
214+
)

0 commit comments

Comments
 (0)