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

Correctly look up books by remote/origin id

This commit is contained in:
Mouse Reeve 2020-11-28 18:11:52 -08:00
parent dfd730757d
commit b4fe9f160f
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
bookwyrm/activitypub/base_activity.py
View File

@ -91,10 +91,7 @@ class ActivityObject:
# check for an existing instance, if we're not updating a known obj # check for an existing instance, if we're not updating a known obj
if not instance: if not instance:
try: instance = find_existing_by_remote_id(model, self.id)
return model.objects.get(remote_id=self.id)
except model.DoesNotExist:
pass
model_fields = [m.name for m in model._meta.get_fields()] model_fields = [m.name for m in model._meta.get_fields()]
mapped_fields = {} mapped_fields = {}
@ -123,8 +120,9 @@ class ActivityObject:
formatted_value = date_value formatted_value = date_value
except (ParserError, TypeError): except (ParserError, TypeError):
formatted_value = None formatted_value = None
elif isinstance(model_field, ForwardManyToOneDescriptor) and \ elif isinstance(model_field, ForwardManyToOneDescriptor):
formatted_value: if not formatted_value:
continue
# foreign key remote id reolver (work on Edition, for example) # foreign key remote id reolver (work on Edition, for example)
fk_model = model_field.field.related_model fk_model = model_field.field.related_model
if isinstance(formatted_value, dict) and \ if isinstance(formatted_value, dict) and \
@ -158,9 +156,6 @@ class ActivityObject:
else: else:
# creating a new model instance # creating a new model instance
instance = model.objects.create(**mapped_fields) instance = model.objects.create(**mapped_fields)
print('CREATING')
print(instance)
print(instance.id)
# --- these are all fields that can't be saved until after the # --- these are all fields that can't be saved until after the
# instance has an id (after it's been saved). ---------------# # instance has an id (after it's been saved). ---------------#
@ -203,7 +198,6 @@ class ActivityObject:
model = model_field.model model = model_field.model
for item in values: for item in values:
if isinstance(item, str): if isinstance(item, str):
print(model)
item = resolve_remote_id(model, item) item = resolve_remote_id(model, item)
else: else:
item = model.activity_serializer(**item) item = model.activity_serializer(**item)
@ -222,8 +216,8 @@ class ActivityObject:
return data return data
def resolve_remote_id(model, remote_id, refresh=False): def find_existing_by_remote_id(model, remote_id):
''' look up the remote_id in the database or load it remotely ''' ''' check for an existing instance of this id in the db '''
objects = model.objects objects = model.objects
if hasattr(model.objects, 'select_subclasses'): if hasattr(model.objects, 'select_subclasses'):
objects = objects.select_subclasses() objects = objects.select_subclasses()
@ -232,10 +226,17 @@ def resolve_remote_id(model, remote_id, refresh=False):
result = objects.filter( result = objects.filter(
remote_id=remote_id remote_id=remote_id
).first() ).first()
if not result and hasattr(model, 'origin_id'): if not result and hasattr(model, 'origin_id'):
result = objects.filter( result = objects.filter(
origin_id=remote_id origin_id=remote_id
).first() ).first()
return result
def resolve_remote_id(model, remote_id, refresh=False):
''' look up the remote_id in the database or load it remotely '''
result = find_existing_by_remote_id(model, remote_id)
if result and not refresh: if result and not refresh:
return result return result