diff --git a/docs/Release Notes/Version_0.5.md b/docs/Release Notes/Version_0.5.md index 3cfef4788bd52670f7f3cb6c38b45e13bdd44ebe..9a9e3697a9fc476604001cdb1f3037117183e3a3 100644 --- a/docs/Release Notes/Version_0.5.md +++ b/docs/Release Notes/Version_0.5.md @@ -39,6 +39,9 @@ Wo möglich wurde `"additionalProperties": false` gesetzt um weitere Properties ### Destination models/destination-no-id.json +### eID +- eID-org-acting-person.json aufgelöst und in eID-natural-person.json integriert. + ### Postfachadresse models/common/address-national.json models/common/address-postbox.json diff --git a/models/common/eID-natural-person.json b/models/common/eID-natural-person.json index 429d6ce6a34158eb66c2563c6b2203cb6d378975..34f942159f4a4d621725ce342a7cca77db1bf7be 100644 --- a/models/common/eID-natural-person.json +++ b/models/common/eID-natural-person.json @@ -1,17 +1,53 @@ { "title": "Identity Information with Address", "description": "", - "allOf": [ - { - "$ref": "./eID-org-acting-person.json" - }, - { - "type": "object", - "properties": { - "placeOfResidence": { - "$ref": "./address-national.json" - } - } + "type": "object", + "properties": { + "placeOfBirth": { + "type": "string", + "description": "Geburtsort" + }, + "dateOfBirth": { + "type": "string", + "format": "date", + "description": "Geburtsdatum" + }, + "gender": { + "type": "string", + "enum": [ + "m", + "w", + "x", + "d" + ], + "description": "Geschlecht (m=männlich, w=weiblich, x=keine Angabe, d=divers)" + }, + "nationality": { + "type": "string", + "description": "Nationalität" + }, + "artisticName": { + "type": "string", + "description": "Künstler- oder Ordensname" + }, + "doctoralDegrees": { + "type": "string", + "description": "Akademischer Titel, z.B. \"Dr.\" oder \"Prof.\"" + }, + "birthName": { + "type": "string", + "description": "Geburtsname" + }, + "givenName": { + "type": "string", + "description": "Vorname(n)" + }, + "familyName": { + "type": "string", + "description": "Familienname" + }, + "placeOfResidence": { + "$ref": "./address-national.json" } - ] + } } \ No newline at end of file diff --git a/models/common/eID-org-acting-person.json b/models/common/eID-org-acting-person.json deleted file mode 100644 index 1cd498846e1dfcfa568ba34aed40909fa8c37da3..0000000000000000000000000000000000000000 --- a/models/common/eID-org-acting-person.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "type": "object", - "title": "Identity Information without Address", - "additionalProperties": false, - "properties": { - "placeOfBirth": { - "type": "string", - "description": "Geburtsort" - }, - "dateOfBirth": { - "type": "string", - "format": "date", - "description": "Geburtsdatum" - }, - "gender": { - "type": "string", - "enum": [ - "m", - "w", - "x", - "d" - ], - "description": "Geschlecht (m=männlich, w=weiblich, x=keine Angabe, d=divers)" - }, - "nationality": { - "type": "string", - "description": "Nationalität" - }, - "artisticName": { - "type": "string", - "description": "Künstler- oder Ordensname" - }, - "doctoralDegrees": { - "type": "string", - "description": "Akademischer Titel, z.B. \"Dr.\" oder \"Prof.\"" - }, - "birthName": { - "type": "string", - "description": "Geburtsname" - }, - "givenName": { - "type": "string", - "description": "Vorname(n)" - }, - "familyName": { - "type": "string", - "description": "Familienname" - } - } -} \ No newline at end of file