Code review

DiSSCo · Jul 1, 2024 · 4f70c76 · 4f70c76
1 parent e8f2d9c
commit 4f70c76
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 15 deletions.
diff --git a/data-model/fdo-type/annotation/0.3.0/examples/approved-annotation-example.json b/data-model/fdo-type/annotation/0.3.0/examples/approved-annotation-example.json
@@ -5,7 +5,7 @@
   "ods:status": "ods:Active",
   "rdf:type": "ods:Annotation",
   "ods:version": 1,
-  "oa:motivation": "oa:commenting",
+  "oa:motivation": "oa:editing",
   "oa:hasTarget": {
     "@id": "https://hdl.handle.net/20.5000.1025/XYZ-XYZ-XYZ",
     "@type": "ods:DigitalSpecimen",
@@ -24,8 +24,8 @@
   },
   "dcterms:creator": {
     "@id": "https://orcid.org/0000-0002-5669-2769",
-    "@type": "foaf:Person",
-    "foaf:name": "John Doe"
+    "@type": "schema:Person",
+    "schema:name": "John Doe"
   },
   "dcterms:created": "2024-06-27T12:00:00Z",
   "as:generator": {
@@ -35,7 +35,7 @@
   },
   "dcterms:issued": "2024-06-27T12:00:00Z",
   "ods:batchID": "batch-1234",
-  "ods:annotationStatus": "ods:Approved",
+  "ods:mergingDecisionStatus": "ods:Approved",
   "ods:mergingStateChangeDate": "2024-06-28T12:00:00Z",
   "ods:MergingStateChangedBy": {
     "@id": "https://orcid.org/0000-0002-5669-2769",

diff --git a/data-model/fdo-type/annotation/0.3.0/examples/tombstoned-annotation.json b/data-model/fdo-type/annotation/0.3.0/examples/tombstoned-annotation.json
@@ -39,7 +39,7 @@
   "ods:TombstoneMetadata": {
     "@type": "ods:Tombstone",
     "ods:tombstonedDate": "2023-06-15T14:30:00Z",
-    "ods:tombstonedReason": "This object was made by mistake",
+    "ods:tombstonedText": "This object was made by mistake",
     "ods:TombstonedByAgent": {
       "@id": "https://orcid.org/0000-0002-5669-2769",
       "@type": "schema:Person",

diff --git a/data-model/fdo-type/annotation/0.3.0/schema/annotation.json b/data-model/fdo-type/annotation/0.3.0/schema/annotation.json
@@ -324,11 +324,11 @@
       "type": "string",
       "description": "Internally generated PID to identify the batch the annotation was generated by"
     },
-    "ods:mergingStatus": {
+    "ods:mergingDecisionStatus": {
       "enum": [
-        "ods:DecisionPendingForMerging",
-        "ods:RejectedForMerging",
-        "ods:ApprovedForMerging"
+        "ods:Pending",
+        "ods:Rejected",
+        "ods:Approved"
       ],
       "description": "The merging status of the annotation. Only present when motivation is ods:adding or oa:editing"
     },

diff --git a/data-model/fdo-type/data-mapping/0.3.0/examples/tombstoned-data-mapping-example.json b/data-model/fdo-type/data-mapping/0.3.0/examples/tombstoned-data-mapping-example.json
@@ -35,7 +35,7 @@
   "ods:TombstoneMetadata": {
     "@type": "ods:Tombstone",
     "ods:tombstonedDate": "2023-06-15T14:30:00Z",
-    "ods:tombstonedReason": "This object was made by mistake",
+    "ods:tombstonedText": "This object was made by mistake",
     "ods:TombstonedByAgent": {
       "@id": "https://orcid.org/0000-0002-5669-2769",
       "@type": "schema:Person",

diff --git a/data-model/fdo-type/digital-media/0.3.0/examples/tombstoned-digital-media-example.json b/data-model/fdo-type/digital-media/0.3.0/examples/tombstoned-digital-media-example.json
@@ -24,7 +24,7 @@
   "ods:TombstoneMetadata": {
     "@type": "ods:Tombstone",
     "ods:tombstonedDate": "2023-06-15T14:30:00Z",
-    "ods:tombstonedReason": "This digital media was removed as it showed the wrong specimen",
+    "ods:tombstonedText": "This digital media was removed as it showed the wrong specimen",
     "ods:TombstonedByAgent": {
       "@id": "https://orcid.org/0000-0002-5669-2769",
       "@type": "schema:Person",

diff --git a/data-model/fdo-type/digital-specimen/0.3.0/examples/tombstoned-digital-specimen.json b/data-model/fdo-type/digital-specimen/0.3.0/examples/tombstoned-digital-specimen.json
@@ -128,7 +128,7 @@
   "ods:TombstoneMetadata": {
     "@type": "ods:Tombstone",
     "ods:tombstonedDate": "2023-06-15T14:30:00Z",
-    "ods:tombstonedReason": "This digital media was removed as it showed the wrong specimen",
+    "ods:tombstonedText": "This digital media was removed as it showed the wrong specimen",
     "ods:TombstonedByAgent": {
       "@id": "https://orcid.org/0000-0002-5669-2769",
       "@type": "schema:Person",

diff --git a/data-model/fdo-type/shared-model/0.3.0/examples/tombstone-metadata-example.json b/data-model/fdo-type/shared-model/0.3.0/examples/tombstone-metadata-example.json
@@ -1,7 +1,7 @@
 {
   "@type": "ods:Tombstone",
   "ods:tombstonedDate": "2023-06-15T14:30:00Z",
-  "ods:tombstonedReason": "This object was made by mistake",
+  "ods:tombstonedText": "This object was made by mistake",
   "ods:TombstonedByAgent": {
     "@id": "https://example.org/agents/agent123",
     "@type": "schema:Person",

diff --git a/data-model/fdo-type/shared-model/0.3.0/schema/tombstone-metadata.json b/data-model/fdo-type/shared-model/0.3.0/schema/tombstone-metadata.json
@@ -19,7 +19,7 @@
         "2021-06-01T12:00:000Z"
       ]
     },
-    "ods:tombstonedReason": {
+    "ods:tombstonedText": {
       "type": "string",
       "description": "A reason why the Digital Object was tombstoned",
       "examples": [
@@ -60,7 +60,7 @@
   "required": [
     "@type",
     "ods:tombstonedDate",
-    "ods:tombstonedReason",
+    "ods:tombstonedText",
     "ods:TombstonedByAgent"
   ],
   "additionalProperties": false