fix metadata validation

Author: Vlad0n20

osf/models/cedar_metadata.py

@@ -5,6 +5,15 @@
 from osf.models.base import BaseModel, ObjectIDMixin
 from osf.utils.datetime_aware_jsonfield import DateTimeAwareJSONField
 
+# Fields generated by the CEDAR server on instance creation — frontend never sends them
+CEDAR_SERVER_GENERATED_FIELDS = frozenset({
+    '@id',
+    'pav:createdOn',
+    'pav:createdBy',
+    'pav:lastUpdatedOn',
+    'oslc:modifiedBy',
+})
+
 
 class CedarMetadataTemplate(ObjectIDMixin, BaseModel):
     schema_name = models.CharField(max_length=255, default=None)
@@ -51,14 +60,20 @@ def get_template_version(self):
 
     def clean(self):
         if self.is_published:
+            schema = dict(self.template.template)
+            if 'required' in schema:
+                schema['required'] = [
+                    f for f in schema['required']
+                    if f not in CEDAR_SERVER_GENERATED_FIELDS
+                ]
+            metadata = {k: v for k, v in self.metadata.items() if v != {}}
             try:
-                jsonschema_validate(self.metadata, self.template.template)
+                jsonschema_validate(metadata, schema)
             except JsonSchemaValidationError as e:
                 raise ValidationError(
                     f'CEDAR metadata does not validate against template "{self.template.schema_name}": {e.message}'
                 )
 
     def save(self, *args, **kwargs):
-        self.clean()
+        super().save(*args, **kwargs)
         self.guid.referent.update_search()
-        return super().save(*args, **kwargs)

osf_tests/test_collection_submission.py

@@ -833,7 +833,8 @@ def test_share_update_cedar_metadata_record(self, unmoderated_collection_submiss
             },
             'identifier': {}
         }
-        with mock.patch('api.share.utils.pls_send_trove_record'):
+        with mock.patch('api.share.utils.pls_send_trove_record'), \
+                mock.patch('api.share.utils.share_update_cedar_metadata_record'):
             record = CedarMetadataRecord.objects.create(
                 guid=unmoderated_collection_submission_public.guid,
                 template=cedar_template,