yul
/
bookwyrm-mastodon
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixes celery tasks expanding data not setting many to many fields

This commit is contained in:
Mouse Reeve 2020-12-23 12:45:40 -08:00
parent e7e90360b3
commit a3df0847e1
2 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
bookwyrm/activitypub/base_activity.py
View File

@ -111,15 +111,10 @@ class ActivityObject:
continue continue
model_field = getattr(model, model_field_name) model_field = getattr(model, model_field_name)
try: # creating a Work, model_field is 'editions'
# this is for one to many # creating a User, model field is 'key_pair'
related_model = model_field.field.model related_model = model_field.field.model
related_field_name = model_field.field.name related_field_name = model_field.field.activitypub_field
except AttributeError:
# it's a one to one or foreign key
related_model = model_field.related.related_model
related_field_name = model_field.related.related_name
values = [values]
for item in values: for item in values:
set_related_field.delay( set_related_field.delay(
@ -153,23 +148,24 @@ def set_related_field(
with transaction.atomic(): with transaction.atomic():
if isinstance(data, str): if isinstance(data, str):
item = resolve_remote_id(model, data, save=False) existing = model.find_existing_by_remote_id(data)
if existing:
data = existing.to_activity()
else: else:
# look for a match based on all the available data data = get_data(data)
item = model.find_existing(data) activity = model.activity_serializer(**data)
if not item:
# create a new model instance
item = model.activity_serializer(**data)
item = item.to_model(model, save=False)
# this must exist because it's the object that triggered this function # this must exist because it's the object that triggered this function
instance = origin_model.find_existing_by_remote_id(related_remote_id) instance = origin_model.find_existing_by_remote_id(related_remote_id)
if not instance: if not instance:
raise ValueError( raise ValueError(
'Invalid related remote id: %s' % related_remote_id) 'Invalid related remote id: %s' % related_remote_id)
# edition.parent_work = instance, for example # set the origin's remote id on the activity so it will be there when
setattr(item, related_field_name, instance) # the model instance is created
item.save() # edition.parentWork = instance, for example
setattr(activity, related_field_name, instance.remote_id)
activity.to_model(model)
def resolve_remote_id(model, remote_id, refresh=False, save=True): def resolve_remote_id(model, remote_id, refresh=False, save=True):

2
bookwyrm/models/book.py
View File

@ -59,9 +59,7 @@ class Book(BookDataModel):
subject_places = fields.ArrayField( subject_places = fields.ArrayField(
models.CharField(max_length=255), blank=True, null=True, default=list models.CharField(max_length=255), blank=True, null=True, default=list
) )
# TODO: include an annotation about the type of authorship (ie, translator)
authors = fields.ManyToManyField('Author') authors = fields.ManyToManyField('Author')
# preformatted authorship string for search and easier display
cover = fields.ImageField( cover = fields.ImageField(
upload_to='covers/', blank=True, null=True, alt_field='alt_text') upload_to='covers/', blank=True, null=True, alt_field='alt_text')
first_published_date = fields.DateTimeField(blank=True, null=True) first_published_date = fields.DateTimeField(blank=True, null=True)