Update ods:TombstoneMetadata, ods:status and ods:Agent

DiSSCo · Jun 28, 2024 · 0bdac2e · 0bdac2e
1 parent c206055
commit 0bdac2e
Show file tree

Hide file tree

Showing 29 changed files with 584 additions and 307 deletions.
diff --git a/data-model/fdo-type/annotation/0.3.0/examples/active-annotation-example.json b/data-model/fdo-type/annotation/0.3.0/examples/active-annotation-example.json
@@ -3,6 +3,7 @@
   "@type": "ods:Annotation",
   "ods:ID": "https://hdl.handle.net/20.5000.1025/ABC-DEF-GHI",
   "rdf:type": "ods:Annotation",
+  "ods:status": "ods:Active",
   "ods:version": 1,
   "oa:motivation": "oa:commenting",
   "oa:hasTarget": {
@@ -23,15 +24,14 @@
   },
   "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": {
     "@id": "https://hdl.handle.net/20.5000.1025/ABC-DEF-GHI",
     "@type": "as:Application",
-    "foaf:name": "Annotation Generator Service"
+    "schema:name": "Annotation Generator Service"
   },
-  "dcterms:issued": "2024-06-27T12:00:00Z",
-  "ods:annotationStatus": "ods:Active"
+  "dcterms:issued": "2024-06-27T12:00:00Z"
 }
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
@@ -2,6 +2,7 @@
   "@id": "https://hdl.handle.net/20.5000.1025/ABC-DEF-GHI",
   "@type": "ods:Annotation",
   "ods:ID": "https://hdl.handle.net/20.5000.1025/ABC-DEF-GHI",
+  "ods:status": "ods:Active",
   "rdf:type": "ods:Annotation",
   "ods:version": 1,
   "oa:motivation": "oa:commenting",
@@ -30,15 +31,15 @@
   "as:generator": {
     "@id": "https://hdl.handle.net/20.5000.1025/ABC-DEF-GHI",
     "@type": "as:Application",
-    "foaf:name": "Annotation Generator Service"
+    "schema:name": "Annotation Generator Service"
   },
   "dcterms:issued": "2024-06-27T12:00:00Z",
   "ods:batchID": "batch-1234",
   "ods:annotationStatus": "ods:Approved",
-  "ods:decisionDate": "2024-06-28T12:00:00Z",
-  "ods:Decider": {
+  "ods:mergingStateChangeDate": "2024-06-28T12:00:00Z",
+  "ods:MergingStateChangedBy": {
     "@id": "https://orcid.org/0000-0002-5669-2769",
-    "@type": "foaf:Person",
-    "foaf:name": "Jane Smith"
+    "@type": "schema:Person",
+    "schema:name": "Jane Smith"
   }
 }
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
@@ -0,0 +1,49 @@
+{
+  "@id": "https://hdl.handle.net/20.5000.1025/ABC-DEF-GHI",
+  "@type": "ods:Annotation",
+  "ods:ID": "https://hdl.handle.net/20.5000.1025/ABC-DEF-GHI",
+  "rdf:type": "ods:Annotation",
+  "ods:status": "ods:Tombstone",
+  "ods:version": 1,
+  "oa:motivation": "oa:commenting",
+  "oa:hasTarget": {
+    "@id": "https://hdl.handle.net/20.5000.1025/XYZ-XYZ-XYZ",
+    "@type": "ods:DigitalSpecimen",
+    "ods:ID": "https://hdl.handle.net/20.5000.1025/XYZ-XYZ-XYZ",
+    "ods:type": "https://doi.org/21.T11148/bbad8c4e101e8af01115",
+    "oa:hasSelector": {
+      "@type": "ods:FieldSelector",
+      "ods:field": "$.hasEvent[0].location.dwc:country"
+    }
+  },
+  "oa:hasBody": {
+    "@type": "oa:TextualBody",
+    "oa:value": [
+      "Venezuela"
+    ],
+    "dcterms:references": "https://api.gbif.org/v1/occurrence/search?occurrenceID=https://herbarium.bgbm.org/object/BW00965020&catalogNumber=B -W 00965 -02 0&basisOfRecord=PreservedSpecimen",
+    "ods:score": 0.9
+  },
+  "dcterms:creator": {
+    "@id": "https://orcid.org/0000-0002-5669-2769",
+    "@type": "schema:Person",
+    "schema:name": "John Doe"
+  },
+  "dcterms:created": "2024-06-27T12:00:00Z",
+  "as:generator": {
+    "@id": "https://hdl.handle.net/20.5000.1025/ABC-DEF-GHI",
+    "@type": "as:Application",
+    "schema:name": "Annotation Generator Service"
+  },
+  "dcterms:issued": "2024-06-27T12:00:00Z",
+  "ods:TombstoneMetadata": {
+    "@type": "ods:Tombstone",
+    "ods:tombstonedDate": "2023-06-15T14:30:00Z",
+    "ods:tombstonedReason": "This object was made by mistake",
+    "ods:TombstonedByAgent": {
+      "@id": "https://orcid.org/0000-0002-5669-2769",
+      "@type": "schema:Person",
+      "schema:name": "John Doe"
+    }
+  }
+}
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
@@ -27,6 +27,14 @@
         "https://hdl.handle.net/20.5000.1025/XXX-XXX-XXX"
       ]
     },
