Merge pull request #120 from gematik/feat/apo-vzd-minimal

Patch 0.11.1 (EndpointVisibilityExtension Fix)

.github/workflows/FHIRValidator.yml

@@ -1,15 +1,14 @@
 # This is a basic workflow to help you get started with Actions
 
-name: FHIRValidator
+name: CI (FHIR Validation)
 
+# Controls when the action will run.
 on:
+  # Triggers the workflow on all push or pull request events but only for the main branches
   push:
-    branches:
-      - main
-      - 'feature/**'
-    paths: 
-      - 'src/fhir/**'
-      - 'package.json'
+    branches: [ main* ]
+  pull_request:
+    branches: [ main* ]
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
@@ -30,7 +29,7 @@ jobs:
       # Java and .NET are already installed on ubuntu-latest
 
       - name: Firely.Terminal (GitHub Actions)
-        uses: FirelyTeam/firely-terminal-pipeline@v0.3.5
+        uses: FirelyTeam/firely-terminal-pipeline@v0.4.1
         with:
           PATH_TO_CONFORMANCE_RESOURCES: src/fhir/fsh-generated/resources/
           #PATH_TO_EXAMPLES: Examples
@@ -43,9 +42,9 @@ jobs:
           SIMPLIFIER_PASSWORD: ${{ secrets.SIMPLIFIER_PASSWORD }}
           SUSHI_ENABLED: true
           SUSHI_OPTIONS: src/fhir/
+          SUSHI_VERSION: 3.8.0
           EXPECTED_FAILS: VALIDATION_CONFORMANCE_DOTNET VALIDATION_CONFORMANCE_JAVA VALIDATION_EXAMPLES_JAVA
 
-      - name: Add & Commit
-        uses: EndBug/add-and-commit@v7
-        with:
-          add: 'src/fhir/fsh-generated/resources/'
+      - name: Check for Uncommitted Changes
+        run: |
+          git diff --exit-code 'src/fhir/fsh-generated/resources'|| (echo "Es gibt Änderungen durch die Pipeline. Lokale Sushi Konfiguration prüfen!" && exit 1)

.gitignore

@@ -4,3 +4,151 @@ src/fhir/temp
 src/fhir/template
 src/fhir/input-cache
 *.bkp
+### JetBrains template
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf
+
+# AWS User-specific
+.idea/**/aws.xml
+
+# Generated files
+.idea/**/contentModel.xml
+
+# Sensitive or high-churn files
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
+
+# Gradle
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# Gradle and Maven with auto-import
+# When using Gradle or Maven with auto-import, you should exclude module files,
+# since they will be recreated, and may cause churn.  Uncomment if using
+# auto-import.
+# .idea/artifacts
+# .idea/compiler.xml
+# .idea/jarRepositories.xml
+# .idea/modules.xml
+# .idea/*.iml
+# .idea/modules
+# *.iml
+# *.ipr
+
+# CMake
+cmake-build-*/
+
+# Mongo Explorer plugin
+.idea/**/mongoSettings.xml
+
+# File-based project format
+*.iws
+
+# IntelliJ
+out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# SonarLint plugin
+.idea/sonarlint/
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+# Editor-based Rest Client
+.idea/httpRequests
+
+# Android studio 3.1+ serialized cache file
+.idea/caches/build_file_checksums.ser
+
+### Linux template
+*~
+
+# temporary files which can be created if a process still has a handle open of a deleted file
+.fuse_hidden*
+
+# KDE directory preferences
+.directory
+
+# Linux trash folder which might appear on any partition or disk
+.Trash-*
+
+# .nfs files are created when an open file is removed but is still being accessed
+.nfs*
+
+### Windows template
+# Windows thumbnail cache files
+Thumbs.db
+Thumbs.db:encryptable
+ehthumbs.db
+ehthumbs_vista.db
+
+# Dump file
+*.stackdump
+
+# Folder config file
+[Dd]esktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msix
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk
+
+### macOS template
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+

package.json

@@ -1,12 +1,14 @@
 {
   "name": "de.gematik.fhir.directory",
-  "version": "0.11.0",
+  "version": "0.11.1",
   "author": "gematik GmbH",
   "description": "Package Release des gematik FHIR Directory",
   "fhirVersions": [
     "4.0.1"
   ],
   "dependencies": {
-    "de.basisprofil.r4": "1.4.0"
+    "de.basisprofil.r4": "1.5.0-ballot2",
+    "de.ihe-d.terminology": "3.0.0"
+
   }
 }

src/fhir/fsh-generated/fsh-index.json

@@ -37,7 +37,7 @@
     "fshType": "CodeSystem",
     "fshFile": "codesystems/OrganizationProfessionOID.fsh",
     "startLine": 1,
-    "endLine": 66
+    "endLine": 70
   },
   {
     "outputFile": "CodeSystem-OrganizationProviderType.json",
@@ -85,7 +85,7 @@
     "fshType": "CodeSystem",
     "fshFile": "codesystems/PractitionerProfessionOID.fsh",
     "startLine": 1,
-    "endLine": 43
+    "endLine": 45
   },
   {
     "outputFile": "CodeSystem-Region.json",
@@ -279,14 +279,6 @@
     "startLine": 1,
     "endLine": 7
   },
-  {
-    "outputFile": "ValueSet-IHEXDShealthcareFacilityTypeCodePatientRelatedHealthcare.json",
-    "fshName": "IHEXDShealthcareFacilityTypeCodePatientRelatedHealthcare",
-    "fshType": "ValueSet",
-    "fshFile": "valuesets/HealthCareServiceCategory.fsh",
-    "startLine": 3,
-    "endLine": 62
-  },
   {
     "outputFile": "ValueSet-OrganizationProfessionOIDTypeVS.json",
     "fshName": "OrganizationProfessionOIDTypeVS",