move towards modular explicit must reqs for time strings

Author: douglowe

rocrate_validator/profiles/five-safes-crate/may/4_sign_off.ttl

@@ -26,11 +26,14 @@
 five-safes-crate:SignOffPhaseStartTime
     a sh:NodeShape ;
     sh:description "Sign Off start time check" ;
-    sh:node five-safes-crate:StartTimeStamp ;
     sh:severity sh:Info ;
     sh:target [ 
         a five-safes-crate:ActionActiveCompFailSearch ;
         five-safes-crate:addtype shp:SignOff ;
     ] ;
-    sh:message "Sign Off phase MAY have a compliant startTime if action is active, completed or failed."
-    .
+    sh:property [
+        sh:path schema:startTime ;
+        sh:minCount 1 ;
+        sh:maxCount 1 ;
+        sh:message "Sign Off phase MAY have a startTime if action is active, completed or failed." ;
+    ] .

rocrate_validator/profiles/five-safes-crate/must/11_workflow_execution_phase.ttl

@@ -72,7 +72,9 @@ five-safes-crate:WorkflowexecutionObjectHasCompliantEndTimeFormat
         sh:pattern "^[0-9]{4}-[0-9]{2}-[0-9]{2}[Tt][0-9]{2}:[0-9]{2}:[0-9]{2}(\\.[0-9]+)?(Z|z|[+-][0-9]{2}:[0-9]{2})$" ;
         sh:severity sh:Violation ;
         sh:message "The endTime of the workflow execution object MUST follow the RFC 3339 standard (YYYY-MM-DD'T'hh:mm:ss[.fraction](Z | ±hh:mm))." ;
-    ] .
+    ] ;
+    
+    sh:node five-safes-crate:EndTimeStamp .
 
 
 five-safes-crate:WorkflowMustHaveActionStatusWithAllowedValues

rocrate_validator/profiles/five-safes-crate/must/4_sign_off.ttl

@@ -21,6 +21,7 @@
 @prefix sh: <http://www.w3.org/ns/shacl#> .
 @prefix validator: <https://github.com/crs4/rocrate-validator/> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix shp: <https://w3id.org/shp#> .
 
 five-safes-crate:SignOffObjectActionAndName
     a sh:NodeShape ;
@@ -53,7 +54,11 @@ five-safes-crate:SignOffObjectActionAndName
         sh:hasValue schema:AssessAction;
         sh:severity sh:Violation ;
         sh:message "Sign Off phase MUST be a `schema:AssessAction`." ;
-    ] .
+    ] ;
+
+    sh:node five-safes-crate:StartTimeStamp ;
+
+    sh:node five-safes-crate:EndTimeStamp .
 
 five-safes-crate:SignOffObjectHasActionStatus
     a sh:NodeShape ;

rocrate_validator/profiles/five-safes-crate/shape_library.ttl

@@ -31,10 +31,10 @@ five-safes-crate:EndTimeStamp
         sh:pattern "^[0-9]{4}-[0-9]{2}-[0-9]{2}[Tt][0-9]{2}:[0-9]{2}:[0-9]{2}([.|,][0-9]+)?(Z|z|[+-][0-9]{2}:[0-9]{2})$" ;
         sh:description "End Time Check" ;
         sh:path schema:endTime ;
-        sh:minCount 1 ;
-        sh:maxCount 1 ;
+        sh:minCount 0 ;
         sh:name "EndTimeStamp" ;
         sh:message "endTime property MUST follow ISO-8601 syntax. e.g. 2023-04-19T10:15:12+01:00" ;
+        sh:severity sh:Violation ;
     ] .
 
 
@@ -43,12 +43,12 @@ five-safes-crate:StartTimeStamp
     sh:property [
         sh:datatype xsd:string ;
         sh:pattern "^[0-9]{4}-[0-9]{2}-[0-9]{2}[Tt][0-9]{2}:[0-9]{2}:[0-9]{2}([.|,][0-9]+)?(Z|z|[+-][0-9]{2}:[0-9]{2})$" ;
-        sh:description "End Time Check" ;
+        sh:description "Start Time Check" ;
         sh:path schema:startTime ;
-        sh:minCount 1 ;
-        sh:maxCount 1 ;
-        sh:name "StartTime" ;
+        sh:minCount 0 ;
+        sh:name "StartTimeStamp" ;
         sh:message "startTime property MUST follow ISO-8601 syntax. e.g. 2023-04-19T10:15:12+01:00" ;
+        sh:severity sh:Violation ;
     ] .