Skip to content

Commit 50a5b65

Browse files
committed
Simplify and rename EmbeddedModelField's transform classes
1 parent 43bf45c commit 50a5b65

File tree

2 files changed

+9
-11
lines changed

2 files changed

+9
-11
lines changed

django_mongodb_backend/fields/embedded_model.py

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ def get_transform(self, name):
132132
if transform:
133133
return transform
134134
field = self.embedded_model._meta.get_field(name)
135-
return KeyTransformFactory(name, field)
135+
return EmbeddedModelTransformFactory(field)
136136

137137
def validate(self, value, model_instance):
138138
super().validate(value, model_instance)
@@ -156,10 +156,9 @@ def formfield(self, **kwargs):
156156
)
157157

158158

159-
class KeyTransform(Transform):
160-
def __init__(self, key_name, ref_field, *args, **kwargs):
159+
class EmbeddedModelTransform(Transform):
160+
def __init__(self, ref_field, *args, **kwargs):
161161
super().__init__(*args, **kwargs)
162-
self.key_name = str(key_name)
163162
self.ref_field = ref_field
164163

165164
def get_lookup(self, name):
@@ -187,7 +186,7 @@ def get_transform(self, name):
187186
def as_mql(self, compiler, connection, as_path=False):
188187
previous = self
189188
columns = []
190-
while isinstance(previous, KeyTransform):
189+
while isinstance(previous, EmbeddedModelTransform):
191190
columns.insert(0, previous.ref_field.column)
192191
previous = previous.lhs
193192
if as_path:
@@ -204,10 +203,9 @@ def output_field(self):
204203
return self.ref_field
205204

206205

207-
class KeyTransformFactory:
208-
def __init__(self, key_name, ref_field):
209-
self.key_name = key_name
206+
class EmbeddedModelTransformFactory:
207+
def __init__(self, ref_field):
210208
self.ref_field = ref_field
211209

212210
def __call__(self, *args, **kwargs):
213-
return KeyTransform(self.key_name, self.ref_field, *args, **kwargs)
211+
return EmbeddedModelTransform(self.ref_field, *args, **kwargs)

django_mongodb_backend/fields/polymorphic_embedded_model.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from django.db import models
66
from django.db.models.fields.related import lazy_related_operation
77

8-
from .embedded_model import KeyTransformFactory
8+
from .embedded_model import EmbeddedModelTransformFactory
99
from .utils import get_mongodb_connection
1010

1111

@@ -170,7 +170,7 @@ def get_transform(self, name):
170170
raise FieldDoesNotExist(
171171
f"The models of field '{self.name}' have no field named '{name}'."
172172
)
173-
return KeyTransformFactory(name, field)
173+
return EmbeddedModelTransformFactory(field)
174174

175175
def validate(self, value, model_instance):
176176
super().validate(value, model_instance)

0 commit comments

Comments
 (0)