@@ -308,16 +308,15 @@ def create_model(self):
308308 array_models = []
309309 for item in v :
310310 embedded_str_model = StringEmbeddedModel (** item )
311- embedded_str_model .unique_id = ObjectId ()
311+ embedded_str_model .unique_field = str ( ObjectId () )
312312 array_models .append (embedded_str_model )
313313 setattr (model , k , array_models )
314314 elif "str" in k :
315315 embedded_str_model = StringEmbeddedModel (** v )
316- embedded_str_model .unique_id = ObjectId ()
316+ embedded_str_model .unique_field = str ( ObjectId () )
317317 setattr (model , k , embedded_str_model )
318318 else :
319319 embedded_int_model = IntegerEmbeddedModel (** v )
320- embedded_int_model .unique_id = ObjectId ()
321320 setattr (model , k , embedded_int_model )
322321 model .save ()
323322
@@ -353,12 +352,12 @@ def setUp(self):
353352 super ().setUp ()
354353 self .create_model ()
355354 self .ids = [
356- model .embedded_str_doc_1 .unique_id for model in list (LargeNestedModel .objects .all ())
355+ model .embedded_str_doc_1 .unique_field for model in list (LargeNestedModel .objects .all ())
357356 ]
358357
359358 def do_task (self ):
360359 for _id in self .ids :
361- list (LargeNestedModel .objects .filter (embedded_str_doc_1__unique_id = _id ))
360+ list (LargeNestedModel .objects .filter (embedded_str_doc_1__id = _id ))
362361
363362 def tearDown (self ):
364363 super ().tearDown ()
@@ -370,13 +369,13 @@ def setUp(self):
370369 super ().setUp ()
371370 self .create_model ()
372371 self .ids = [
373- model .embedded_str_doc_array [0 ].unique_id
372+ model .embedded_str_doc_array [0 ].id
374373 for model in list (LargeNestedModel .objects .all ())
375374 ]
376375
377376 def do_task (self ):
378377 for _id in self .ids :
379- list (LargeNestedModel .objects .filter (embedded_str_doc_array__unique_id__in = [_id ]))
378+ list (LargeNestedModel .objects .filter (embedded_str_doc_array__id__in = [_id ]))
380379
381380 def tearDown (self ):
382381 super ().tearDown ()
@@ -429,16 +428,10 @@ def tearDown(self):
429428class TestLargeFlatDocFilterPkByIn (LargeFlatDocTest , unittest .TestCase ):
430429 def setUp (self ):
431430 super ().setUp ()
432- # LargeFlatModel.objects.all().delete()
433- # self.ids = []
434- # models = []
435- # # self.fields = [str(ObjectId()) for _ in range(NUM_DOCS // 10)]
436- # for doc in self.documents:
437- # models.append(LargeFlatModel(**doc))
438- # # for model in models:
439- # # model.field1 = self.fields[random.randint(0, len(self.fields) - 1)]
440- #
441- # LargeFlatModel.objects.bulk_create(models)
431+ models = []
432+ for doc in self .documents :
433+ models .append (LargeFlatModel (** doc ))
434+ LargeFlatModel .objects .bulk_create (models )
442435 self .id = LargeFlatModel .objects .first ().id
443436 print (LargeFlatModel .objects .filter (id__in = [self .id ]).explain ())
444437
@@ -447,4 +440,4 @@ def do_task(self):
447440
448441 def tearDown (self ):
449442 super ().tearDown ()
450- # LargeFlatModel.objects.all().delete()
443+ LargeFlatModel .objects .all ().delete ()
0 commit comments