Merge branch 'hotfix/25.07.1'

Author: mfraezz

api/crossref/views.py

@@ -9,6 +9,7 @@
 from framework.auth.views import mails
 from osf.models import Preprint
 from website import settings
+from website.preprints.tasks import mint_doi_on_crossref_fail
 
 logger = logging.getLogger(__name__)
 
@@ -66,8 +67,7 @@ def post(self, request):
                 elif record.get('status').lower() == 'failure':
                     if 'Relation target DOI does not exist' in record.find('msg').text:
                         logger.warning('Related publication DOI does not exist, sending metadata again without it...')
-                        client = preprint.get_doi_client()
-                        client.create_identifier(preprint, category='doi', include_relation=False)
+                        mint_doi_on_crossref_fail.apply_async(kwargs={'preprint_id': preprint._id})
                     # This error occurs when a single preprint is being updated several times in a row with the same metadata [#PLAT-944]
                     elif 'less or equal to previously submitted version' in record.find('msg').text and record_count == 2:
                         break
@@ -78,12 +78,13 @@ def post(self, request):
         if dois_processed != record_count or status != 'completed':
             if unexpected_errors:
                 batch_id = crossref_email_content.find('batch_id').text
+                email_error_text = request.POST['body-plain']
                 mails.send_mail(
                     to_addr=settings.OSF_SUPPORT_EMAIL,
                     mail=mails.CROSSREF_ERROR,
                     batch_id=batch_id,
-                    email_content=request.POST['body-plain'],
+                    email_content=email_error_text,
                 )
-                logger.error(f'Error submitting metadata for batch_id {batch_id} with CrossRef, email sent to help desk')
+                logger.error(f'Error submitting metadata for batch_id {batch_id} with CrossRef, email sent to help desk: {email_error_text}')
 
         return HttpResponse('Mail received', status=200)

website/identifiers/clients/crossref.py

@@ -140,13 +140,19 @@ def build_posted_content(self, preprint, element, include_relation):
             for preprint_version, previous_version in zip(preprint_versions, preprint_versions[1:]):
                 if preprint_version.version > preprint.version:
                     continue
+
+                minted_doi = previous_version.get_identifier_value('doi')
+                if not minted_doi:
+                    previous_doi = self.build_doi(previous_version)
+
                 related_item = element.related_item(
                     element.intra_work_relation(
-                        self.build_doi(previous_version),
+                        minted_doi or previous_doi,
                         **{'relationship-type': 'isVersionOf', 'identifier-type': 'doi'}
                     )
                 )
                 relations_program.append(related_item)
+
         if len(relations_program) > 0:
             posted_content.append(relations_program)
 

website/preprints/tasks.py

@@ -6,6 +6,7 @@
 from framework.postcommit_tasks.handlers import enqueue_postcommit_task, get_task_from_postcommit_queue
 
 
+CROSSREF_FAIL_RETRY_DELAY = 12 * 60 * 60
 logger = logging.getLogger(__name__)
 
 
@@ -62,3 +63,24 @@ def update_or_enqueue_on_preprint_updated(preprint_id, saved_fields=None):
             },
             celery=True
         )
+
+
+@celery_app.task(bind=True, acks_late=True, max_retries=5, default_retry_delay=CROSSREF_FAIL_RETRY_DELAY)
+def mint_doi_on_crossref_fail(self, preprint_id):
+    from osf.models import Preprint
+    preprint = Preprint.load(preprint_id)
+    existing_versions_without_minted_doi = Preprint.objects.filter(
+        versioned_guids__guid=preprint.versioned_guids.first().guid,
+        versioned_guids__version__lt=preprint.versioned_guids.first().version,
+        preprint_doi_created__isnull=True
+    ).exclude(id=preprint.id)
+    if existing_versions_without_minted_doi:
+        logger.error(
+            f'There are existing preprint versions for preprint with guid {preprint._id} that are missing DOIs. Versions: '
+            f'{list(existing_versions_without_minted_doi.values_list('versioned_guids__version', flat=True))}'
+        )
+        self.retry()
+    else:
+        crossref_client = preprint.get_doi_client()
+        if crossref_client:
+            crossref_client.create_identifier(preprint, category='doi', include_relation=False)