Skip to content

Commit ec8fb9f

Browse files
enqueue cedar record update in share
1 parent f52c484 commit ec8fb9f

2 files changed

Lines changed: 18 additions & 6 deletions

File tree

api/share/utils.py

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,14 @@ def _enqueue_update_share(osfresource):
6767

6868

6969
@celery_app.task()
70-
def share_update_cedar_metadata_record(osf_obj_guid, cedar_record):
71-
referent = osf_obj_guid.referent
70+
def share_update_cedar_metadata_record(guid_id, cedar_record_pk):
71+
from osf.models import CedarMetadataRecord, Guid
72+
73+
guid = Guid.load(guid_id)
74+
referent = guid.referent
75+
cedar_record = CedarMetadataRecord.objects.filter(pk=cedar_record_pk).first()
76+
if not cedar_record:
77+
return
7278

7379
graph = Graph()
7480
full_metadata = {
@@ -93,8 +99,14 @@ def share_update_cedar_metadata_record(osf_obj_guid, cedar_record):
9399

94100

95101
@celery_app.task()
96-
def share_delete_cedar_metadata_record(osf_obj_guid, cedar_record):
97-
referent = osf_obj_guid.referent
102+
def share_delete_cedar_metadata_record(guid_id, cedar_record_pk):
103+
from osf.models import CedarMetadataRecord, Guid
104+
105+
guid = Guid.load(guid_id)
106+
referent = guid.referent
107+
cedar_record = CedarMetadataRecord.objects.filter(pk=cedar_record_pk).first()
108+
if not cedar_record:
109+
return
98110

99111
requests.delete(
100112
shtrove_ingest_url(),

osf/models/collection_submission.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -470,12 +470,12 @@ def update_search(self):
470470
is_published=True,
471471
template__should_index_for_search=True
472472
):
473-
enqueue_task(share_update_cedar_metadata_record.s(self.guid, cedar_record))
473+
enqueue_task(share_update_cedar_metadata_record.s(self.guid._id, cedar_record.pk))
474474

475475
for cedar_record in self.guid.cedar_metadata_records.filter(
476476
models.Q(is_published=False) | models.Q(template__should_index_for_search=True)
477477
):
478-
enqueue_task(share_delete_cedar_metadata_record.s(self.guid, cedar_record))
478+
enqueue_task(share_delete_cedar_metadata_record.s(self.guid._id, cedar_record.pk))
479479

480480
try:
481481
update_collected_metadata(self.guid._id, collection_id=self.collection.id)

0 commit comments

Comments
 (0)