+    "ods:status": {
+      "enum": [
+        "ods:Draft",
+        "ods:Active",
+        "ods:Tombstone"
+      ],
+      "description": "The status of the Digital Object."
+    },
     "ods:jobID": {
       "type": "string",
       "description": "Handle of the job record, if the annotation was produced by a Machine Annotation Service, only filled when annotation was created by a MAS",
@@ -263,54 +271,13 @@
     "dcterms:creator": {
       "type": "object",
       "description": "Object containing information on who created the object",
-      "properties": {
-        "@id": {
-          "type": "string",
-          "description": "The PID if the type is SoftwareAgent, the ORCID if the type is Person and the ROR if the type is Organisation.",
-          "examples": [
-            "https://hdl.handle.net/20.5000.1025/XXX-XXX-XXX",
-            "https://doi.org/10.123/XXX-XXX-XXX",
-            "https://ror.org/0566bfb96",
-            "https://orcid.org/0000-0002-5669-2769"
-          ],
-          "pattern": "https://(doi\\.org/10\\.\\d+/[-a-zA-Z0-9]+$|hdl\\.handle\\.net/[a-zA-Z0-9.]+/[-a-zA-Z0-9]+$|ror\\.org/0[a-z|0-9]{6}[0-9]{2}$|orcid\\.org/\\d{4}-\\d{4}-\\d{4}-\\d{3}[\\dX]+)$"
-        },
-        "@type": {
-          "type": "string",
-          "description": "The type of the creator.",
-          "enum": [
-            "foaf:Person",
-            "foaf:Organisation",
-            "as:Application"
-          ]
-        },
-        "foaf:name": {
-          "type": "string",
-          "description": "The name of the creator. http://xmlns.com/foaf/0.1/#term_name",
-          "examples": [
-            "Gbif linker service"
-          ]
-        }
-      },
-      "required": [
-        "@id",
-        "@type"
-      ],
-      "additionalProperties": false
+      "$ref": "https://schemas.dissco.tech/schemas/fdo-type/shared-model/0.3.0/agent.json"
     },
     "dcterms:created": {
       "type": "string",
       "format": "date-time",
       "description": "The date and time when the annotation was created. https://purl.org/dc/terms/created"
     },
-    "ods:dateTombstoned": {
-      "type": "string",
-      "description": "Timestamp Annotation was tombstoned and no longer active. Generated on request of the user. Empty as long as Annotation is active",
-      "format": "date-time",
-      "examples": [
-        "2021-06-01T12:00:000Z"
-      ]
-    },
     "dcterms:issued": {
       "type": "string",
       "format": "date-time",
@@ -319,40 +286,7 @@
     "as:generator": {
       "type": "object",
       "description": "Object containing information on who generated the object. Generated is here seen as who stored/indexed the object. In most case this will be the annotation-processing-service",
-      "properties": {
-        "@id": {
-          "type": "string",
-          "description": "The PID if the type is SoftwareAgent, the ORCID if the type is Person and the ROR if the type is Organisation.",
-          "examples": [
-            "https://hdl.handle.net/20.5000.1025/XXX-XXX-XXX",
-            "https://doi.org/10.123/XXX-XXX-XXX",
-            "https://ror.org/0566bfb96",
-            "https://orcid.org/0000-0002-5669-2769"
-          ],
-          "pattern": "https://(doi\\.org/10\\.\\d+/[-a-zA-Z0-9]+$|hdl\\.handle\\.net/[a-zA-Z0-9.]+/[-a-zA-Z0-9]+$|ror\\.org/0[a-z|0-9]{6}[0-9]{2}$|orcid\\.org/\\d{4}-\\d{4}-\\d{4}-\\d{3}[\\dX]+)$"
-        },
-        "@type": {
-          "type": "string",
-          "description": "The type of the creator.",
-          "enum": [
-            "foaf:Person",
-            "foaf:Organisation",
-            "as:Application"
-          ]
-        },
-        "foaf:name": {
-          "type": "string",
-          "description": "The name of the creator. http://xmlns.com/foaf/0.1/#term_name",
-          "examples": [
-            "Gbif linker service"
-          ]
-        }
-      },
-      "required": [
-        "@id",
-        "@type"
-      ],
-      "additionalProperties": false
+      "$ref": "https://schemas.dissco.tech/schemas/fdo-type/shared-model/0.3.0/agent.json"
     },
     "schema:AggregateRating": {
       "type": "object",
@@ -402,43 +336,15 @@
       "format": "date-time",
       "description": "The date and time when the annotation was merging state was changed."
     },
-    "ods:mergingStateChangedBy": {
+    "ods:MergingStateChangedBy": {
       "type": "object",
       "description": "Object containing information on who changed the merging state of the annotation.",
-      "properties": {
-        "@id": {
-          "type": "string",
-          "description": "The PID if the type is SoftwareAgent, the ORCID if the type is Person and the ROR if the type is Organisation.",
-          "examples": [
-            "https://hdl.handle.net/20.5000.1025/XXX-XXX-XXX",
-            "https://doi.org/10.123/XXX-XXX-XXX",
-            "https://ror.org/0566bfb96",
-            "https://orcid.org/0000-0002-5669-2769"
-          ],
-          "pattern": "https://(doi\\.org/10\\.\\d+/[-a-zA-Z0-9]+$|hdl\\.handle\\.net/[a-zA-Z0-9.]+/[-a-zA-Z0-9]+$|ror\\.org/0[a-z|0-9]{6}[0-9]{2}$|orcid\\.org/\\d{4}-\\d{4}-\\d{4}-\\d{3}[\\dX]+)$"
-        },
-        "@type": {
-          "type": "string",
-          "description": "The type of the agent who changed the merging state.",
-          "enum": [
-            "foaf:Person",
-            "foaf:Organisation",
-            "as:Application"
-          ]
-        },
-        "foaf:name": {
-          "type": "string",
-          "description": "The name of the agent who changed the merging state. http://xmlns.com/foaf/0.1/#term_name",
-          "examples": [
-            "Gbif linker service"
-          ]
-        }
-      },
-      "required": [
-        "@id",
-        "@type"
-      ],
-      "additionalProperties": false
+      "$ref": "https://schemas.dissco.tech/schemas/fdo-type/shared-model/0.3.0/agent.json"
+    },
+    "ods:TombstoneMetadata": {
+      "type": "object",
+      "description": "Object containing the tombstone metadata of the object",
+      "$ref": "https://schemas.dissco.tech/schemas/fdo-type/shared-model/0.3.0/tombstone-metadata.json"
     }
   },
   "required": [

diff --git a/data-model/fdo-type/create-update-tombstone-event/0.3.0/examples/create-event-example.json b/data-model/fdo-type/create-update-tombstone-event/0.3.0/examples/create-event-example.json
@@ -64,17 +64,17 @@
     {
       "@id": "https://orcid.org/0000-0002-1825-0097",
       "@type": "prov:Person",
-      "foaf:name": "John Doe"
+      "schema:name": "John Doe"
     },
     {
       "@id": "https://hdl.handle.net/20.5000.1025/XXX-XXX-XXX",
       "@type": "prov:SoftwareAgent",
-      "foaf:name": "GBIF Linker Service"
+      "schema:name": "GBIF Linker Service"
     },
     {
       "@id": "https://hdl.handle.net/20.5000.1025/XXX-YYY-XXX",
       "@type": "prov:SoftwareAgent",
-      "foaf:name": "Digital Specimen Processor"
+      "schema:name": "Digital Specimen Processor"
     }
   ]
 }
diff --git a/...-model/fdo-type/create-update-tombstone-event/0.3.0/examples/tombstone-event-example.json b/...-model/fdo-type/create-update-tombstone-event/0.3.0/examples/tombstone-event-example.json
@@ -34,17 +34,17 @@
     {
       "@id": "https://orcid.org/0000-0002-1825-0097",
       "@type": "prov:Person",
-      "foaf:name": "John Doe"
+      "schema:name": "John Doe"
     },
     {
       "@id": "https://hdl.handle.net/20.5000.1025/XXX-XXX-XXX",
       "@type": "prov:SoftwareAgent",
-      "foaf:name": "GBIF Linker Service"
+      "schema:name": "GBIF Linker Service"
     },
     {
       "@id": "https://hdl.handle.net/20.5000.1025/XXX-YYY-XXX",
       "@type": "prov:SoftwareAgent",
-      "foaf:name": "Digital Specimen Processor"
+      "schema:name": "Digital Specimen Processor"
     }
   ]
 }
