Commit c237fcfe authored by Sarah Werner's avatar Sarah Werner
Browse files

Several updates based on feedback received: 

- updated internal refs
- updated order of definitions
- added Date type and use Date for dateOfBirth
- added descriptions for surname and given names
- added initials, salutation and sex
- use of InternationalizedEmailAddress instead of EmailAddress
- removed cardValidationValue
- editorial update of the description for VATnumber
parent 4fbd7e01

103705/schema/etsi_types.schema.json

+71 −57
Original line number Diff line number Diff line
@@ -422,16 +422,34 @@ 
      "type" : "object",

      "properties" : {

        "surname": {

          "type":"string"

          "type":"string",

          "description" : "surname, family name, maiden name, married name, main name, and the entire name, in cases where the name cannot be divided into two part" 

        },

        "givenNames": {

          "type":"string",

          "description" : "given names, forenames, familiar names and any other secondary names"

        },

        "initials": {

          "type":"string"

        },

        "salutation": {

          "type":"string"

        },

        "sex": {

          "type":"string",

          "pattern": "[FMX]",

          "description" : "F = female; M = male; X = unspecified; according to e.g. ICAO Document 9303"

        },

        "dateOfBirth":{

          "$ref":"ts_103280_2017_07#/$defs/QualifiedDateTime" 

          "$ref":"#/$defs/Date" 

        }

      }

    },

    "Date" : {

      "type":"string",

      "pattern": "[0-9]{4}-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])",

      "description" : "date in format YYYY-MM-DD"

    },

    "Organisation" : {

      "type" : "object",

      "properties" : {
@@ -441,55 +459,31 @@ 
        "VATNumber": {

          "type":"string", 

          "pattern": "[A-Z]{2}.*",

          "description" : "Value Added Tax number, typically starting with a two letter country code according to ISO code 3166 — alpha 2 — that identifies the state of issue"

          "description" : "Value Added Tax number, typically starting with a two letter country code according to ISO code 3166 - alpha 2 - that identifies the state of issue"

        }

      }

    },     

    "Address" : {

      "type" : "object",

      "properties" : {

        "street" : {

          "type" : "string"

        },

        "houseNumber" : { 

          "type" : "string" 

        },

        "city" : { 

          "type" : "string" 

        },

        "postalCode" : { 

          "type" : "string" 

        },

        "countryCode" : { 

          "$ref" : "ts_103280_2017_07#/$defs/ISOCountryCode"

        }

      }

    }, 

    "IBAN" : { 

      "type": "string",

      "pattern": "[A-Z]{2}[0-9]{2}[A-Z0-9]{1,30}",

      "description" : "International Bank Account Number according to ISO 13616-1:2020"

    },     

    "BankAccount" : {

     "type" : "object",

     "properties": {

        "iBAN" : { 

          "$ref":"ts_103705_2024_02#/$defs/IBAN"

          "$ref":"#/$defs/IBAN"

        },

        "accountHolder": {

          "type" : "string"	

        }         

      }

    },

    "PaymentCardNumber" : {

    "IBAN" : { 

      "type": "string",

       "pattern": "^\\d{8,19}$"

      "pattern": "[A-Z]{2}[0-9]{2}[A-Z0-9]{1,30}",

      "description" : "International Bank Account Number according to ISO 13616-1:2020"

    },    

    "PaymentCard" : {

      "type" : "object",

      "properties" : {

        "cardNumber": {

          "$ref" : "ts_103705_2024_02#/$defs/PaymentCardNumber"

          "$ref" : "#/$defs/PaymentCardNumber"

        },

        "cardHolder" : {

          "type" : "string"
@@ -500,13 +494,13 @@ 
        },

        "dateOfExpiry" : { 

          "$ref" : "ts_103280_2017_07#/$defs/QualifiedDateTime" 

        },

        "cardValidationValue" : { 

          "type" : "integer",

          "description" : "security code e.g. CSC, CVC, CVV"

        }            

      }

    },

    "PaymentCardNumber" : {

      "type": "string",

       "pattern": "^\\d{8,19}$"

    }, 

    "Contract" : {

      "type" : "object", 

      "properties" : {
@@ -531,7 +525,7 @@ 
        "emailAddress": {

			    "type": "array",

			    "items": {

				    "$ref" : "ts_103280_2017_07#/$defs/EmailAddress" 

				    "$ref" : "ts_103280_2017_07#/$defs/InternationalizedEmailAddress" 

			    }

        },               

        "phoneNumber": {
@@ -543,33 +537,28 @@ 
        "address": {

			    "type": "array",

			    "items": {

				    "$ref":"ts_103705_2024_02#/$defs/Address"

				    "$ref":"#/$defs/Address"

			    }

        }

      }

    },

   "DocumentFile" : {

    "Address" : {

      "type" : "object",

      "properties" : {

        "fileName": {

        "street" : {

          "type" : "string"

        },

        "mimeType": {

        "houseNumber" : { 

          "type" : "string" 

        },

        "natureOfDocument": {

        "city" : { 

          "type" : "string" 

        },

        "content" : {

          "type" : "string",

          "description" : "content of the file base64 encoded"

        },

        "checksum": {          

          "$ref": "ts_103280_2017_07#/$defs/ShortString"        

        "postalCode" : { 

          "type" : "string" 

        },

        "checksumType": {          

          "$ref": "ts_103280_2017_07#/$defs/ShortString",

          "description": "algorithm used to compute the checksum"      

        "countryCode" : { 

          "$ref" : "ts_103280_2017_07#/$defs/ISOCountryCode"

        }

      }

    },
@@ -593,7 +582,32 @@ 
          "$ref":"ts_103280_2017_07#/$defs/ISOCountryCode"

        },

        "documentFile" : {

          "$ref" : "ts_103705_2024_02#/$defs/DocumentFile"

          "$ref" : "#/$defs/DocumentFile"

        }          

      }

    },

    "DocumentFile" : {

      "type" : "object",

      "properties" : {

        "fileName": {

          "type" : "string" 

        },             

        "mimeType": {

         "type" : "string" 

        },           

        "natureOfDocument": {

          "type" : "string"

        },

        "content" : {

          "type" : "string",

          "description" : "content of the file base64 encoded"

        },

        "checksum": {          

          "$ref": "ts_103280_2017_07#/$defs/ShortString"        

        },        

        "checksumType": {          

          "$ref": "ts_103280_2017_07#/$defs/ShortString",

          "description": "algorithm used to compute the checksum"      

        }

      }

    }