Merge branch 'feature/model-update-v3' into feature/poc-consent-entity

.cruft.json

@@ -5,8 +5,8 @@
   "context": {
     "cookiecutter": {
       "project_name": "model",
-      "short_summary": "Conceptual and machine-readable versions of the MEx metadata model.",
-      "long_summary": "The `mex-model` repository contains the MEx metadata model in two formats. `/docs/specification.md` contains the conceptual model, which is mainly used to facilitate interoperability with other metadata schemas and models. `mex/model` holds the JSON schema, which represents the conceptual model in a format that can be used for technical implementation in applications.",
+      "short_summary": "JSON schema files defining the MEx metadata model.",
+      "long_summary": "Our metadata model is represented as JSON schema in `mex/model`. There, we defined 1. `entities`, described by their properties, 2. `fields`, small objects, that are used as `$ref` for certain properties, 3. an `extension`, which contains additional properties, that are not in scope of the JSON schema definition, 4. `i18n` files, that hold translations of the properties and are to be used in the context of user interfaces and 5. `vocabularies`, which are used in context of the `entities`. A more detailed description of the model's context can be found in `/docs/index.md` ",
       "_template": "https://github.com/robert-koch-institut/mex-template"
     }
   },

.github/workflows/renovatebot.yml

@@ -22,7 +22,7 @@ jobs:
           fetch-depth: 1
 
       - name: Run renovatebot
-        uses: renovatebot/[email protected].5
+        uses: renovatebot/[email protected].7
         env:
           RENOVATE_GIT_PRIVATE_KEY: ${{ secrets.GPG_SIGNING_KEY }}
           RENOVATE_REPOSITORIES: "robert-koch-institut/mex-model"

mex/model/entities/concept.json

@@ -69,6 +69,16 @@
             ],
             "type": "string"
         },
+        "note": {
+            "default": [],
+            "items": {
+                "$ref": "/schema/fields/text"
+            },
+            "sameAs": [
+                "http://www.w3.org/2004/02/skos/core#note"
+            ],
+            "type": "array"
+        },
         "prefLabel": {
             "items": {
                 "$ref": "/schema/fields/text"
@@ -83,7 +93,6 @@
     "required": [
         "identifier",
         "inScheme",
-        "notation",
         "prefLabel"
     ],
     "sameAs": [

mex/model/entities/resource.json

@@ -361,7 +361,7 @@
                     "https://loinc.org/LA26211-5"
                 ],
                 "format": "uri",
-                "pattern": "^https://loinc.org/([a-zA-z]*)|(([0-9]{5}-[0-9]*))$",
+                "pattern": "^https://loinc.org/([a-zA-z]*)|(([0-9]*(-[0-9])*))$",
                 "type": "string"
             },
             "type": "array"

requirements.txt

@@ -1,5 +1,5 @@
 cruft==2.15.0
 mex-release @ git+https://github.com/robert-koch-institut/mex-release.git
-pdm==2.17.3
+pdm==2.18.1
 pre-commit==3.8.0
 wheel==0.44.0