Change reference style of Thread of Messages to behave like exifData

No effects were observed on Make-managed files. References: #393 Signed-off-by: Alex Nelson <alexander.nelson@nist.gov>
ucoProject · Jun 30, 2022 · 9dce663 · 9dce663
1 parent d895e5b
commit 9dce663
Show file tree

Hide file tree

Showing 2 changed files with 78 additions and 12 deletions.
diff --git a/ontology/uco/observable/observable.ttl b/ontology/uco/observable/observable.ttl
@@ -3846,20 +3846,9 @@ observable:MessageThread
 		owl:Class ,
 		sh:NodeShape
 		;
-	rdfs:subClassOf
-		observable:ObservableObject ,
-		types:Thread
-		;
+	rdfs:subClassOf observable:ObservableObject ;
 	rdfs:label "MessageTread"@en ;
 	rdfs:comment "A message thread is a running commentary of electronic messages pertaining to one topic or question."@en ;
-	sh:property [
-		sh:class observable:Message ;
-		sh:description "A MessageThread's items' contents must be Message objects."@en ;
-		sh:path (
-			co:item
-			co:itemContent
-		) ;
-	] ;
 	sh:targetClass observable:MessageThread ;
 	.
 
@@ -3872,6 +3861,41 @@ observable:MessageThreadFacet
 	rdfs:label "MessageThreadFacet"@en ;
 	rdfs:comment "A message thread facet is a grouping of characteristics unique to a running commentary of electronic messages pertaining to one topic or question."@en ;
 	sh:property
+		[
+			sh:class observable:Message ;
+			sh:description "The contents of ordered items in the Thread linked by messageThread must be Message objects."@en ;
+			sh:path (
+				observable:messageThread
+				co:item
+				co:itemContent
+			) ;
+		] ,
+		[
+			sh:class observable:Message ;
+			sh:description "The contents of origin items in the Thread linked by messageThread must be Message objects."@en ;
+			sh:path (
+				observable:messageThread
+				types:threadOriginItem
+				co:itemContent
+			) ;
+		] ,
+		[
+			sh:class observable:Message ;
+			sh:description "The contents of terminal items in the Thread linked by messageThread must be Message objects."@en ;
+			sh:path (
+				observable:messageThread
+				types:threadTerminalItem
+				co:itemContent
+			) ;
+		] ,
+		[
+			sh:class observable:Message ;
+			sh:description "The contents of unordered items in the Thread linked by messageThread must be Message objects."@en ;
+			sh:path (
+				observable:messageThread
+				co:element
+			) ;
+		] ,
 		[
 			sh:class observable:ObservableObject ;
 			sh:minCount "1"^^xsd:integer ;
@@ -3883,6 +3907,12 @@ observable:MessageThreadFacet
 			sh:nodeKind sh:BlankNodeOrIRI ;
 			sh:path observable:participant ;
 		] ,
+		[
+			sh:class types:Thread ;
+			sh:maxCount "1"^^xsd:integer ;
+			sh:nodeKind sh:BlankNodeOrIRI ;
+			sh:path observable:messageThread ;
+		] ,
 		[
 			sh:datatype xsd:boolean ;
 			sh:maxCount "1"^^xsd:integer ;
@@ -10638,6 +10668,12 @@ observable:messageText
 	rdfs:range xsd:string ;
 	.
 
+observable:messageThread
+	a owl:ObjectProperty ;
+	rdfs:label "messageThread"@en ;
+	rdfs:range types:Thread ;
+	.
+
 observable:messageType
 	a owl:DatatypeProperty ;
 	rdfs:label "messageType"@en ;

diff --git a/tests/examples/message_thread_PASS.json b/tests/examples/message_thread_PASS.json
@@ -39,6 +39,36 @@
         {
             "@id": "kb:message-thread-1",
             "@type": "observable:MessageThread",
+            "core:hasFacet": {
+                "@type": "observable:MessageThreadFacet",
+                "observable:message": [
+                    {
+                        "@id": "kb:message-1"
+                    },
+                    {
+                        "@id": "kb:message-2"
+                    },
+                    {
+                        "@id": "kb:message-3"
+                    },
+                    {
+                        "@id": "kb:message-4"
+                    },
+                    {
+                        "@id": "kb:message-5"
+                    },
+                    {
+                        "@id": "kb:message-6"
+                    }
+                ],
+                "observable:messageThread": {
+                    "@id": "kb:thread-1"
+                }
+            }
+        },
+        {
+            "@id": "kb:thread-1",
+            "@type": "types:Thread",
             "co:size": {
                 "@type": "xsd:nonNegativeInteger",
                 "@value": "6"