Skip to content

Commit 263ae1a

Browse files
committed
RDBC-642 Code format
1 parent 1d744d1 commit 263ae1a

File tree

2 files changed

+34
-27
lines changed

2 files changed

+34
-27
lines changed

ravendb/documents/session/entity_to_json.py

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
from ravendb.documents.session.document_info import DocumentInfo
88
from ravendb.documents.session.event_args import (
99
BeforeConversionToDocumentEventArgs,
10-
AfterConversionToDocumentEventArgs, BeforeConversionToEntityEventArgs, AfterConversionToEntityEventArgs,
10+
AfterConversionToDocumentEventArgs,
11+
BeforeConversionToEntityEventArgs,
12+
AfterConversionToEntityEventArgs,
1113
)
1214
from ravendb.exceptions import exceptions
1315
from ravendb.exceptions.exceptions import InvalidOperationException
@@ -71,9 +73,7 @@ def _convert_entity_to_json_internal(
7173
return json_node
7274

7375
# todo: refactor this method, make it more useful/simple and less ugly (like this return...[0])
74-
def convert_to_entity(
75-
self, entity_type: Type[_T], key: str, document: dict, track_entity: bool
76-
) -> _T:
76+
def convert_to_entity(self, entity_type: Type[_T], key: str, document: dict, track_entity: bool) -> _T:
7777
conventions = self._session.conventions
7878
return self.convert_to_entity_static(document, entity_type, conventions, self._session)
7979

@@ -148,18 +148,25 @@ def convert_to_entity_by_key_static(
148148

149149
@staticmethod
150150
def convert_to_entity_static(
151-
document: dict, object_type: [_T], conventions: "DocumentConventions", session_hook: Optional["InMemoryDocumentSessionOperations"] = None
151+
document: dict,
152+
object_type: [_T],
153+
conventions: "DocumentConventions",
154+
session_hook: Optional["InMemoryDocumentSessionOperations"] = None,
152155
) -> _T:
153156
metadata = document.pop("@metadata")
154157
document_deepcopy = deepcopy(document)
155158
type_from_metadata = conventions.try_get_type_from_metadata(metadata)
156159
is_inherit = False
157160
key = metadata.get(constants.Documents.Metadata.ID, None)
158161
if session_hook:
159-
session_hook.before_conversion_to_entity_invoke(BeforeConversionToEntityEventArgs(session_hook,key,object_type,document_deepcopy))
162+
session_hook.before_conversion_to_entity_invoke(
163+
BeforeConversionToEntityEventArgs(session_hook, key, object_type, document_deepcopy)
164+
)
160165

161166
if object_type == dict or type_from_metadata == "builtins.dict":
162-
session_hook.after_conversion_to_entity_invoke(AfterConversionToEntityEventArgs(session_hook, key, document_deepcopy, document_deepcopy))
167+
session_hook.after_conversion_to_entity_invoke(
168+
AfterConversionToEntityEventArgs(session_hook, key, document_deepcopy, document_deepcopy)
169+
)
163170
return document_deepcopy
164171

165172
if type_from_metadata is None:
@@ -169,7 +176,8 @@ def convert_to_entity_static(
169176
dyn = _DynamicStructure(**document_deepcopy)
170177
if session_hook:
171178
session_hook.after_conversion_to_entity_invoke(
172-
AfterConversionToEntityEventArgs(session_hook, key, document_deepcopy,dyn))
179+
AfterConversionToEntityEventArgs(session_hook, key, document_deepcopy, dyn)
180+
)
173181
return dyn
174182
else:
175183
object_from_metadata = Utils.import_class(type_from_metadata)
@@ -205,7 +213,8 @@ def convert_to_entity_static(
205213
entity.Id = metadata.get("@id", None)
206214
if session_hook:
207215
session_hook.after_conversion_to_entity_invoke(
208-
AfterConversionToEntityEventArgs(session_hook, key, document_deepcopy, entity))
216+
AfterConversionToEntityEventArgs(session_hook, key, document_deepcopy, entity)
217+
)
209218
return entity
210219

211220
def remove_from_missing(self, entity):

ravendb/tests/jvm_migrated_tests/issues_tests/test_ravenDB_12748.py

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,9 @@ def test_can_correctly_aggregate_ranges(self):
273273
self.assertIsNone(range2.min_)
274274

275275
range1 = list(filter(lambda x: x.range_ == "total < 100" and x.name == "quantity", facet_result.values))[0]
276-
range2 = list(filter(lambda x: x.range_ == "total >= 1500" and x.name == "quantity", facet_result.values))[0]
276+
range2 = list(filter(lambda x: x.range_ == "total >= 1500" and x.name == "quantity", facet_result.values))[
277+
0
278+
]
277279

278280
self.assertEqual(2, range1.count_)
279281
self.assertEqual(1, range2.count_)
@@ -286,23 +288,22 @@ def test_can_correctly_aggregate_ranges(self):
286288
self.assertIsNone(range1.min_)
287289
self.assertIsNone(range2.min_)
288290

289-
290291
with self.store.open_session() as session:
291292
range = RangeBuilder.for_path("total")
292293
r = (
293294
session.query_index("Orders/All", Order)
294-
.aggregate_by(
295+
.aggregate_by(
295296
lambda f: f.by_ranges(
296297
range.is_less_than(100),
297298
range.is_greater_than_or_equal_to(100).is_less_than(500),
298299
range.is_greater_than_or_equal_to(500).is_less_than(1500),
299300
range.is_greater_than_or_equal_to(1500),
300301
)
301-
.sum_on("total", "T1")
302-
.average_on("total", "T1")
303-
.sum_on("quantity", "Q1")
302+
.sum_on("total", "T1")
303+
.average_on("total", "T1")
304+
.sum_on("quantity", "Q1")
304305
)
305-
.execute()
306+
.execute()
306307
)
307308

308309
facet_result = r.get("total")
@@ -340,19 +341,19 @@ def test_can_correctly_aggregate_ranges(self):
340341
range = RangeBuilder.for_path("total")
341342
r = (
342343
session.query_index("Orders/All", Order)
343-
.aggregate_by(
344+
.aggregate_by(
344345
lambda f: f.by_ranges(
345346
range.is_less_than(100),
346347
range.is_greater_than_or_equal_to(100).is_less_than(500),
347348
range.is_greater_than_or_equal_to(500).is_less_than(1500),
348349
range.is_greater_than_or_equal_to(1500),
349350
)
350-
.sum_on("total", "T1")
351-
.sum_on("total", "T2")
352-
.average_on("total", "T2")
353-
.sum_on("quantity", "Q1")
351+
.sum_on("total", "T1")
352+
.sum_on("total", "T2")
353+
.average_on("total", "T2")
354+
.sum_on("quantity", "Q1")
354355
)
355-
.execute()
356+
.execute()
356357
)
357358

358359
facet_result = r.get("total")
@@ -371,26 +372,23 @@ def test_can_correctly_aggregate_ranges(self):
371372
self.assertIsNone(range1.min_)
372373
self.assertIsNone(range2.min_)
373374

374-
375375
range1 = list(filter(lambda x: x.range_ == "total < 100" and x.name == "T2", facet_result.values))[0]
376376
range2 = list(filter(lambda x: x.range_ == "total >= 1500" and x.name == "T2", facet_result.values))[0]
377377

378378
self.assertEqual(2, range1.count_)
379379
self.assertEqual(1, range2.count_)
380380
self.assertEqual(12, range1.sum_)
381381
self.assertEqual(3333, range2.sum_)
382-
self.assertEqual(6,range1.average_)
383-
self.assertEqual(3333,range2.average_)
382+
self.assertEqual(6, range1.average_)
383+
self.assertEqual(3333, range2.average_)
384384
self.assertIsNone(range1.max_)
385385
self.assertIsNone(range2.max_)
386386
self.assertIsNone(range1.min_)
387387
self.assertIsNone(range2.min_)
388388

389-
390389
range1 = list(filter(lambda x: x.range_ == "total < 100" and x.name == "Q1", facet_result.values))[0]
391390
range2 = list(filter(lambda x: x.range_ == "total >= 1500" and x.name == "Q1", facet_result.values))[0]
392391

393-
394392
self.assertEqual(2, range1.count_)
395393
self.assertEqual(1, range2.count_)
396394
self.assertEqual(8, range1.sum_)

0 commit comments

Comments
 (0)