[ENG-6673] Check and fix api3_and_osf tests, excluding ElasticSearch and SHARE related failures

api_tests/collections/test_views.py

@@ -16,7 +16,7 @@
     AuthUserFactory,
     SubjectFactory,
 )
-from osf.models import Collection
+from osf.models import Collection, VersionedGuidMixin
 from osf.utils.sanitize import strip_html
 from osf.utils.permissions import ADMIN, WRITE, READ
 from website.project.signals import contributor_removed
@@ -3894,10 +3894,14 @@ def url_collection_linked_preprints(self, collection):
 
     @pytest.fixture()
     def id_linked_preprints(self, collection):
-        return list(
-            collection.guid_links.values_list(
-                '_id', flat=True)
-        )
+        res = []
+        for guid in collection.guid_links.all():
+            if guid.is_versioned:
+                for through_item in guid.versions.all():
+                    res.append(f'{guid._id}{VersionedGuidMixin.GUID_VERSION_DELIMITER}{through_item.version}')
+            else:
+                res.append(guid._id)
+        return res
 
     def test_linked_preprints_returns_everything(
             self, app, url_collection_linked_preprints,

api_tests/wb/views/test_wb_hooks.py

@@ -813,6 +813,7 @@ def test_copy_checked_out_file_in_folder(self, app, root_node, user, folder, fol
                 'name': folder_two.name,
             }
         })
+
         res = app.post_json(copy_url, signed_payload, expect_errors=True)
         assert res.status_code == 201
 

osf/management/commands/check_crossref_dois.py

@@ -12,7 +12,7 @@
 import django
 django.setup()
 
-from osf.models import Preprint
+from osf.models import Preprint, VersionedGuidMixin
 
 logger = logging.getLogger(__name__)
 logging.basicConfig(level=logging.INFO)
@@ -82,7 +82,11 @@ def check_crossref_dois(dry_run=True):
 
         for preprint in preprints_response:
             guid = preprint['DOI'].split('/')[-1]
-            pending_preprint = preprints_with_pending_dois.get(guids___id=guid)
+            base_guid, version = guid.split(VersionedGuidMixin.GUID_VERSION_DELIMITER)
+            pending_preprint = preprints_with_pending_dois.get(
+                versioned_guids__guid___id=base_guid,
+                versioned_guids__version=version,
+            )
             if not dry_run:
                 pending_preprint.set_identifier_values(preprint['DOI'], save=True)
             else:

osf_tests/factories.py

@@ -845,7 +845,7 @@ def create_version(cls, create_from, creator=None, final_machine_state='accepted
         auth = Auth(instance.creator)
         instance.set_primary_file(preprint_file, auth=auth, save=True)
         from addons.osfstorage import settings as osfstorage_settings
-        location =  {
+        location = {
             'object': '06d80e',
             'service': 'cloud',
             osfstorage_settings.WATERBUTLER_RESOURCE: 'osf',

osf_tests/management_commands/fixtures/crossref_works_response.json

@@ -50,7 +50,7 @@
 				"crossmark-restriction": false
 			},
 			"abstract": "<p>Mock Abstract</p>",
-			"DOI": "10.31236/FK2osf.io/guid0",
+			"DOI": "10.31236/FK2osf.io/guid0_v1",
 			"type": "posted-content",
 			"created": {
 				"date-parts": [
@@ -105,7 +105,7 @@
 				]
 			},
 			"references-count": 0,
-			"URL": "http://dx.doi.org/10.31236/osf.io/guid0",
+			"URL": "http://dx.doi.org/10.31236/osf.io/guid0_v1",
 			"subtype": "preprint"
 		}],
 		"items-per-page": 20,

osf_tests/management_commands/test_check_crossref_dois.py

@@ -43,7 +43,7 @@ def crossref_response(self):
     @responses.activate
     @mock.patch('osf.models.preprint.update_or_enqueue_on_preprint_updated', mock.Mock())
     def test_check_crossref_dois(self, crossref_response, stuck_preprint, preprint):
-        doi = settings.DOI_FORMAT.format(prefix=stuck_preprint.provider.doi_prefix, guid=stuck_preprint.guids.first()._id)
+        doi = settings.DOI_FORMAT.format(prefix=stuck_preprint.provider.doi_prefix, guid=stuck_preprint._id)
         responses.add(
             responses.Response(
                 responses.GET,

tests/identifiers/test_crossref.py

@@ -165,12 +165,12 @@ def test_crossref_build_metadata_versioned(self, crossref_client, preprint_versi
 
         description = related_item.find('.//{%s}description' % crossref.CROSSREF_RELATIONS)
         assert description is not None
-        assert description.text == "Updated version"
+        assert description.text == 'Updated version'
 
         intra_work_relation = related_item.find('.//{%s}intra_work_relation' % crossref.CROSSREF_RELATIONS)
         assert intra_work_relation is not None
-        assert intra_work_relation.get('relationship-type') == "isVersionOf"
-        assert intra_work_relation.get('identifier-type') == "doi"
+        assert intra_work_relation.get('relationship-type') == 'isVersionOf'
+        assert intra_work_relation.get('identifier-type') == 'doi'
         assert intra_work_relation.text == settings.DOI_FORMAT.format(prefix=preprint.provider.doi_prefix, guid=preprint._id)
 
     @responses.activate