From 562ca4973419217846ad696189a6c060844f0ecf Mon Sep 17 00:00:00 2001
From: southeo <soulaine.theo@gmail.com>
Date: Mon, 26 Feb 2024 16:08:08 +0100
Subject: [PATCH] properties elem

---
 .../0.1.0/mapping/schema/mapping.json         | 12 ++++++----
 .../0.1.0/mas/schema/mas-request.json         | 12 ++++++----
 .../fdo-profiles/0.1.0/mas/schema/mas.json    | 12 ++++++----
 .../schema/organisation-request.json          | 16 +++++++------
 .../organisation/schema/organisation.json     | 24 ++++++++++---------
 5 files changed, 43 insertions(+), 33 deletions(-)

diff --git a/data-model/fdo-profiles/0.1.0/mapping/schema/mapping.json b/data-model/fdo-profiles/0.1.0/mapping/schema/mapping.json
index 6c34228..2f23801 100644
--- a/data-model/fdo-profiles/0.1.0/mapping/schema/mapping.json
+++ b/data-model/fdo-profiles/0.1.0/mapping/schema/mapping.json
@@ -2,16 +2,18 @@
   "$id": "https://schemas.dissco.tech/schemas/fdo-profiles/0.1.0/mapping.json",
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "description": "FDO Profile for mapping from source data standard to DiSSCo data model",
-  "$comment":"FDO Profile Version 0.1.0",
+  "$comment": "FDO Profile Version 0.1.0",
   "allof": [
     {
       "$ref": "https://schemas.dissco.tech/schemas/fdo-profiles/0.1.0/handle-kernel.json"
     }
   ],
-  "sourceDataStandard": {
-    "type": "string",
-    "description": "Indicates standard source data adheres to, such as \"dwc\" or \"abcd\"",
-    "$comment": "idx = 30"
+  "properties": {
+    "sourceDataStandard": {
+      "type": "string",
+      "description": "Indicates standard source data adheres to, such as \"dwc\" or \"abcd\"",
+      "$comment": "idx = 30"
+    }
   },
   "additionalProperties": false,
   "required": [
diff --git a/data-model/fdo-profiles/0.1.0/mas/schema/mas-request.json b/data-model/fdo-profiles/0.1.0/mas/schema/mas-request.json
index 570afd5..b0f42d1 100644
--- a/data-model/fdo-profiles/0.1.0/mas/schema/mas-request.json
+++ b/data-model/fdo-profiles/0.1.0/mas/schema/mas-request.json
@@ -2,16 +2,18 @@
   "$id": "https://schemas.dissco.tech/schemas/fdo-profiles/0.1.0/mas-request.json",
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "description": "FDO Profile requests to PID API for Machine Annotation Services",
-  "$comment":"FDO Profile Version 0.1.0",
+  "$comment": "FDO Profile Version 0.1.0",
   "allof": [
     {
       "$ref": "https://schemas.dissco.tech/schemas/fdo-profiles/0.1.0/handle-request.json"
     }
   ],
-  "masName": {
-    "type": "string",
-    "description": "Name of Machine Annotation Service",
-    "$comment": "idx = 604"
+  "properties": {
+    "masName": {
+      "type": "string",
+      "description": "Name of Machine Annotation Service",
+      "$comment": "idx = 604"
+    }
   },
   "additionalProperties": false,
   "required": [
diff --git a/data-model/fdo-profiles/0.1.0/mas/schema/mas.json b/data-model/fdo-profiles/0.1.0/mas/schema/mas.json
index da7d923..25105f7 100644
--- a/data-model/fdo-profiles/0.1.0/mas/schema/mas.json
+++ b/data-model/fdo-profiles/0.1.0/mas/schema/mas.json
@@ -2,16 +2,18 @@
   "$id": "https://schemas.dissco.tech/schemas/fdo-profiles/0.1.0/mas.json",
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "description": "FDO Profile for Machine Annotation Services",
-  "$comment":"FDO Profile Version 0.1.0",
+  "$comment": "FDO Profile Version 0.1.0",
   "allof": [
     {
       "$ref": "https://schemas.dissco.tech/schemas/fdo-profiles/0.1.0/handle-kernel.json"
     }
   ],
-  "masName": {
-    "type": "string",
-    "description": "Name of Machine Annotation Service",
-    "$comment": "idx = 604"
+  "properties": {
+    "masName": {
+      "type": "string",
+      "description": "Name of Machine Annotation Service",
+      "$comment": "idx = 604"
+    }
   },
   "additionalProperties": false,
   "required": [
diff --git a/data-model/fdo-profiles/0.1.0/organisation/schema/organisation-request.json b/data-model/fdo-profiles/0.1.0/organisation/schema/organisation-request.json
index 992dbe9..7a714c0 100644
--- a/data-model/fdo-profiles/0.1.0/organisation/schema/organisation-request.json
+++ b/data-model/fdo-profiles/0.1.0/organisation/schema/organisation-request.json
@@ -8,13 +8,15 @@
       "$ref": "https://schemas.dissco.tech/schemas/fdo-profiles/0.1.0/handle-request.json"
     }
   ],
-  "organisationIdentifier": {
-    "type": "string",
-    "$comment": "idx = 800"
-  },
-  "organisationIdentifierType": {
-    "type": "string",
-    "$comment": "idx = 801"
+  "properties": {
+    "organisationIdentifier": {
+      "type": "string",
+      "$comment": "idx = 800"
+    },
+    "organisationIdentifierType": {
+      "type": "string",
+      "$comment": "idx = 801"
+    }
   },
   "additionalProperties": false,
   "required": [
diff --git a/data-model/fdo-profiles/0.1.0/organisation/schema/organisation.json b/data-model/fdo-profiles/0.1.0/organisation/schema/organisation.json
index e6db519..35635cf 100644
--- a/data-model/fdo-profiles/0.1.0/organisation/schema/organisation.json
+++ b/data-model/fdo-profiles/0.1.0/organisation/schema/organisation.json
@@ -8,17 +8,19 @@
       "$ref": "https://schemas.dissco.tech/schemas/fdo-profiles/0.1.0/handle-kernel.json"
     }
   ],
-  "organisationIdentifier": {
-    "type": "string",
-    "$comment": "idx = 800"
-  },
-  "organisationIdentifierType": {
-    "type": "string",
-    "$comment": "idx = 801"
-  },
-  "organisationName": {
-    "type": "string",
-    "$comment": "idx = 802"
+  "properties": {
+    "organisationIdentifier": {
+      "type": "string",
+      "$comment": "idx = 800"
+    },
+    "organisationIdentifierType": {
+      "type": "string",
+      "$comment": "idx = 801"
+    },
+    "organisationName": {
+      "type": "string",
+      "$comment": "idx = 802"
+    }
   },
   "additionalProperties": false,
   "required": [