Tc 4.0.1

.github/PULL_REQUEST_TEMPLATE/PR_Template_VersionUpgrade.md

@@ -7,37 +7,33 @@ Date:
 
 ## Description
 <!--- CAVEAT: You to be an admin to perform all the necessary jobs. -->
-This is a Pullreuqest that requires an increase in the Version number. Therefore, multiple outside-github, related Task have to be performed and checked.
+This is a Pullrequest that requires an increase in the Version number. Therefore, multiple outside-github, related Task have to be performed and checked.
 
 All jobs with an `x` in the boxes were performed to the best of knowledge.
 
 ## Pre-Merge Activities
 <!--- Lets check everything before we continue. -->
 - [ ] This PR refers to a versioned Branch with a name and a version number in the form of N.n.n, e.g. "TC_3.2.1".
 - [ ] This PR has a clean meaningful commit history. Minor commits or commits without description have been squashed, at the latest now.
-- [ ] The _./github/workflows/main.yml_ refers to the correct Firely Terminal and SUSHI Version. 
-    > **_Firely Terminal Pipeline_**  0.4.0.
-
-    > **_SUSHI Versions_**  3.5.0.
-- [ ] By running the _Release_Publish.py_ script, release version and date was updated accordingly. The script ran without errors.
-- [ ] Eventually, increase the dependency of to newer Basis Modul (package and sushi-config)
-- [ ] New Release Notes were created, alined to the commit history and cleaned. In Github, go to 
-  - [ ]  _-> Releases_ then _-> Draft a new release_ with the _Modul Name and Version_, then
-  - [ ] _-> Target the main-Branch_ and _->enter a new Tag according to the Version_, then click.
-  - [ ] Click _-> Generate Release notes_ , _->Adjust them if necessary_ and _-> Copy/Paste the Details in the RealeaseNotes.md_ of the very Branch you want to merge.
+- [ ] Eventually, increase the dependency of to newer Basis Modul and Basispofil-de and possibly others (package json and sushi-config)
+- [ ] Run Python script in terminal and increment version
+- [ ] New Release Notes were created, alined to the commit history. Possibly, if you want to check the release notes for completeness, check against automatic relesase note generation in GitHub. In Github, go to 
+  - [ ] _-> Releases_ then _-> Draft a new release_ with the _Modul Name and Version_, then
+  - [ ] _-> Target the main-Branch_ and _-> enter a new Tag according to the Version_, then click.
+  - [ ] Click _-> Generate Release notes_ , _-> Adjust them if necessary_ and _-> Copy/Paste the Details in the RealeaseNotes.md_ of the very Branch you want to merge.
   - [ ] Finally _-> Save as Draft_
 
 ## Merge and Publishing
 <!--- Now lets do the merge. -->
 <!--- Include details of your testing environment, especially -->
 - [ ] With the updated Version, Dates, and Release Notes (as described above) with the last committ into the Branch you want to merge.
-- [ ] In GitHub _-> Actions_ the _->CI (FHIR Validation)_ workflow terminates successfully.
+- [ ] In GitHub _-> Actions_ the _-> CI (FHIR Validation)_ workflow terminates successfully.
 - [ ] Add the Approve / the PR gets positively reviewed by a colleague.
 - [ ] Merge (without squash) the PR, delete the Branch.
 
 
 ## Post-Merge Activities
-<!--- Do some update, refreshe and cleanup of related resources. -->
+<!--- Do some update, refresh and cleanup of related resources. -->
 
 - [ ] Go to the corresponding SIMPLIFIER Project and _-> Github -> Reimport_ the project.
 - [ ] Go to the corresponding SIMPLIFIER Project and _-> Packages -> Expand the Dropdown for Create -> Create new package_ for the project.
@@ -46,10 +42,10 @@ All jobs with an `x` in the boxes were performed to the best of knowledge.
   - [ ] Unlist the old package by _-> clicking on the old package_, _-> go to Administration_ and _-> click on Unlist_
 - [ ] Publish the previously drafted Release, including version number, on GitHub.
 - [ ] Provide / Archive the IG in the corresponding _gh-pages_ branch of the GitHub project.
-  - [ ] Checkout the Branch (no need to merge it later).
+  - [ ] Checkout the Branch (no need to merge it later). 
   - [ ] Export from Simplifier via _-> Guides -> Expand the Modul ... -> Export_
   - [ ] Unpack the zip, remove the packages folder (because its kinda big), and move everything else to a (version corresponding) new folder in the branch folder structure.
-  - [ ] Update the file index.html and check rendering
+  - [ ] Update the file index.html and check rendering.
   - [ ] commit the branch.
 - [ ] If ISiK Basismodul was updated all depending Modules should be updated  with a renewed dependency to the incremented Basismodul version - possibly including and closing technical corrections
 

