Merge branch 'develop' into upstream/pbs-25-19

brianjgeiger · brianjgeiger · commit 18ba62f42e3d · 2025-10-01T14:18:05.000-04:00
diff --git a/api/users/serializers.py b/api/users/serializers.py
@@ -280,9 +280,9 @@ def update(self, instance, validated_data):
         try:
             instance.save()
         except ValidationValueError as e:
-            raise InvalidModelValueError(detail=e.message)
+            raise InvalidModelValueError(detail=str(e))
         except ValidationError as e:
-            raise InvalidModelValueError(e)
+            raise InvalidModelValueError(detail=str(e))
         if set(validated_data.keys()).intersection(set(OSFUser.SPAM_USER_PROFILE_FIELDS.keys())):
             request_headers = string_type_request_headers(self.context['request'])
             instance.check_spam(saved_fields=validated_data, request_headers=request_headers)
diff --git a/osf/metadata/serializers/google_dataset_json_ld.py b/osf/metadata/serializers/google_dataset_json_ld.py
@@ -79,9 +79,9 @@ def format_creators(basket):
     for creator_iri in basket[DCTERMS.creator]:
         creator_data.append({
             '@type': 'Person',
-            'name': next(basket[creator_iri:FOAF.name]),
-            'givenName': next(basket[creator_iri:FOAF.givenName]),
-            'familyName': next(basket[creator_iri:FOAF.familyName]),
+            'name': next(basket[creator_iri:FOAF.name], None),
+            'givenName': next(basket[creator_iri:FOAF.givenName], None),
+            'familyName': next(basket[creator_iri:FOAF.familyName], None),
         })
     return creator_data
 
diff --git a/osf_tests/metadata/expected_metadata_files/file_basic.datacite.json b/osf_tests/metadata/expected_metadata_files/file_basic.datacite.json
@@ -21,7 +21,7 @@
   "creators": [
     {
       "creatorName": {
-        "creatorName": "Person McNamington",
+        "creatorName": "PersonMcNamington",
         "nameType": "Personal"
       },
       "nameIdentifier": {
@@ -83,4 +83,4 @@
       "title": "my-file.blarg"
     }
   ]
-}
+}
diff --git a/osf_tests/metadata/expected_metadata_files/file_basic.datacite.xml b/osf_tests/metadata/expected_metadata_files/file_basic.datacite.xml
@@ -3,7 +3,7 @@
   <identifier identifierType="URL">http://localhost:5000/w3ibb</identifier>
   <creators>
     <creator>
-      <creatorName nameType="Personal">Person McNamington</creatorName>
+      <creatorName nameType="Personal">PersonMcNamington</creatorName>
       <nameIdentifier nameIdentifierScheme="URL">http://localhost:5000/w1ibb</nameIdentifier>
     </creator>
   </creators>
diff --git a/osf_tests/metadata/expected_metadata_files/file_basic.turtle b/osf_tests/metadata/expected_metadata_files/file_basic.turtle
@@ -41,9 +41,8 @@
 <http://localhost:5000/w1ibb> a dcterms:Agent,
         foaf:Person ;
     dcterms:identifier "http://localhost:5000/w1ibb" ;
-    foaf:givenName "Person" ;
-    foaf:familyName "McNamington" ;
-    foaf:name "Person McNamington" .
+    foaf:givenName "PersonMcNamington" ;
+    foaf:name "PersonMcNamington" .
 
 <http://localhost:5000> a dcterms:Agent,
         foaf:Organization ;
diff --git a/osf_tests/metadata/expected_metadata_files/preprint_basic.datacite.json b/osf_tests/metadata/expected_metadata_files/preprint_basic.datacite.json
@@ -21,7 +21,7 @@
   "creators": [
     {
       "creatorName": {
-        "creatorName": "Person McNamington",
+        "creatorName": "PersonMcNamington",
         "nameType": "Personal"
       },
       "nameIdentifier": {
@@ -120,4 +120,4 @@
       "title": "this is a preprint title!"
     }
   ]
-}
+}
diff --git a/osf_tests/metadata/expected_metadata_files/preprint_basic.datacite.xml b/osf_tests/metadata/expected_metadata_files/preprint_basic.datacite.xml
@@ -3,7 +3,7 @@
   <identifier identifierType="DOI">11.pp/FK2osf.io/w4ibb_v1</identifier>
   <creators>
     <creator>
-      <creatorName nameType="Personal">Person McNamington</creatorName>
+      <creatorName nameType="Personal">PersonMcNamington</creatorName>
       <nameIdentifier nameIdentifierScheme="URL">http://localhost:5000/w1ibb</nameIdentifier>
     </creator>
   </creators>
