Production update 22/05/01

See merge request fairdata/fairdata-metax!184

src/metax_api/migrations/0049_auto_20220413_0952.py

@@ -0,0 +1,23 @@
+# Generated by Django 3.2.10 on 2022-04-13 06:52
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('metax_api', '0048_organizationstatistics_projectstatistics'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='organizationstatistics',
+            name='byte_size',
+            field=models.BigIntegerField(),
+        ),
+        migrations.AlterField(
+            model_name='projectstatistics',
+            name='byte_size',
+            field=models.BigIntegerField(),
+        ),
+    ]

src/metax_api/models/catalog_record_v2.py

@@ -22,6 +22,7 @@
     generate_uuid_identifier,
     get_identifier_type,
     get_tz_aware_now_without_micros,
+    is_metax_generated_doi_identifier,
 )
 
 from .catalog_record import (
@@ -303,9 +304,10 @@ def publish_dataset(self, pid_type=None):
 
             self._validate_cr_against_datacite_schema()
 
-            self.add_post_request_callable(
-                DataciteDOIUpdate(self, self.research_dataset["preferred_identifier"], "create")
-            )
+            if is_metax_generated_doi_identifier(self.research_dataset.get("preferred_identifier")):
+                self.add_post_request_callable(
+                    DataciteDOIUpdate(self, self.research_dataset["preferred_identifier"], "create")
+                )
 
         if self._dataset_has_rems_managed_access() and settings.REMS["ENABLED"]:
             self._pre_rems_creation()

src/metax_api/models/organization_statistics.py

@@ -14,5 +14,5 @@
 class OrganizationStatistics(models.Model):
 	organization = models.CharField(primary_key=True, max_length=200)
 	count = models.IntegerField()
-	byte_size = models.IntegerField()
+	byte_size = models.BigIntegerField()
 

src/metax_api/models/project_statistics.py

@@ -14,5 +14,5 @@
 class ProjectStatistics(models.Model):
 	project_identifier = models.CharField(primary_key=True, max_length=200)
 	count = models.IntegerField()
-	byte_size = models.IntegerField()
+	byte_size = models.BigIntegerField()
 	published_datasets = models.TextField()

src/metax_api/tests/api/rest/v2/views/datasets/write.py

@@ -235,6 +235,21 @@ def test_create_catalog_record_using_pid_type(self):
             response.data["research_dataset"]["preferred_identifier"].startswith("urn:")
         )
 
+    def test_create_catalog_record_with_existing_pid_to_harvested_catalog(self):
+        """
+        Test creating a catalog record which already has a pid to a harvested catalog.
+        API should return 201 and the pid that is returned should be the same as the one that was sent.
+        """
+        self.cr_test_data["research_dataset"]["preferred_identifier"] = "doi:10.1234/abcd"
+        self.cr_test_data["data_catalog"] = 3
+        response = self.client.post("/rest/v2/datasets", self.cr_test_data, format="json")
+        self.assertEqual(response.status_code, 201)
+        self.assertEqual(
+            self.cr_test_data["research_dataset"]["preferred_identifier"],
+            response.data["research_dataset"]["preferred_identifier"],
+            "in harvested catalogs, the service user is allowed to set preferred_identifier",
+        )
+
 
 class CatalogRecordApiWriteIdentifierUniqueness(CatalogRecordApiWriteCommon):
     """