Commit f73dee28 authored by Mark Canterbury's avatar Mark Canterbury
Browse files

Validation giving more helpful messages

parent fcf31917
Loading
Loading
Loading
Loading
Loading
+34 −7
Original line number Diff line number Diff line
{
    "@xsi:type": "{http://uri.etsi.org/03120/common/2020/09/Authorisation}AuthorisationObject",
    "ObjectIdentifier": "7dbbc880-8750-4d3c-abe7-ea4a17646045",
    "CountryCode": "GB",
    "@xsi:type": "{http://uri.etsi.org/03120/common/2020/09/Task}LITaskObject",
    "ObjectIdentifier": "2b36a78b-b628-416d-bd22-404e68a0cd36",
    "CountryCode": "XX",
    "OwnerIdentifier": "ACTOR01",
    "AuthorisationReference": "W000001",
    "AuthorisationTimespan": {
        "StartTime": "2015-09-01T12:00:00Z",
        "EndTime": "2015-12-01T12:00:00Z"
    "AssociatedObjects": {
        "AssociatedObject": ["7dbbc880-8750-4d3c-abe7-ea4a17646045"]
    },
    "task:Reference": "LIID1",
    "task:TargetIdentifier": {
        "task:TargetIdentifierValues": {
            "task:TargetIdentifierValue": [{
                "task:FormatType": {
                    "task:FormatOwner": "ETSI",
                    "task:FormatName": "InternationalE164"
                },
                "task:Value": "442079460223"
            }]
        }
    },
    "task:DeliveryType": {
        "common:Owner": "ETSI",
        "common:Name": "TaskDeliveryType",
        "common:Value": "IRIandCC"
    },
    "task:DeliveryDetails": {
        "task:DeliveryDestination": [{
            "task:DeliveryAddress": {
                "IPv4Address": "192.0.2.0"
            }
        }]
    },
    "task:CSPID": {
        "CountryCode": "XX",
        "UniqueIdentifier": "RECVER01"
    }

}
 No newline at end of file
+2 −2
Original line number Diff line number Diff line
{
    "$id": "ts_103120_Authorisation_2020_09",
    "$ref" : "ts_103120_Authorisation_2020_09#/$defs/AuthorisationObject"
    "$id": "ts_103120_Task_2020_09",
    "$ref" : "#/$defs/RequestPayload"
}  
 No newline at end of file
+76 −78
Original line number Diff line number Diff line
{
    "HI1Message": {
    "@xmlns": "http://uri.etsi.org/03120/common/2019/10/Core",
    "@xmlns:xsi": "http://www.w3.org/2001/XMLSchema-instance",
    "@xmlns:common": "http://uri.etsi.org/03120/common/2016/02/Common",
@@ -27,7 +26,7 @@
            "ActionRequests": {
                "ActionRequest": [
                    {
                            "ActionIdentifier": "0",
                        "ActionIdentifier": 0,
                        "CREATE": {
                            "HI1Object": {
                                "@xsi:type": "auth:AuthorisationObject",
@@ -43,7 +42,7 @@
                        }
                    },
                    {
                            "ActionIdentifier": "1",
                        "ActionIdentifier": 1,
                        "CREATE": {
                            "HI1Object": {
                                "@xsi:type": "task:LITaskObject",
@@ -89,4 +88,3 @@
        }
    }
}
 No newline at end of file
}
 No newline at end of file
+24 −24
Original line number Diff line number Diff line
@@ -33,61 +33,61 @@
        "NationalHandlingParameters": {
          "$ref": "ts_103120_Core_2019_10#/$defs/NationalHandlingParameters"
        },
        "AuthorisationReference": {
        "auth:AuthorisationReference": {
          "$ref": "ts_103280_2017_07#/$defs/LongString"
        },
        "AuthorisationLegalType": {
        "auth:AuthorisationLegalType": {
          "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry"
        },
        "AuthorisationPriority": {
        "auth:AuthorisationPriority": {
          "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry"
        },
        "AuthorisationStatus": {
        "auth:AuthorisationStatus": {
          "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry"
        },
        "AuthorisationDesiredStatus": {
        "auth:AuthorisationDesiredStatus": {
          "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry"
        },
        "AuthorisationTimespan": {
        "auth:AuthorisationTimespan": {
          "$ref": "#/$defs/AuthorisationTimespan"
        },
        "AuthorisationCSPID": {
        "auth:AuthorisationCSPID": {
          "$ref": "#/$defs/AuthorisationCSPID"
        },
        "AuthorisationCreationTimestamp": {
        "auth:AuthorisationCreationTimestamp": {
          "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime"
        },
        "AuthorisationServedTimestamp": {
        "auth:AuthorisationServedTimestamp": {
          "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime"
        },
        "AuthorisationTerminationTimestamp": {
        "auth:AuthorisationTerminationTimestamp": {
          "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime"
        },
        "AuthorisationApprovalDetails": {
        "auth:AuthorisationApprovalDetails": {
          "type": "array",
          "items": {
            "$ref": "ts_103120_Common_2016_02#/$defs/ApprovalDetails"
          }
        },
        "AuthorisationInvalidReason": {
        "auth:AuthorisationInvalidReason": {
          "$ref": "ts_103120_Core_2019_10#/$defs/ActionUnsuccesfulInformation"
        },
        "AuthorisationFlags": {
        "auth:AuthorisationFlags": {
          "$ref": "#/$defs/AuthorisationFlags"
        },
        "AuthorisationManualInformation": {
        "auth:AuthorisationManualInformation": {
          "$ref": "ts_103280_2017_07#/$defs/LongString"
        },
        "NationalAuthorisationParameters": {
        "auth:NationalAuthorisationParameters": {
          "$ref": "#/$defs/NationalAuthorisationParameters"
        },
        "AuthorisationJurisdiction": {
        "auth:AuthorisationJurisdiction": {
          "$ref": "ts_103280_2017_07#/$defs/LongString"
        },
        "AuthorisationTypeOfCase": {
        "auth:AuthorisationTypeOfCase": {
          "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry"
        },
        "AuthorisationLegalEntity": {
        "auth:AuthorisationLegalEntity": {
          "$ref": "ts_103280_2017_07#/$defs/ShortString"
        }
      },
@@ -99,7 +99,7 @@
    "AuthorisationFlags": {
      "type": "object",
      "properties": {
        "AuthorisationFlag": {
        "auth:AuthorisationFlag": {
          "type": "array",
          "items": {
            "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry"
@@ -111,10 +111,10 @@
    "AuthorisationTimespan": {
      "type": "object",
      "properties": {
        "StartTime": {
        "auth:StartTime": {
          "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime"
        },
        "EndTime": {
        "auth:EndTime": {
          "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime"
        }
      },
@@ -123,7 +123,7 @@
    "AuthorisationCSPID": {
      "type": "object",
      "properties": {
        "CSPID": {
        "auth:CSPID": {
          "type": "array",
          "items": {
            "$ref": "ts_103120_Core_2019_10#/$defs/EndpointID"
@@ -136,12 +136,12 @@
    "NationalAuthorisationParameters": {
      "type": "object",
      "properties": {
        "CountryCode": {
        "auth:CountryCode": {
          "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode"
        }
      },
      "required": [
        "CountryCode"
        "auth:CountryCode"
      ]
    }
  }
+27 −27
Original line number Diff line number Diff line
@@ -15,47 +15,47 @@
    "DictionaryEntry": {
      "type": "object",
      "properties": {
        "Owner": {
        "common:Owner": {
          "$ref": "ts_103280_2017_07#/$defs/ShortString"
        },
        "Name": {
        "common:Name": {
          "$ref": "ts_103280_2017_07#/$defs/ShortString"
        },
        "Value": {
        "common:Value": {
          "$ref": "ts_103280_2017_07#/$defs/ShortString"
        }
      },
      "required": [
        "Owner",
        "Name",
        "Value"
        "common:Owner",
        "common:Name",
        "common:Value"
      ]
    },
    "ApprovalDetails": {
      "type": "object",
      "properties": {
        "ApprovalType": {
        "common:ApprovalType": {
          "$ref": "ts_103280_2017_07#/$defs/LongString"
        },
        "ApprovalDescription": {
        "common:ApprovalDescription": {
          "$ref": "ts_103280_2017_07#/$defs/LongString"
        },
        "ApprovalReference": {
        "common:ApprovalReference": {
          "$ref": "ts_103280_2017_07#/$defs/LongString"
        },
        "ApproverDetails": {
        "common:ApproverDetails": {
          "$ref": "#/$defs/ApproverDetails"
        },
        "ApprovalTimestamp": {
        "common:ApprovalTimestamp": {
          "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime"
        },
        "ApprovalIsEmergency": {
        "common:ApprovalIsEmergency": {
          "type": "boolean"
        },
        "ApprovalDigitalSignature": {
        "common:ApprovalDigitalSignature": {
          "$ref": "#/$defs/ApprovalDigitalSignature"
        },
        "ApprovalNationalDetails": {
        "common:ApprovalNationalDetails": {
          "$ref": "#/$defs/ApprovalNationalDetails"
        }
      },
@@ -64,16 +64,16 @@
    "ApproverDetails": {
      "type": "object",
      "properties": {
        "ApproverName": {
        "common:ApproverName": {
          "$ref": "ts_103280_2017_07#/$defs/LongString"
        },
        "ApproverRole": {
        "common:ApproverRole": {
          "$ref": "ts_103280_2017_07#/$defs/LongString"
        },
        "ApproverIdentity": {
        "common:ApproverIdentity": {
          "$ref": "#/$defs/ApproverIdentity"
        },
        "ApproverContactDetails": {
        "common:ApproverContactDetails": {
          "type": "array",
          "items": {
            "$ref": "#/$defs/ApproverContactDetails"
@@ -100,13 +100,13 @@
    "ApproverContactDetails": {
      "type": "object",
      "properties": {
        "ApproverAlternateName": {
        "common:ApproverAlternateName": {
          "$ref": "ts_103280_2017_07#/$defs/LongString"
        },
        "ApproverEmailAddress": {
        "common:ApproverEmailAddress": {
          "$ref": "ts_103280_2017_07#/$defs/InternationalizedEmailAddress"
        },
        "ApproverPhoneNumber": {
        "common:ApproverPhoneNumber": {
          "$ref": "ts_103280_2017_07#/$defs/InternationalE164"
        }
      },
@@ -115,12 +115,12 @@
    "NationalApproverIdentity": {
      "type": "object",
      "properties": {
        "CountryCode": {
        "common:CountryCode": {
          "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode"
        }
      },
      "required": [
        "CountryCode"
        "common:CountryCode"
      ]
    },
    "ApprovalDigitalSignature": {
@@ -141,23 +141,23 @@
    "ApprovalNationalDetails": {
      "type": "object",
      "properties": {
        "CountryCode": {
        "common:CountryCode": {
          "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode"
        }
      },
      "required": [
        "CountryCode"
        "common:CountryCode"
      ]
    },
    "NationalDigitalSignature": {
      "type": "object",
      "properties": {
        "CountryCode": {
        "common:CountryCode": {
          "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode"
        }
      },
      "required": [
        "CountryCode"
        "common:CountryCode"
      ]
    }
  }
Loading