diff --git a/osf_tests/metadata/expected_metadata_files/preprint_basic.google-dataset.json b/osf_tests/metadata/expected_metadata_files/preprint_basic.google-dataset.json
@@ -4,9 +4,9 @@
   "creator": [
     {
       "@type": "Person",
-      "familyName": "McNamington",
-      "givenName": "Person",
-      "name": "Person McNamington"
+      "familyName": null,
+      "givenName": "PersonMcNamington",
+      "name": "PersonMcNamington"
     }
   ],
   "dateCreated": "2123-05-04",
@@ -24,4 +24,4 @@
     "name": "Center For Open Science"
   },
   "url": "http://localhost:5000/w4ibb"
-}
+}
diff --git a/osf_tests/metadata/expected_metadata_files/preprint_basic.turtle b/osf_tests/metadata/expected_metadata_files/preprint_basic.turtle
@@ -75,9 +75,8 @@
 <http://localhost:5000/w1ibb> a dcterms:Agent,
         foaf:Person ;
     dcterms:identifier "http://localhost:5000/w1ibb" ;
-    foaf:givenName "Person" ;
-    foaf:familyName "McNamington" ;
-    foaf:name "Person McNamington" .
+    foaf:givenName "PersonMcNamington" ;
+    foaf:name "PersonMcNamington" .
 
 <http://localhost:8000/v2/providers/preprints/preprovi/subjects/> a skos:ConceptScheme ;
     dcterms:title "preprovi" .
diff --git a/osf_tests/metadata/expected_metadata_files/project_basic.datacite.json b/osf_tests/metadata/expected_metadata_files/project_basic.datacite.json
@@ -21,7 +21,7 @@
   "creators": [
     {
       "creatorName": {
-        "creatorName": "Person McNamington",
+        "creatorName": "PersonMcNamington",
         "nameType": "Personal"
       },
       "nameIdentifier": {
@@ -118,4 +118,4 @@
       "title": "this is a project title!"
     }
   ]
-}
+}
diff --git a/osf_tests/metadata/expected_metadata_files/project_basic.datacite.xml b/osf_tests/metadata/expected_metadata_files/project_basic.datacite.xml
@@ -3,7 +3,7 @@
   <identifier identifierType="DOI">10.70102/FK2osf.io/w2ibb</identifier>
   <creators>
     <creator>
-      <creatorName nameType="Personal">Person McNamington</creatorName>
+      <creatorName nameType="Personal">PersonMcNamington</creatorName>
       <nameIdentifier nameIdentifierScheme="URL">http://localhost:5000/w1ibb</nameIdentifier>
     </creator>
   </creators>
diff --git a/osf_tests/metadata/expected_metadata_files/project_basic.google-dataset.json b/osf_tests/metadata/expected_metadata_files/project_basic.google-dataset.json
@@ -4,9 +4,9 @@
   "creator": [
     {
       "@type": "Person",
-      "familyName": "McNamington",
-      "givenName": "Person",
-      "name": "Person McNamington"
+      "familyName": null,
+      "givenName": "PersonMcNamington",
+      "name": "PersonMcNamington"
     }
   ],
   "dateCreated": "2123-05-04",
@@ -32,4 +32,4 @@
     "name": "Center For Open Science"
   },
   "url": "http://localhost:5000/w2ibb"
-}
+}
diff --git a/osf_tests/metadata/expected_metadata_files/project_basic.turtle b/osf_tests/metadata/expected_metadata_files/project_basic.turtle
@@ -94,9 +94,8 @@
 <http://localhost:5000/w1ibb> a dcterms:Agent,
         foaf:Person ;
     dcterms:identifier "http://localhost:5000/w1ibb" ;
-    foaf:givenName "Person" ;
-    foaf:familyName "McNamington" ;
-    foaf:name "Person McNamington" .
+    foaf:givenName "PersonMcNamington" ;
+    foaf:name "PersonMcNamington" .
 
 <http://localhost:5000> a dcterms:Agent,
         foaf:Organization ;
diff --git a/osf_tests/metadata/expected_metadata_files/registration_basic.datacite.json b/osf_tests/metadata/expected_metadata_files/registration_basic.datacite.json
@@ -21,7 +21,7 @@
   "creators": [
     {
       "creatorName": {
-        "creatorName": "Person McNamington",
+        "creatorName": "PersonMcNamington",
         "nameType": "Personal"
       },
       "nameIdentifier": {
@@ -92,4 +92,4 @@
       "title": "this is a project title!"
     }
   ]
-}
+}
diff --git a/osf_tests/metadata/expected_metadata_files/registration_basic.datacite.xml b/osf_tests/metadata/expected_metadata_files/registration_basic.datacite.xml
@@ -3,7 +3,7 @@
   <identifier identifierType="URL">http://localhost:5000/w5ibb</identifier>
   <creators>
     <creator>
