From cc4fdacb013cd898c781a72537f36dc52e19d882 Mon Sep 17 00:00:00 2001
From: Andreas Huber <anh@fjd.de>
Date: Mon, 30 Mar 2020 15:17:38 +0200
Subject: [PATCH] id-string.json entfernt

---
 models/application/document.json       | 4 +---
 models/application/metadata-no-id.json | 9 +++------
 models/application/metadata.json       | 4 +---
 models/common/id-string.json           | 7 -------
 models/destination.json                | 4 +---
 reference/sender.json                  | 4 +---
 6 files changed, 7 insertions(+), 25 deletions(-)
 delete mode 100644 models/common/id-string.json

diff --git a/models/application/document.json b/models/application/document.json
index ceed4ed2..ba845ce1 100644
--- a/models/application/document.json
+++ b/models/application/document.json
@@ -35,9 +35,7 @@
   "properties": {
     "doc-id": {
       "type": "string",
-      "pattern": {
-        "$ref": "../common/id-string.json#/pattern"
-      },
+      "pattern": "^[-_.A-Za-z0-9]+$",
       "description": "ID des Dokuments. Diese muss nur innerhalb des Antrags (Application) eindeutig sein. Es wird daher empfohlen, die IDs fortlaufend (1, 2 etc.) zu vergeben."
     },
     "purpose": {
diff --git a/models/application/metadata-no-id.json b/models/application/metadata-no-id.json
index 654a6414..350ddbdb 100644
--- a/models/application/metadata-no-id.json
+++ b/models/application/metadata-no-id.json
@@ -120,15 +120,12 @@
         "data": {
           "type": "object",
           "required": [
-            "schema-id",
+            "schema",
             "mime-type"
           ],
           "properties": {
-            "schema-id": {
-              "type": "string",
-              "pattern": {
-                "$ref": "../common/id-string.json#/pattern"
-              }
+            "schema": {
+              "$ref": "./schema.json"
             },
             "mime-type": {
               "type": "string",
diff --git a/models/application/metadata.json b/models/application/metadata.json
index 7ebc7b6d..be404f05 100644
--- a/models/application/metadata.json
+++ b/models/application/metadata.json
@@ -6,9 +6,7 @@
       "properties": {
         "application-id": {
           "type": "string",
-          "pattern": {
-            "$ref": "../common/id-string.json#/pattern"
-          },
+          "pattern": "^[-_.A-Za-z0-9]+$",
           "description": "ID des Antrags"
         }
       },
diff --git a/models/common/id-string.json b/models/common/id-string.json
deleted file mode 100644
index 3c2a17e8..00000000
--- a/models/common/id-string.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "type": "string",
-  "title": "ID String",
-  "description": "Datentyp für IDs. Darf nur die Zeichen A-Z, a-z, 0-9 sowie Bindestrich (-), Unterstrich (_) und Punkt (.) enthalten.\n",
-  "example": "JB007",
-  "pattern": "^[-_.A-Za-z0-9]+$"
-}
\ No newline at end of file
diff --git a/models/destination.json b/models/destination.json
index 96186fd0..2c9bf053 100644
--- a/models/destination.json
+++ b/models/destination.json
@@ -6,9 +6,7 @@
       "properties": {
         "destination-id": {
           "description": "Vom Zustelldienst für dieses Ziel vergebene ID. Wird beim Anlegen eines neuen Ziels leer gelassen.",
-          "pattern": {
-            "$ref": "./common/id-string.json#/pattern"
-          },
+          "pattern": "^[-_.A-Za-z0-9]+$",
           "type": "string"
         }
       },
diff --git a/reference/sender.json b/reference/sender.json
index fd2d832f..b53c4b9e 100644
--- a/reference/sender.json
+++ b/reference/sender.json
@@ -437,9 +437,7 @@
                         "properties": {
                           "doc-id": {
                             "type": "string",
-                            "pattern": {
-                              "$ref": "../models/common/id-string.json#/pattern"
-                            },
+                            "pattern": "^[-_.A-Za-z0-9]+$",
                             "description": "ID des Dokuments. Diese muss nur innerhalb des Antrags (Application) eindeutig sein. Es wird daher empfohlen, die IDs fortlaufend (1, 2 etc.) zu vergeben."
                           },
                           "status": {
-- 
GitLab