Skip to content

Commit

Permalink
Merge pull request #131 from gematik/TC_2.0.3
Browse files Browse the repository at this point in the history
* add version update workflow + script

* auto-generated file update of TC version by GitHub Actions

* update BAsis ISiK dependency to wildcard

* rm MS-Flag (#132)

* rm MS-Flag

* update releasenotes

* Commit from GitHub Actions (CI (FHIR Validation))

---------

Co-authored-by: f-peverali <[email protected]>

* update firely terminal and sushi version

* Commit from GitHub Actions (CI (FHIR Validation))

---------

Co-authored-by: f-peverali <[email protected]>
  • Loading branch information
f-peverali and f-peverali authored Jul 3, 2024
2 parents 902c82f + 948356a commit 46eecdc
Show file tree
Hide file tree
Showing 21 changed files with 277 additions and 52 deletions.
39 changes: 39 additions & 0 deletions .github/workflows/TC-version-update.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: TC version update

# Controls when the action will run.
on:
push:
branches:
- 'TC-*'
- 'TC_*'

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

# setup python and run script
jobs:
build:
runs-on: ubuntu-latest
steps:
- name: checkout repo content
uses: actions/checkout@v2 # checkout the repository content

- name: setup python
uses: actions/setup-python@v4
with:
python-version: '3.10' # install the python version needed

- name: install python packages
run: |
python -m pip install --upgrade pip
pip install pyyaml
- name: execute py script # run main.py
run: python ./scripts/release_publish.py -b

- name: Add & Commit
uses: EndBug/add-and-commit@v9
with:
committer_name: GitHub Actions Bot
committer_email: [email protected]
message: auto-generated file update of TC version by GitHub Actions
3 changes: 2 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,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: Resources/fsh-generated/resources/
#PATH_TO_EXAMPLES: Examples
Expand All @@ -42,6 +42,7 @@ jobs:
SIMPLIFIER_PASSWORD: ${{ secrets.SIMPLIFIER_PASSWORD }}
SUSHI_ENABLED: true
SUSHI_OPTIONS: Resources/
SUSHI_VERSION: 3.9.0
EXPECTED_FAILS: VALIDATION_CONFORMANCE_DOTNET VALIDATION_CONFORMANCE_JAVA VALIDATION_EXAMPLES_JAVA

- name: Add & Commit
Expand Down
4 changes: 2 additions & 2 deletions ImplementationGuide/markdown/Einfuehrung.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<img src="https://raw.githubusercontent.com/gematik/spec-ISiK-Basismodul/master-isik-stufe-2/Material/Gematik_Logo_Flag.png" alt="gematik logo" width="400"/>

----
Version: 2.0.2
Version: 2.0.3

Datum: 31.01.2023
Datum: 03.07.2024

Status: Aktiv

Expand Down
4 changes: 3 additions & 1 deletion ImplementationGuide/markdown/ReleaseNotes.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,11 @@ Die erste Ziffer X bezeichnet ein Major-Release und regelt die Gültigkeit von R
----
Version: 2.0.3

Datum: tbd
Datum: 03.07.2024

- Entfernen von MS von MedicationStatement.partOf (Analog in Stufe 4.0.0-rc2) https://github.com/gematik/spec-ISiK-Medikation/pull/132
- Korrektur des Beispiels: ExampleISiKMedikationsListe.encounter, verweist jetzt korrekt auf einen Abteilungskontakt-Encounter https://github.com/gematik/spec-ISiK-Medikation/pull/128

----
Version: 2.0.2

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
"url": "https://gematik.de/fhir/isik/v2/Medikation/CapabilityStatement/medikation-server/information",
"status": "active",
"experimental": false,
"version": "2.0.2",
"version": "2.0.3",
"publisher": "gematik GmbH",
"date": "2023-01-31",
"date": "2024-07-03",
"implementationGuide": [
"https://gematik.de/fhir/isik/v2/Medikation/ImplementationGuide|2.0.2"
"https://gematik.de/fhir/isik/v2/Medikation/ImplementationGuide|2.0.3"
],
"name": "ISiKCapabilityStatementMedikationInformation",
"title": "ISiK CapabilityStatement Medikation Server - Medikationsinformation",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
"url": "https://gematik.de/fhir/isik/v2/Medikation/CapabilityStatement/medikation-server/verabreichung",
"status": "active",
"experimental": false,
"version": "2.0.2",
"version": "2.0.3",
"publisher": "gematik GmbH",
"date": "2023-01-31",
"date": "2024-07-03",
"implementationGuide": [
"https://gematik.de/fhir/isik/v2/Medikation/ImplementationGuide|2.0.2"
"https://gematik.de/fhir/isik/v2/Medikation/ImplementationGuide|2.0.3"
],
"name": "ISiKCapabilityStatementMedikationVerabreichung",
"title": "ISiK CapabilityStatement Medikation Server - Medikationsverabreichung",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
"url": "https://gematik.de/fhir/isik/v2/Medikation/CapabilityStatement/medikation-server/verordnung",
"status": "active",
"experimental": false,
"version": "2.0.2",
"version": "2.0.3",
"publisher": "gematik GmbH",
"date": "2023-01-31",
"date": "2024-07-03",
"implementationGuide": [
"https://gematik.de/fhir/isik/v2/Medikation/ImplementationGuide|2.0.2"
"https://gematik.de/fhir/isik/v2/Medikation/ImplementationGuide|2.0.3"
],
"name": "ISiKCapabilityStatementMedikationVerordnung",
"title": "ISiK CapabilityStatement Medikation Server - Medikationsverordnung",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
"resourceType": "StructureDefinition",
"id": "ISiKMedikament",
"url": "https://gematik.de/fhir/isik/v2/Medikation/StructureDefinition/ISiKMedikament",
"version": "2.0.2",
"version": "2.0.3",
"name": "ISiKMedikament",
"status": "active",
"experimental": false,
"date": "2023-01-31",
"date": "2024-07-03",
"publisher": "gematik GmbH",
"description": "Dieses Profil ermöglicht die Abbildung von patientenunabhängigen Informationen zu Medikamenten in ISiK Szenarien.",
"fhirVersion": "4.0.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
"resourceType": "StructureDefinition",
"id": "ISiKMedikationTransaction",
"url": "https://gematik.de/fhir/isik/v2/Medikation/StructureDefinition/ISiKMedikationTransaction",
"version": "2.0.2",
"version": "2.0.3",
"name": "ISiKMedikationTransaction",
"status": "active",
"experimental": false,
"date": "2023-01-31",
"date": "2024-07-03",
"publisher": "gematik GmbH",
"description": "Dieses Profil definiert die Transaktions-Bundles im Rahmen von ISiK-Medikations-Szenarien.",
"fhirVersion": "4.0.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
"resourceType": "StructureDefinition",
"id": "ISiKMedikationTransactionResponse",
"url": "https://gematik.de/fhir/isik/v2/Medikation/StructureDefinition/ISiKMedikationTransactionResponse",
"version": "2.0.2",
"version": "2.0.3",
"name": "ISiKMedikationTransactionResponse",
"status": "active",
"experimental": false,
"date": "2023-01-31",
"date": "2024-07-03",
"publisher": "gematik GmbH",
"description": "Dieses Profil definiert die Server-Antwort auf Transaktions-Bundles im Rahmen von ISiK-Medikations-Szenarien.",
"fhirVersion": "4.0.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
"resourceType": "StructureDefinition",
"id": "ISiKMedikationsInformation",
"url": "https://gematik.de/fhir/isik/v2/Medikation/StructureDefinition/ISiKMedikationsInformation",
"version": "2.0.2",
"version": "2.0.3",
"name": "ISiKMedikationsInformation",
"status": "active",
"experimental": false,
"date": "2023-01-31",
"date": "2024-07-03",
"publisher": "gematik GmbH",
"description": "Dieses Profil ermöglicht die Abbildung von Informationen zur Medikation eines Patienten in ISiK Szenarien.",
"fhirVersion": "4.0.1",
Expand All @@ -23,12 +23,6 @@
"short": "eindeutige ID der Ressource auf dem Server",
"mustSupport": true
},
{
"id": "MedicationStatement.partOf",
"path": "MedicationStatement.partOf",
"short": "Referenz auf andere Objekte, deren Bestandteil diese MedikationsInformation ist",
"mustSupport": true
},
{
"id": "MedicationStatement.status",
"path": "MedicationStatement.status",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
"resourceType": "StructureDefinition",
"id": "ISiKMedikationsListe",
"url": "https://gematik.de/fhir/isik/v2/Medikation/StructureDefinition/ISiKMedikationsListe",
"version": "2.0.2",
"version": "2.0.3",
"name": "ISiKMedikationsListe",
"status": "active",
"experimental": false,
"date": "2023-01-31",
"date": "2024-07-03",
"publisher": "gematik GmbH",
"description": "Dieses Profil ermöglicht die Zusammenführung einzelner MedikationsInformationen eines Patienten in ISiK Szenarien.",
"fhirVersion": "4.0.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
"resourceType": "StructureDefinition",
"id": "ISiKMedikationsVerabreichung",
"url": "https://gematik.de/fhir/isik/v2/Medikation/StructureDefinition/ISiKMedikationsVerabreichung",
"version": "2.0.2",
"version": "2.0.3",
"name": "ISiKMedikationsVerabreichung",
"status": "active",
"experimental": false,
"date": "2023-01-31",
"date": "2024-07-03",
"publisher": "gematik GmbH",
"description": "Dieses Profil ermöglicht die Abbildung der Verabreichung von Medikamenten für einen Patienten in ISiK Szenarien.",
"fhirVersion": "4.0.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
"resourceType": "StructureDefinition",
"id": "ISiKMedikationsVerordnung",
"url": "https://gematik.de/fhir/isik/v2/Medikation/StructureDefinition/ISiKMedikationsVerordnung",
"version": "2.0.2",
"version": "2.0.3",
"name": "ISiKMedikationsVerordnung",
"status": "active",
"experimental": false,
"date": "2023-01-31",
"date": "2024-07-03",
"publisher": "gematik GmbH",
"description": "Dieses Profil ermöglicht die Abbildung von Medikationsverordnungen eines Patienten in ISiK Szenarien.",
"fhirVersion": "4.0.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
"name": "SctRouteOfAdministration",
"id": "SctRouteOfAdministration",
"description": "Enthaelt alle SNOMED CT Administrationsarten",
"version": "2.0.2",
"url": "https://gematik.de/fhir/isik/v2/Medikation/ValueSet/SctRouteOfAdministration",
"experimental": false,
"publisher": "gematik GmbH",
"date": "2023-01-31",
"version": "2.0.3",
"date": "2024-07-03",
"compose": {
"include": [
{
Expand Down
2 changes: 0 additions & 2 deletions Resources/input/fsh/ISiKMedikationsInformation.fsh
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ Description: "Dieses Profil ermöglicht die Abbildung von Informationen zur Medi
* insert Meta
* id MS
* ^short = "eindeutige ID der Ressource auf dem Server"
* partOf MS
* ^short = "Referenz auf andere Objekte, deren Bestandteil diese MedikationsInformation ist"
* status MS
* ^short = "Status der Medikationsinformation"
* medication[x] MS
Expand Down
22 changes: 11 additions & 11 deletions Resources/input/fsh/ruleset.fsh
Original file line number Diff line number Diff line change
Expand Up @@ -2,32 +2,32 @@ RuleSet: Meta
* ^status = #active
* ^experimental = false
* ^publisher = "gematik GmbH"
* ^version = "2.0.2"
* ^date = "2023-01-31"
* ^version = "2.0.3"
* ^date = "2024-07-03"

RuleSet: Meta-CapabilityStatementInformation
* status = #active
* experimental = false
* version = "2.0.2"
* version = "2.0.3"
* publisher = "gematik GmbH"
* date = "2023-01-31"
* implementationGuide = "https://gematik.de/fhir/isik/v2/Medikation/ImplementationGuide|2.0.2"
* date = "2024-07-03"
* implementationGuide = "https://gematik.de/fhir/isik/v2/Medikation/ImplementationGuide|2.0.3"
* url = "https://gematik.de/fhir/isik/v2/Medikation/CapabilityStatement/medikation-server/information"

RuleSet: Meta-CapabilityStatementVerordnung
* status = #active
* experimental = false
* version = "2.0.2"
* version = "2.0.3"
* publisher = "gematik GmbH"
* date = "2023-01-31"
* implementationGuide = "https://gematik.de/fhir/isik/v2/Medikation/ImplementationGuide|2.0.2"
* date = "2024-07-03"
* implementationGuide = "https://gematik.de/fhir/isik/v2/Medikation/ImplementationGuide|2.0.3"
* url = "https://gematik.de/fhir/isik/v2/Medikation/CapabilityStatement/medikation-server/verordnung"

RuleSet: Meta-CapabilityStatementVerabreichung
* status = #active
* experimental = false
* version = "2.0.2"
* version = "2.0.3"
* publisher = "gematik GmbH"
* date = "2023-01-31"
* implementationGuide = "https://gematik.de/fhir/isik/v2/Medikation/ImplementationGuide|2.0.2"
* date = "2024-07-03"
* implementationGuide = "https://gematik.de/fhir/isik/v2/Medikation/ImplementationGuide|2.0.3"
* url = "https://gematik.de/fhir/isik/v2/Medikation/CapabilityStatement/medikation-server/verabreichung"
4 changes: 2 additions & 2 deletions Resources/sushi-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ fhirVersion: 4.0.1
FSHOnly: true
applyExtensionMetadataToRoot: false
status: active
version: 2.0.2
version: 2.0.3
dependencies:
de.medizininformatikinitiative.kerndatensatz.medikation: 1.0.10
hl7.fhir.r4.core: 4.0.1
de.gematik.isik-basismodul: 2.0.4
de.gematik.isik-basismodul: 2.0.x
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"name": "de.gematik.isik-medikation",
"version": "2.0.2",
"version": "2.0.3",
"fhirVersions": [
"4.0.1"
],
"dependencies": {
"hl7.fhir.r4.core": "4.0.1",
"de.medizininformatikinitiative.kerndatensatz.medikation": "1.0.10",
"hl7.fhir.uv.ips": "1.0.0",
"de.gematik.isik-basismodul": "2.0.4"
"de.gematik.isik-basismodul": "2.0.x"
}
}
26 changes: 26 additions & 0 deletions scripts/config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package.json:
- type: version
regex: '("version":\s*")([\d\.]+.*)(")'
sushi-config.yaml:
- type: version
regex: '(version:\s*)(\d+\.\d+\.\d+.*)()'
ruleset.fsh:
- type: version
regex:
- '(\*\s*version\s*=\s*")([\d\.]+.*)(")'
- '(\*\s*\^version\s*=\s*")([\d\.]+.*)(")'
- '(\*\s*implementationGuide\s*=\s*".*\|)([\d\.]+.*)(")'
- type: date
regex:
- '(\*\s*date\s*=\s*")(\d+\-\d+\-\d+)(")'
- '(\*\s*\^date\s*=\s*")(\d+\-\d+\-\d+)(")'
format: '%Y-%m-%d'
Einfuehrung.md:
- type: version
regex: '(Version: \s*)(\d+\.\d+\.\d+.*)()'
- type: date
regex: '(Datum:\s*)(\d+\.\d+\.\d+.*)()'
format: '%d.%m.%Y'
ImplementierungsleitfadenIsiK_Dokumentenaustausch.json:
- type: version
regex: '("version":\s*")(\d+\.\d+\.\d+.*)(",)'
Loading

0 comments on commit 46eecdc

Please sign in to comment.