.github/workflows/ToolUpdate.yml

@@ -0,0 +1,87 @@
+name: Update Dependency
+
+on: # Trigger on commits to any branch and manual trigger
+    workflow_dispatch: # Allows manual trigger  
+    push:
+        branches:
+        - '**' # Trigger on commits to any branch
+    schedule:
+      - cron: '0 0 * * *' # Runs at 00:00 UTC every day
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  update-dependency:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+      with:
+        token: ${{ secrets.WORKFLOW_PERMISSION_GITHUB }} # Personal access token with workflow permissions
+
+    - name: Set up jq
+      run: sudo apt-get install jq
+
+    - name: Fetch latest version of firely terminal dependency
+      id: fetch_version_firely
+      run: |
+        # Fetch the latest version from the FirelyTeam/firely-terminal-pipeline GitHub repository
+        LATEST_VERSION_FIRELY=$(curl -s https://api.github.com/repos/FirelyTeam/firely-terminal-pipeline/releases/latest | jq -r .tag_name)
+        echo "LATEST_VERSION_FIRELY=$LATEST_VERSION_FIRELY" >> $GITHUB_ENV
+        echo $LATEST_VERSION_FIRELY 
+
+    - name: Fetch latest version of Sushi dependency
+      id: fetch_version_sushi
+      run: |
+        # Fetch the latest version from the fhir/sushi GitHub repository
+        LATEST_VERSION_SUSHI=$(curl -s https://api.github.com/repos/FHIR/sushi/releases/latest | jq -r .tag_name | sed 's/^v//')
+        echo "LATEST_VERSION_SUSHI=$LATEST_VERSION_SUSHI" >> $GITHUB_ENV
+        echo $LATEST_VERSION_SUSHI
+
+
+    # TODO add an if statement to prevent the workflow from running if the version is the same as the one in the main.yml file
+
+
+    - name: Update main.yml for Firely and Sushi
+      run: |
+        # Update the main.yml file with the new versions of Firely and Sushi
+        sed -i "s|uses: FirelyTeam/firely-terminal-pipeline@.*|uses: FirelyTeam/firely-terminal-pipeline@$LATEST_VERSION_FIRELY|" .github/workflows/main.yml
+        sed -i "s|SUSHI_VERSION: .*|SUSHI_VERSION: $LATEST_VERSION_SUSHI|" .github/workflows/main.yml
+
+    - name: Commit changes
+      env:
+        GITHUB_TOKEN: ${{ github.token }}
+      run: |
+        # Commit the changes
+        git config --global user.name 'github-actions[bot]'
+        git config --global user.email 'github-actions[bot]@users.noreply.github.com'
+        git checkout -b update-dependency-${LATEST_VERSION_FIRELY}-${LATEST_VERSION_SUSHI} || git checkout update-dependency-${LATEST_VERSION_FIRELY}-${LATEST_VERSION_SUSHI}
+        git add .github/workflows/main.yml
+        git commit -m "Update dependencies to versions Firely: ${LATEST_VERSION_FIRELY}, Sushi: ${LATEST_VERSION_SUSHI}"
+        git push https://x-access-token:${{ secrets.WORKFLOW_PERMISSION_GITHUB }}@github.com/${{ github.repository }}.git update-dependency-${LATEST_VERSION_FIRELY}-${LATEST_VERSION_SUSHI}
+
+    - name: Create Pull Request
+      uses: actions/github-script@v6
+      with:
+        script: |
+            const latestVersionFirely = process.env.LATEST_VERSION_FIRELY;
+            const latestVersionSushi = process.env.LATEST_VERSION_SUSHI;
+            if (!latestVersionFirely || !latestVersionSushi) {
+              throw new Error('Versions are not defined');
+            }
+            const prTitle = `Update dependencies to versions Firely: ${latestVersionFirely}, Sushi: ${latestVersionSushi}`;
+            const prHead = `update-dependency-${latestVersionFirely}-${latestVersionSushi}`;
+            const prBody = `This PR updates the dependencies to versions Firely: ${latestVersionFirely} and Sushi: ${latestVersionSushi}.`;
+            const { data: pullRequest } = await github.rest.pulls.create({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              title: prTitle,
+              head: prHead,
+              base: context.ref.replace('refs/heads/', ''),
+              body: prBody,
+              maintainer_can_modify: true,
+            });
+            console.log(`Created pull request: ${pullRequest.html_url}`);

.github/workflows/main.yml

@@ -13,6 +13,14 @@ on:
   pull_request:
     branches:
     - 'main**'
+  workflow_call:
+    secrets:
+      SIMPLIFIER_USERNAME:
+        required: true
+      SIMPLIFIER_PASSWORD:
+        required: true
+      WORKFLOW_PERMISSION_GITHUB:
+        required: true
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
@@ -33,7 +41,7 @@ jobs:
       # Java and .NET are already installed on ubuntu-latest
 
       - name: Firely.Terminal (GitHub Actions)
-        uses: FirelyTeam/[email protected].1
+        uses: FirelyTeam/[email protected].3
         with:
           PATH_TO_CONFORMANCE_RESOURCES: Resources/fsh-generated/resources/
           #PATH_TO_EXAMPLES: Examples
@@ -46,7 +54,7 @@ jobs:
           SIMPLIFIER_PASSWORD: ${{ secrets.SIMPLIFIER_PASSWORD }}
           SUSHI_ENABLED: true
           SUSHI_OPTIONS: Resources/
-          SUSHI_VERSION: 3.8.0
+          SUSHI_VERSION: 3.12.0
           EXPECTED_FAILS: VALIDATION_CONFORMANCE_DOTNET VALIDATION_CONFORMANCE_JAVA VALIDATION_EXAMPLES_JAVA
 
       - name: Add & Commit

.gitignore

@@ -8,6 +8,11 @@ Thumbs.db:encryptable
 ehthumbs.db
 ehthumbs_vista.db
 
+# Ignore specific fsh-index files
+fsh-index.json
+fsh-index.json.lock
+fsh-index.txt
+
 # Dump file
 *.stackdump
 

ImplementationGuide/Implementierungsleitfaden_ISiKBasismodul.json

@@ -1,7 +1,7 @@
 {
   "resourceType": "ImplementationGuide",
   "url": "https://gematik.de/fhir/isik/ImplementationGuide/ISiK-Basismodul",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "name": "Implementierungsleitfaden ISiK-Basismodul",
   "status": "active",
   "fhirVersion": [

ImplementationGuide/markdown/Einfuehrung.md

@@ -1,9 +1,9 @@
 <img src="https://raw.githubusercontent.com/gematik/spec-ISiK-Basismodul/main-isik-stufe-3/Material/images/Gematik_Logo_Flag.svg" alt="gematik logo" width="400"/>
 
 ----
-Version: 4.0.0
+Version: 4.0.1
 
-Datum: 19.07.2024
+Datum: 06.11.2024
 
 Status: Active
 

ImplementationGuide/markdown/ReleaseNotes.md

@@ -4,6 +4,14 @@ Im Rahmen der ISiK-Veröffentlichungen wird das [Semantic Versioning](https://se
 
 Die erste Ziffer X bezeichnet ein Major-Release und regelt die Gültigkeit von Releases. Die dritte Ziffer Y (Release x.0.y) bezeichnet eine technische Korrektur und versioniert kleinere Änderungen (Packages) während eines Jahres, z. B. 1.0.1.
 
+Version: 4.0.1
+* Fixed CapabilityStatement *near* SearchParameter type & ResourceType Organization spelling, removed custom backport Extension - switched to the official backport mechanism, fixed Bindings to CodeSystems    https://github.com/gematik/spec-ISiK-Basismodul/commit/ ae706142832e2059046ce978c4b0dc472c2375e6
+* Hinweis zur Handhabung von leeren Elementen und einem :not-Modifier hinzugefügt https://github.com/gematik/spec-ISiK-Basismodul/pull/473
+
+Datum: tbd
+
+----
+
 Version: 4.0.0
 
 Datum: 30.8.2024

ImplementationGuide/markdown/UebergreifendeFestlegungen/UebergreifendeFestlegungen_Suchparameter.md

@@ -54,7 +54,7 @@ Diese Suchanfrage gibt alle Patienten zurück zum Client, welche in einem Adress
 
 ### Token
 
-Der Modifier `:not` MUSS für alle spezifizierten Suchparameter vom Typ 'Token' unterstützt werden, sofern diese auf die Datentypen "code", "Coding" oder "CodeableConcept" verwendet werden.
+Der Modifier `:not` MUSS für alle spezifizierten Suchparameter vom Typ 'Token' unterstützt werden, sofern diese auf die Datentypen "code", "Coding" oder "CodeableConcept" verwendet werden. Bei einer Suche mit dem ":not"-Modifier MÜSSEN Ressourcen, die keinen Wert für das Element des Suchparameters enthalten, im Suchergebnis enthalten sein.
 
 Der Modifier `:text` MUSS für alle spezifizierten Suchparameter vom Typ 'Token' unterstützt werden, sofern diese auf die Datentypen "Coding" oder "CodeableConcept" verwendet werden.