MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix broken object creation in load_test_data command

This commit is contained in:
Eliot Berriot 2019-07-09 15:09:36 +02:00
parent ce4f51197c
commit e11c1dfe29
No known key found for this signature in database
GPG Key ID: DD6965E2476E5C27
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
api/funkwhale_api/common/management/commands/load_test_data.py
View File

@ -51,7 +51,7 @@ def create_tagged_tracks(factories, count, dependencies):
objs = [] objs = []
for track in dependencies["tracks"]: for track in dependencies["tracks"]:
tag = random.choice(dependencies["tags"]) tag = random.choice(dependencies["tags"])
objs.append(factories["tags.TaggedItem"](content_object=track, tag=tag)) objs.append(factories["tags.TaggedItem"].build(content_object=track, tag=tag))
return tags_models.TaggedItem.objects.bulk_create( return tags_models.TaggedItem.objects.bulk_create(
objs, batch_size=BATCH_SIZE, ignore_conflicts=True objs, batch_size=BATCH_SIZE, ignore_conflicts=True
@ -217,27 +217,24 @@ class Command(BaseCommand):
if not count: if not count:
return [] return []
dependencies = row.get("depends_on", []) dependencies = row.get("depends_on", [])
dependencies_results = {}
create_dependencies = options.get("create_dependencies") create_dependencies = options.get("create_dependencies")
for dependency in dependencies: for dependency in dependencies:
if not create_dependencies:
continue
dep_count = options.get(dependency["id"]) dep_count = options.get(dependency["id"])
if not create_dependencies and dep_count is None:
continue
if dep_count is None: if dep_count is None:
factor = options[ factor = options[
"{}_{}_factor".format(row["id"], dependency["field"]) "{}_{}_factor".format(row["id"], dependency["field"])
] or dependency.get("default_factor") ] or dependency.get("default_factor")
dep_count = math.ceil(factor * count) dep_count = math.ceil(factor * count)
dependencies_results[dependency["id"]] = self.create_batch( results[dependency["id"]] = self.create_batch(
CONFIG_BY_ID[dependency["id"]], results, options, count=dep_count CONFIG_BY_ID[dependency["id"]], results, options, count=dep_count
) )
self.stdout.write("Creating {} {}…".format(count, row["id"])) self.stdout.write("Creating {} {}…".format(count, row["id"]))
handler = row.get("handler") handler = row.get("handler")
if handler: if handler:
objects = handler( objects = handler(factories.registry, count, dependencies=results)
factories.registry, count, dependencies=dependencies_results
)
else: else:
objects = create_objects( objects = create_objects(
row, factories.registry, count, **row.get("factory_kwargs", {}) row, factories.registry, count, **row.get("factory_kwargs", {})
@ -246,7 +243,7 @@ class Command(BaseCommand):
if not dependency.get("set", True): if not dependency.get("set", True):
continue continue
if create_dependencies: if create_dependencies:
candidates = dependencies_results[dependency["id"]] candidates = results[dependency["id"]]
else: else:
# we use existing objects in the database # we use existing objects in the database
queryset = dependency.get( queryset = dependency.get(