-      <creatorName nameType="Personal">Person McNamington</creatorName>
+      <creatorName nameType="Personal">PersonMcNamington</creatorName>
       <nameIdentifier nameIdentifierScheme="URL">http://localhost:5000/w1ibb</nameIdentifier>
     </creator>
   </creators>
diff --git a/osf_tests/metadata/expected_metadata_files/registration_basic.google-dataset.json b/osf_tests/metadata/expected_metadata_files/registration_basic.google-dataset.json
@@ -4,9 +4,9 @@
   "creator": [
     {
       "@type": "Person",
-      "familyName": "McNamington",
-      "givenName": "Person",
-      "name": "Person McNamington"
+      "familyName": null,
+      "givenName": "PersonMcNamington",
+      "name": "PersonMcNamington"
     }
   ],
   "dateCreated": "2123-05-04",
@@ -38,4 +38,4 @@
     "name": "Center For Open Science"
   },
   "url": "http://localhost:5000/w5ibb"
-}
+}
diff --git a/osf_tests/metadata/expected_metadata_files/registration_basic.turtle b/osf_tests/metadata/expected_metadata_files/registration_basic.turtle
@@ -77,9 +77,8 @@
 <http://localhost:5000/w1ibb> a dcterms:Agent,
         foaf:Person ;
     dcterms:identifier "http://localhost:5000/w1ibb" ;
-    foaf:givenName "Person" ;
-    foaf:familyName "McNamington" ;
-    foaf:name "Person McNamington" .
+    foaf:givenName "PersonMcNamington" ;
+    foaf:name "PersonMcNamington" .
 
 <http://localhost:5000> a dcterms:Agent,
         foaf:Organization ;
diff --git a/osf_tests/metadata/expected_metadata_files/user_basic.turtle b/osf_tests/metadata/expected_metadata_files/user_basic.turtle
@@ -6,6 +6,5 @@
         foaf:Person ;
     dcat:accessService <http://localhost:5000> ;
     dcterms:identifier "http://localhost:5000/w1ibb" ;
-    foaf:givenName "Person" ;
-    foaf:familyName "McNamington" ;
-    foaf:name "Person McNamington" .
+    foaf:givenName "PersonMcNamington" ;
+    foaf:name "PersonMcNamington" .
diff --git a/osf_tests/metadata/test_serialized_metadata.py b/osf_tests/metadata/test_serialized_metadata.py
@@ -194,7 +194,7 @@ def setUp(self):
             self.enterContext(patcher)
         # build test objects
         self.user = factories.AuthUserFactory(
-            fullname='Person McNamington',
+            fullname='PersonMcNamington',  # note: will be copied to given_name, family_name left blank
         )
         self.project = factories.ProjectFactory(
             is_public=True,
@@ -305,6 +305,10 @@ def setUp(self):
         }
 
     def _setUp_full(self):
+        self.user.fullname = 'Person McNamington'
+        self.user.given_name = 'Person'
+        self.user.family_name = 'McNamington'
+        self.user.save()
         self.metadata_record = osfdb.GuidMetadataRecord.objects.for_guid(self.project._id)
         self.metadata_record.update({
             'language': 'en',
@@ -389,7 +393,8 @@ def _assert_expected_file(self, filename, actual_metadata):
             # TODO: stable turtle serializer (or another primitive rdf serialization)
             self._assert_equivalent_turtle(actual_metadata, _expected_metadata, filename)
         else:
-            self.assertEqual(actual_metadata, _expected_metadata)
+            # note: ignore trailing spaces
+            self.assertEqual(actual_metadata.rstrip(), _expected_metadata.rstrip())
 
     def _assert_equivalent_turtle(self, actual_turtle, expected_turtle, filename):
         _actual = rdflib.Graph()

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`"creators": [`
`22`	`22`	`{`
`23`	`23`	`"creatorName": {`
`24`		`- "creatorName": "Person McNamington",`
	`24`	`+ "creatorName": "PersonMcNamington",`
`25`	`25`	`"nameType": "Personal"`
`26`	`26`	`},`
`27`	`27`	`"nameIdentifier": {`
`@@ -83,4 +83,4 @@`
`83`	`83`	`"title": "my-file.blarg"`
`84`	`84`	`}`
`85`	`85`	`]`
`86`		`-}`
	`86`	`+}`