From c99046093ec263b210d5cb81e19f1275fc9111d5 Mon Sep 17 00:00:00 2001
From: Andreas Huber <anh@fjd.de>
Date: Thu, 16 Apr 2020 09:41:08 +0200
Subject: [PATCH] Beispiele angepasst

---
 reference/sender.json     |  99 +++++++-----
 reference/subscriber.json | 309 +++++++++++++++++++++-----------------
 2 files changed, 235 insertions(+), 173 deletions(-)

diff --git a/reference/sender.json b/reference/sender.json
index a76c934f..62d95e6a 100644
--- a/reference/sender.json
+++ b/reference/sender.json
@@ -243,24 +243,24 @@
               "examples": {
                 "example-1": {
                   "value": {
-                    "additional-reference-info": {
+                    "additionalReferenceInfo": {
                       "subject": "Anmeldung eines Gewerbes in Musterstadt",
                       "caseId": "DF/8923"
                     },
-                    "content-structure": {
+                    "contentStructure": {
                       "data": {
+                        "size": 9438,
                         "schema": {
-                          "mime-type": "json",
-                          "schema-source": "none"
-                        },
-                        "mime-type": "json"
+                          "mimeType": "json",
+                          "schemaSource": "none"
+                        }
                       },
                       "docs": [
                         {
                           "docId": "1",
                           "purpose": "form",
                           "size": 39273,
-                          "mime": "application/pdf",
+                          "mimeType": "application/pdf",
                           "filename": "antrag.pdf",
                           "description": "Das Antragsformular",
                           "lang": {
@@ -271,10 +271,22 @@
                             "algorithm": "SHA-256",
                             "digest": "03ba204e50d126e4674c005e04d82e84c21366780af1f43bd54a37816b6ab340"
                           }
+                        },
+                        {
+                          "docId": "2",
+                          "purpose": "attachment",
+                          "size": 894834874,
+                          "mimeType": "image/jpeg",
+                          "filename": "scan.jpg",
+                          "description": "Scan der Bescheinigung",
+                          "hash": {
+                            "algorithm": "SHA-256",
+                            "digest": "e1762f14d9924e37b32f1c81dfd256410af462f5136415c96877efa8c80345d0"
+                          }
                         }
                       ]
                     },
-                    "public-service-type": {
+                    "publicServiceType": {
                       "name": "Gewerbeanmeldung",
                       "description": "Eine Gewerbeanmeldung ist immer dann notwendig, wenn Sie einen stehenden Gewerbebetrieb beginnen.",
                       "leikaId": "99050012104000",
@@ -293,42 +305,59 @@
                     },
                     "applicants": [
                       {
-                        "authentification-info": {
-                          "assurance-level": "high",
-                          "authentification-method": "eID",
-                          "timestamp": "2020-03-03T12:38:23Z"
-                        },
-                        "identity-info": {
-                          "date-of-birth": "1970-09-13",
-                          "gender": "m",
-                          "given-name": "WERNER",
-                          "family-name": "MUSTERMANN",
-                          "place-of-residence": {
-                            "street": "KURZER WEG 7",
-                            "postal-code": "12345",
-                            "city": "ANKH-MORPORK"
+                        "identifier": [
+                          {
+                            "id": "918",
+                            "schemeName": "Antragsportal",
+                            "schemeId": "urn:com:example:antragsportal:user"
                           }
-                        },
-                        "contact-info": {
-                          "electronic-adresses": [
-                            {
-                              "channel-type": "Service-Account-Mailbox",
-                              "address": "3b0c9c8c-0801-45f0-a331-2abfc9db78d0"
-                            }
-                          ],
-                          "physical-adress": {
+                        ],
+                        "contactInfo": {
+                          "physicalAddress": {
                             "street": "Kurzer Weg",
-                            "house-number": "7",
-                            "postal-code": "12345",
-                            "city": "Ankh-Morpork"
+                            "houseNumber": 7,
+                            "postalCode": "12345",
+                            "city": "string",
+                            "addressSupplement": "string"
                           },
                           "telephone": [
                             {
                               "number": "+49 89 32168-42",
                               "mobile": true,
-                              "type": "work"
+                              "description": "string"
+                            }
+                          ],
+                          "electronicAddresses": [
+                            {
+                              "channelType": "Service-Account-Mailbox",
+                              "address": "string"
                             }
                           ]
+                        },
+                        "identityInfo": {
+                          "gender": "m",
+                          "nationality": "string",
+                          "familyName": "string",
+                          "givenName": "string",
+                          "birthName": "string",
+                          "doctoralDegrees": "string",
+                          "artisticName": "string",
+                          "dateOfBirth": "2020-04-16",
+                          "placeOfBirth": "string",
+                          "placeOfResidence": {
+                            "street": "string",
+                            "houseNumber": null,
+                            "houseNumberSuffix": "st",
+                            "postalCode": "strin",
+                            "city": "string",
+                            "addressSupplement": "string"
+                          }
+                        },
+                        "authentificationInfo": {
+                          "timestamp": "2020-04-16T06:50:39Z",
+                          "authentificationToken": {},
+                          "authentificationMethod": "string",
+                          "assuranceLevel": "low"
                         }
                       }
                     ],
diff --git a/reference/subscriber.json b/reference/subscriber.json
index a64f7e6d..0db803b4 100644
--- a/reference/subscriber.json
+++ b/reference/subscriber.json
@@ -48,27 +48,27 @@
                   "example-1": {
                     "value": [
                       {
-                        "destinationId": "83578",
-                        "organization": {
-                          "organization-name": "Gewerbeamt Musterhausen"
+                        "destination-id": "83578",
+                        "public-organization": {
+                          "organizationName": "Gewerbeamt Musterhausen"
                         },
-                        "technical-contact": [
+                        "technicalContact": [
                           {
-                            "first-name": "Werner",
-                            "last-name": "Mustermann",
+                            "firstName": "Werner",
+                            "lastName": "Mustermann",
                             "contact": {
                               "telephone": [
                                 {
                                   "number": "+49 89 32168-42",
                                   "mobile": false,
-                                  "type": "work"
+                                  "description": "Dienstliches Festnetz"
                                 }
                               ]
                             }
                           }
                         ],
                         "callback": {
-                          "callback-url": "https://www.example.com/callback"
+                          "callbackURI": "https://www.example.com/callback"
                         }
                       }
                     ]
@@ -194,51 +194,25 @@
                 "example-1": {
                   "value": {
                     "public-organization": {
-                      "organization-name": "Gewerbeamt Musterstadt",
-                      "address": {
-                        "street": "Kurzer Weg",
-                        "houseNr": "7",
-                        "postalCode": "12345",
-                        "city": "Ankh-Morpork"
-                      },
-                      "contact": {
-                        "telephone": {
-                          "number": "+49 89 32168-0",
-                          "mobile": false,
-                          "type": "work"
-                        },
-                        "email": "behoerde@example.com"
-                      }
+                      "organizationName": "Gewerbeamt Musterhausen"
                     },
-                    "technical-contact": {
-                      "formOfAddress": "Herr",
-                      "academicTitle": "Dr.",
-                      "firstName": "Kunibert",
-                      "lastName": "Vonundzu",
-                      "contact": {
-                        "telephone": [
-                          {
-                            "number": "+49 89 32168-42",
-                            "mobile": false,
-                            "type": "work"
-                          },
-                          {
-                            "number": "+49 123 456789",
-                            "mobile": true,
-                            "type": "work"
-                          }
-                        ],
-                        "email": "kunibert.vonundzu@example.com"
-                      }
-                    },
-                    "schemas": [
+                    "technicalContact": [
                       {
-                        "mime-type": "json",
-                        "schema-source": "none"
+                        "firstName": "Werner",
+                        "lastName": "Mustermann",
+                        "contact": {
+                          "telephone": [
+                            {
+                              "number": "+49 89 32168-42",
+                              "mobile": false,
+                              "description": "Dienstliches Festnetz"
+                            }
+                          ]
+                        }
                       }
                     ],
                     "callback": {
-                      "callback-url": "https://www.example.com/callback"
+                      "callbackURI": "https://www.example.com/callback"
                     }
                   }
                 }
@@ -524,21 +498,24 @@
                   "example-1": {
                     "value": {
                       "applicationId": "7236",
-                      "additional-reference-info": {
+                      "additionalReferenceInfo": {
                         "subject": "Anmeldung eines Gewerbes in Musterstadt",
                         "caseId": "DF/8923"
                       },
-                      "content-structure": {
+                      "contentStructure": {
                         "data": {
-                          "mime-type": "json",
-                          "schemaId": "742"
+                          "size": 9438,
+                          "schema": {
+                            "mimeType": "json",
+                            "schemaSource": "none"
+                          }
                         },
                         "docs": [
                           {
                             "docId": "1",
                             "purpose": "form",
                             "size": 39273,
-                            "mime": "application/pdf",
+                            "mimeType": "application/pdf",
                             "filename": "antrag.pdf",
                             "description": "Das Antragsformular",
                             "lang": {
@@ -554,7 +531,7 @@
                             "docId": "2",
                             "purpose": "attachment",
                             "size": 894834874,
-                            "mime": "image/jpeg",
+                            "mimeType": "image/jpeg",
                             "filename": "scan.jpg",
                             "description": "Scan der Bescheinigung",
                             "hash": {
@@ -564,9 +541,10 @@
                           }
                         ]
                       },
-                      "public-service-type": {
+                      "publicServiceType": {
                         "name": "Gewerbeanmeldung",
                         "description": "Eine Gewerbeanmeldung ist immer dann notwendig, wenn Sie einen stehenden Gewerbebetrieb beginnen.",
+                        "leikaId": "99050012104000",
                         "otherIdentifiers": [
                           {
                             "id": "8664844",
@@ -578,33 +556,63 @@
                             "schemeURI": "buerger.thueringen.de",
                             "schemeName": "Zuständigkeitsfinder Thüringen"
                           }
-                        ],
-                        "leikaId": "99050012104000"
+                        ]
                       },
                       "applicants": [
                         {
-                          "person": {
-                            "form-of-address": "Herr",
-                            "academic-title": "Dr.",
-                            "first-name": "Werner",
-                            "last-name": "Mustermann"
-                          },
-                          "identification": {
-                            "authentication": {
-                              "assurance-level": "high",
-                              "authentification-method": "eID",
-                              "timestamp": "2020-03-03T12:38:23Z"
+                          "identifier": [
+                            {
+                              "id": "918",
+                              "schemeName": "Antragsportal",
+                              "schemeId": "urn:com:example:antragsportal:user"
+                            }
+                          ],
+                          "contactInfo": {
+                            "physicalAddress": {
+                              "street": "Kurzer Weg",
+                              "houseNumber": 7,
+                              "postalCode": "12345",
+                              "city": "string",
+                              "addressSupplement": "string"
                             },
-                            "authenticated-data": {
-                              "family-name": "MUSTERMANN",
-                              "given-name": "WERNER",
-                              "date-of-birth": "13091970",
-                              "place-of-resicence": {
-                                "street": "KURZER WEG 7",
-                                "postal-code": "12345",
-                                "city": "ANKH-MORPORK"
+                            "telephone": [
+                              {
+                                "number": "+49 89 32168-42",
+                                "mobile": true,
+                                "description": "string"
+                              }
+                            ],
+                            "electronicAddresses": [
+                              {
+                                "channelType": "Service-Account-Mailbox",
+                                "address": "string"
                               }
+                            ]
+                          },
+                          "identityInfo": {
+                            "gender": "m",
+                            "nationality": "string",
+                            "familyName": "string",
+                            "givenName": "string",
+                            "birthName": "string",
+                            "doctoralDegrees": "string",
+                            "artisticName": "string",
+                            "dateOfBirth": "2020-04-16",
+                            "placeOfBirth": "string",
+                            "placeOfResidence": {
+                              "street": "string",
+                              "houseNumber": null,
+                              "houseNumberSuffix": "st",
+                              "postalCode": "strin",
+                              "city": "string",
+                              "addressSupplement": "string"
                             }
+                          },
+                          "authentificationInfo": {
+                            "timestamp": "2020-04-16T06:50:39Z",
+                            "authentificationToken": {},
+                            "authentificationMethod": "string",
+                            "assuranceLevel": "low"
                           }
                         }
                       ],
@@ -808,21 +816,24 @@
                     "value": [
                       {
                         "applicationId": "7236",
-                        "additional-reference-info": {
+                        "additionalReferenceInfo": {
                           "subject": "Anmeldung eines Gewerbes in Musterstadt",
                           "caseId": "DF/8923"
                         },
-                        "content-structure": {
+                        "contentStructure": {
                           "data": {
-                            "schemaId": "742",
-                            "mime-type": "json"
+                            "size": 9438,
+                            "schema": {
+                              "mimeType": "json",
+                              "schemaSource": "none"
+                            }
                           },
                           "docs": [
                             {
                               "docId": "1",
                               "purpose": "form",
                               "size": 39273,
-                              "mime": "application/pdf",
+                              "mimeType": "application/pdf",
                               "filename": "antrag.pdf",
                               "description": "Das Antragsformular",
                               "lang": {
@@ -838,7 +849,7 @@
                               "docId": "2",
                               "purpose": "attachment",
                               "size": 894834874,
-                              "mime": "image/jpeg",
+                              "mimeType": "image/jpeg",
                               "filename": "scan.jpg",
                               "description": "Scan der Bescheinigung",
                               "hash": {
@@ -848,7 +859,7 @@
                             }
                           ]
                         },
-                        "public-service-type": {
+                        "publicServiceType": {
                           "name": "Gewerbeanmeldung",
                           "description": "Eine Gewerbeanmeldung ist immer dann notwendig, wenn Sie einen stehenden Gewerbebetrieb beginnen.",
                           "leikaId": "99050012104000",
@@ -867,28 +878,59 @@
                         },
                         "applicants": [
                           {
-                            "person": {
-                              "form-of-address": "Herr",
-                              "academic-title": "Dr.",
-                              "first-name": "Werner",
-                              "last-name": "Mustermann"
-                            },
-                            "identification": {
-                              "authentication": {
-                                "assurance-level": "high",
-                                "authentification-method": "eID",
-                                "timestamp": "2020-03-03T12:38:23Z"
+                            "identifier": [
+                              {
+                                "id": "918",
+                                "schemeName": "Antragsportal",
+                                "schemeId": "urn:com:example:antragsportal:user"
+                              }
+                            ],
+                            "contactInfo": {
+                              "physicalAddress": {
+                                "street": "Kurzer Weg",
+                                "houseNumber": 7,
+                                "postalCode": "12345",
+                                "city": "string",
+                                "addressSupplement": "string"
                               },
-                              "authenticated-data": {
-                                "family-name": "MUSTERMANN",
-                                "given-name": "WERNER",
-                                "date-of-birth": "13091970",
-                                "place-of-resicence": {
-                                  "street": "KURZER WEG 7",
-                                  "postal-code": "12345",
-                                  "city": "ANKH-MORPORK"
+                              "telephone": [
+                                {
+                                  "number": "+49 89 32168-42",
+                                  "mobile": true,
+                                  "description": "string"
+                                }
+                              ],
+                              "electronicAddresses": [
+                                {
+                                  "channelType": "Service-Account-Mailbox",
+                                  "address": "string"
                                 }
+                              ]
+                            },
+                            "identityInfo": {
+                              "gender": "m",
+                              "nationality": "string",
+                              "familyName": "string",
+                              "givenName": "string",
+                              "birthName": "string",
+                              "doctoralDegrees": "string",
+                              "artisticName": "string",
+                              "dateOfBirth": "2020-04-16",
+                              "placeOfBirth": "string",
+                              "placeOfResidence": {
+                                "street": "string",
+                                "houseNumber": null,
+                                "houseNumberSuffix": "st",
+                                "postalCode": "strin",
+                                "city": "string",
+                                "addressSupplement": "string"
                               }
+                            },
+                            "authentificationInfo": {
+                              "timestamp": "2020-04-16T06:50:39Z",
+                              "authentificationToken": {},
+                              "authentificationMethod": "string",
+                              "assuranceLevel": "low"
                             }
                           }
                         ],
@@ -995,36 +1037,27 @@
                 "examples": {
                   "example-1": {
                     "value": {
-                      "destinationId": "52",
-                      "organization": {
-                        "organization-name": "Umweltamt Ankh-Morpork",
-                        "address": {
-                          "street": "Kurzer Weg",
-                          "houseNr": "7",
-                          "postalCode": "12345",
-                          "city": "Ankh-Morpork"
-                        },
-                        "contact": {
-                          "telephone": {
-                            "number": "+49 89 32168-0",
-                            "type": "work"
-                          },
-                          "email": "behoerde@example.com"
-                        }
+                      "destination-id": "83578",
+                      "public-organization": {
+                        "organizationName": "Gewerbeamt Musterhausen"
                       },
-                      "technical-contact": {
-                        "formOfAddress": "Herr",
-                        "academicTitle": "Dr.",
-                        "firstName": "Kunibert",
-                        "lastName": "Vonundzu",
-                        "contact": {
-                          "telephone": {
-                            "number": "+49 89 32168-42",
-                            "mobile": "+49 123 456789",
-                            "type": "work"
-                          },
-                          "email": "kunibert.vonundzu@example.com"
+                      "technicalContact": [
+                        {
+                          "firstName": "Werner",
+                          "lastName": "Mustermann",
+                          "contact": {
+                            "telephone": [
+                              {
+                                "number": "+49 89 32168-42",
+                                "mobile": false,
+                                "description": "Dienstliches Festnetz"
+                              }
+                            ]
+                          }
                         }
+                      ],
+                      "callback": {
+                        "callbackURI": "https://www.example.com/callback"
                       }
                     }
                   }
@@ -1147,27 +1180,27 @@
               "examples": {
                 "example-1": {
                   "value": {
-                    "destinationId": "83578",
-                    "organization": {
-                      "organization-name": "Gewerbeamt Musterhausen"
+                    "destination-id": "83578",
+                    "public-organization": {
+                      "organizationName": "Gewerbeamt Musterhausen"
                     },
-                    "technical-contact": [
+                    "technicalContact": [
                       {
-                        "first-name": "Werner",
-                        "last-name": "Mustermann",
+                        "firstName": "Werner",
+                        "lastName": "Mustermann",
                         "contact": {
                           "telephone": [
                             {
                               "number": "+49 89 32168-42",
                               "mobile": false,
-                              "type": "work"
+                              "description": "Dienstliches Festnetz"
                             }
                           ]
                         }
                       }
                     ],
                     "callback": {
-                      "callback-url": "https://www.example.com/callback"
+                      "callbackURI": "https://www.example.com/callback"
                     }
                   }
                 }
-- 
GitLab