Merge pull request International-Data-Spaces-Association#82 from Inte…

…rnational-Data-Spaces-Association/feature/timestamps feat: introduce an agreement timestamp
jimmarino · May 16, 2023 · 4cd73f6 · 4cd73f6
2 parents 4a48935 + 7eed176
commit 4cd73f6
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 4 deletions.
diff --git a/negotiation/contract.negotiation.protocol.md b/negotiation/contract.negotiation.protocol.md
@@ -123,6 +123,8 @@ A `ContractAgreementMessage` must contain a `processId`.
 
 A `ContractAgreementMessage` must contain an ODRL `Agreement`.
 
+An `Agreement` must contain a `dspace:timestamp` property defined as an XSD DateTime type.  
+
 ### 4. ContractAgreementVerificationMessage
 
 

diff --git a/negotiation/message/contract-agreement-message.json b/negotiation/message/contract-agreement-message.json
@@ -5,6 +5,10 @@
   "dspace:agreement": {
     "@type": "odrl:Agreement",
     "@id": "e8dc8655-44c2-46ef-b701-4cffdc2faa44",
+    "dspace:timestamp": {
+      "@value": "2023-01-01T01:00:00Z",
+      "@type": "xsd:dateTime"
+    },
     "odrl:permission": {
       ...
     }

diff --git a/negotiation/message/diagram/contract-agreement-message.png b/negotiation/message/diagram/contract-agreement-message.png
diff --git a/negotiation/message/diagram/contract-agreement-message.puml b/negotiation/message/diagram/contract-agreement-message.puml
@@ -15,11 +15,12 @@ class "dspace:ContractAgreementMessage" {
 }
 
 class odrl:Agreement {
-    @type : "odrl:Agreement",
+    @type : "odrl:Agreement"
     @id: String
     odrl:target : xsd:anyURI
+    dspace:timestamp : xsd:dateTime
 }
 
 "dspace:ContractAgreementMessage" "1" *-- "1" "odrl:Agreement" : "odrl:agreement"
 
-@enduml
+@enduml
diff --git a/negotiation/message/schema/contract-agreement-message-schema.json b/negotiation/message/schema/contract-agreement-message-schema.json
@@ -28,9 +28,36 @@
 				},
 				"odrl:agreement": {
 					"$ref": "https://w3id.org/dspace/schemas/v0.8/AgreementSchema#definitions/Agreement",
-					"required": true
+					"type": "object",
+					"required": true,
+					"properties": {
+						"@type": {
+							"type": "string",
+							"required": true
+						},
+						"@id": {
+							"type": "string",
+							"required": true
+						},
+						"dspace:timestamp": {
+							"type": "object",
+							"required": true,
+							"properties": {
+								"@value": {
+									"type": "string",
+									"format": "date-time",
+									"required": true
+								},
+								"@type": {
+									"type": "string",
+									"const": "xsd:dateTime",
+									"required": true
+								}
+							}
+						}
+					}
 				}
 			}
 		}
 	}
-}
+}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -123,6 +123,8 @@ A `ContractAgreementMessage` must contain a `processId`.

		A `ContractAgreementMessage` must contain an ODRL `Agreement`.

		An `Agreement` must contain a `dspace:timestamp` property defined as an XSD DateTime type.

		### 4. ContractAgreementVerificationMessage


Expand Down