diff --git a/data-model/fdo-type/create-update-tombstone-event/0.3.0/examples/update-event-example.json b/data-model/fdo-type/create-update-tombstone-event/0.3.0/examples/update-event-example.json
@@ -64,17 +64,17 @@
     {
       "@id": "https://orcid.org/0000-0002-1825-0097",
       "@type": "prov:Person",
-      "foaf:name": "John Doe"
+      "schema:name": "John Doe"
     },
     {
       "@id": "https://hdl.handle.net/20.5000.1025/XXX-XXX-XXX",
       "@type": "prov:SoftwareAgent",
-      "foaf:name": "GBIF Linker Service"
+      "schema:name": "GBIF Linker Service"
     },
     {
       "@id": "https://hdl.handle.net/20.5000.1025/XXX-YYY-XXX",
       "@type": "prov:SoftwareAgent",
-      "foaf:name": "Digital Specimen Processor"
+      "schema:name": "Digital Specimen Processor"
     }
   ]
 }
diff --git a/...el/fdo-type/create-update-tombstone-event/0.3.0/schema/create-update-tombstone-event.json b/...el/fdo-type/create-update-tombstone-event/0.3.0/schema/create-update-tombstone-event.json
@@ -222,37 +222,7 @@
       "items": {
         "type": "object",
         "description": "Based on the prov-ontology Agent Class, https://www.w3.org/ns/prov#Agent",
-        "properties": {
-          "@id": {
-            "type": "string",
-            "description": "The unique identifier of the Agent, possible values are an ORCID or a handle",
-            "examples": [
-              "https://orcid.org/0000-0002-1825-0097",
-              "https://hdl.handle.net/20.5000.1025/XXX-XXX-XXX"
-            ]
-          },
-          "@type": {
-            "description": "The type of agent",
-            "enum": [
-              "prov:Person",
-              "prov:SoftwareAgent"
-            ]
-          },
-          "foaf:name": {
-            "type": "string",
-            "description": "The name of the agent",
-            "examples": [
-              "John Doe",
-              "GBIF Linker Service"
-            ]
-          }
-        },
-        "required": [
-          "@id",
-          "@type",
-          "foaf:name"
-        ],
-        "additionalProperties": false
+        "$ref": "https://schemas.dissco.tech/schemas/fdo-type/agent/0.3.0/agent.json"
       }
     }
   }

diff --git a/data-model/fdo-type/data-mapping/0.3.0/examples/data-mapping-example.json b/data-model/fdo-type/data-mapping/0.3.0/examples/data-mapping-example.json
@@ -3,11 +3,16 @@
   "@type": "ods:DataMapping",
   "ods:ID": "https://hdl.handle.net/20.5000.1025/ABC-DEF-GHI",
   "ods:type": "https://doi.org/10.15468/1a2b3c",
+  "ods:status": "ods:Active",
   "schema:version": 1,
   "schema:name": "Default Mapping for Herbarium of University of Coimbra (COI)",
   "schema:description": "The default mapping for the Herbarium of the University of Coimbra (COI) to the Darwin Core standard.",
   "schema:dateCreated": "2021-06-01T12:00:00Z",
-  "ods:creator": "e2befba6-9324-4bb4-9f41-d7dfae4a44b0",
+  "ods:creator": {
+    "@id": "e2befba6-9324-4bb4-9f41-d7dfae4a44b0",
+    "@type": "schema:Person",
+    "schema:name": "John Doe"
+  },
   "ods:Mapping": {
     "ods:DefaultMapping": [
       {