Skip to content

Commit

Permalink
Fix/remove experimental ci (#25)
Browse files Browse the repository at this point in the history
* fix references in transaction bundle in flag extension so they work with hapi starter

* remove ci

* tidy id's and updated postman collection

* update example page

* remove ci steps from pipeline

---------

Co-authored-by: Declan Kieran <[email protected]>
  • Loading branch information
declankieran-nhsd and declankieran-nhsd authored Mar 28, 2024
1 parent ede7fab commit 31abfab
Show file tree
Hide file tree
Showing 39 changed files with 560 additions and 398 deletions.
9 changes: 0 additions & 9 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,6 @@ jobs:
- name: Install Graphvix
run: sudo apt install graphviz

- name: Run FHIR server (TODO - load package from vars and validate - maybe just let the publisher handle that...)
run: docker run -d -p 8080:8080 -e hapi.fhir.daoconfig_client_id_strategy=UUID -e hapi.fhir.client_id_strategy=ANY hapiproject/hapi:latest

- name: Sleep to give server time to start
run: sleep 90

- name: Convert FSH, load examples and run queries to be added to IG
run: ./scripts/run-examples.sh

- name: Build IG
run: ./_genonce.sh ${{ vars.VALIDATOR_OFFLINE }}

Expand Down
455 changes: 420 additions & 35 deletions ig-template/package/content/assets/postman/postman_collection.json

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion input/ci/queries/0005-add-ra-record-transaction-example.md

This file was deleted.

1 change: 0 additions & 1 deletion input/ci/queries/0006-add-ra-record-transaction-example.md

This file was deleted.

1 change: 0 additions & 1 deletion input/ci/queries/0007-add-ra-record-transaction-example.md

This file was deleted.

1 change: 0 additions & 1 deletion input/ci/queries/0008-get-all-flags.md

This file was deleted.

1 change: 0 additions & 1 deletion input/ci/queries/0009-get-flag-by-category.md

This file was deleted.

1 change: 0 additions & 1 deletion input/ci/queries/0010-get-flag-by-category-and-code.md

This file was deleted.

1 change: 0 additions & 1 deletion input/ci/queries/0011-delete-flag-by-id.md

This file was deleted.

25 changes: 0 additions & 25 deletions input/fsh/examples/0003-AddRARecordTransactionExample1-bundle.fsh

This file was deleted.

33 changes: 0 additions & 33 deletions input/fsh/examples/0004-AddRARecordTransactionExample2-bundle.fsh

This file was deleted.

This file was deleted.

25 changes: 0 additions & 25 deletions input/fsh/examples/0029-AddFGMRecordTransactionExample1-bundle.fsh

This file was deleted.

25 changes: 25 additions & 0 deletions input/fsh/examples/AddCPISRecordTransactionExample1-bundle.fsh
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
Instance: AddCPISRecordTransactionExample1
InstanceOf: Bundle
Title: "CPIS Example of adding a record with a Transaction"
Usage: #example
* type = #transaction
* entry[0].fullUrl = "Patient/PatientExample1"
* entry[=].resource = PatientExample1
* entry[=].request.method = #PUT
* entry[=].request.url = "Patient/PatientExample1"
* entry[+].fullUrl = "Consent/CPISConsentExample1"
* entry[=].resource = CPISConsentExample1
* entry[=].request.method = #PUT
* entry[=].request.url = "Consent/CPISConsentExample1"
* entry[+].fullUrl = "Condition/CPISConditionExample1"
* entry[=].resource = CPISConditionExample1
* entry[=].request.method = #PUT
* entry[=].request.url = "Condition/CPISConditionExample1"
* entry[+].fullUrl = "Flag/CPISPatientFlagExample1"
* entry[=].resource = CPISPatientFlagExample1
* entry[=].request.method = #PUT
* entry[=].request.url = "Flag/CPISPatientFlagExample1"
* entry[+].fullUrl = "Flag/CPISFlagExample1"
* entry[=].resource = CPISFlagExample1
* entry[=].request.method = #PUT
* entry[=].request.url = "Flag/CPISFlagExample1"
25 changes: 25 additions & 0 deletions input/fsh/examples/AddFGMRecordTransactionExample1-bundle.fsh
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
Instance: AddFGMRecordTransactionExample1
InstanceOf: Bundle
Title: "FGM Example of adding a record with a Transaction"
Usage: #example
* type = #transaction
* entry[0].fullUrl = "Patient/PatientExample1"
* entry[=].resource = PatientExample1
* entry[=].request.method = #PUT
* entry[=].request.url = "Patient/PatientExample1"
* entry[+].fullUrl = "Consent/FGMConsentExample1"
* entry[=].resource = FGMConsentExample1
* entry[=].request.method = #PUT
* entry[=].request.url = "Consent/FGMConsentExample1"
* entry[+].fullUrl = "Condition/FGMConditionExample1"
* entry[=].resource = FGMConditionExample1
* entry[=].request.method = #PUT
* entry[=].request.url = "Condition/FGMConditionExample1"
* entry[+].fullUrl = "Flag/FGMPatientFlagExample1"
* entry[=].resource = FGMPatientFlagExample1
* entry[=].request.method = #PUT
* entry[=].request.url = "Flag/FGMPatientFlagExample1"
* entry[+].fullUrl = "Flag/FGMFlagExample1"
* entry[=].resource = FGMFlagExample1
* entry[=].request.method = #PUT
* entry[=].request.url = "Flag/FGMFlagExample1"
25 changes: 25 additions & 0 deletions input/fsh/examples/AddRARecordTransactionExample1-bundle.fsh
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
Instance: AddRARecordTransactionExample1
InstanceOf: Bundle
Title: "RA Example of adding a record with a Transaction"
Usage: #example
* type = #transaction
* entry[0].fullUrl = "Patient/PatientExample1"
* entry[=].resource = PatientExample1
* entry[=].request.method = #PUT
* entry[=].request.url = "Patient/PatientExample1"
* entry[+].fullUrl = "Consent/RAConsentExample1"
* entry[=].resource = RAConsentExample1
* entry[=].request.method = #PUT
* entry[=].request.url = "Consent/RAConsentExample1"
* entry[+].fullUrl = "Condition/RAConditionExample1"
* entry[=].resource = RAConditionExample1
* entry[=].request.method = #PUT
* entry[=].request.url = "Condition/RAConditionExample1"
* entry[+].fullUrl = "Flag/RAPatientFlagExample1"
* entry[=].resource = RAPatientFlagExample1
* entry[=].request.method = #PUT
* entry[=].request.url = "Flag/RAPatientFlagExample1"
* entry[+].fullUrl = "Flag/RAFlagExample1"
* entry[=].resource = RAFlagExample1
* entry[=].request.method = #PUT
* entry[=].request.url = "Flag/RAFlagExample1"
33 changes: 33 additions & 0 deletions input/fsh/examples/AddRARecordTransactionExample2-bundle.fsh
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
Instance: AddRARecordTransactionExample2
InstanceOf: Bundle
Title: "RA Example of idempotent update of a record with a Transaction"
Usage: #example
* type = #transaction
* entry[0].fullUrl = "Patient/PatientExample1"
* entry[=].resource = PatientExample1
* entry[=].request.method = #PUT
* entry[=].request.url = "Patient/PatientExample1"
* entry[+].fullUrl = "Consent/RAConsentExample1"
* entry[=].resource = RAConsentExample1
* entry[=].request.method = #PUT
* entry[=].request.url = "Consent/RAConsentExample1"
* entry[+].fullUrl = "Condition/RAConditionExample1"
* entry[=].resource = RAConditionExample1
* entry[=].request.method = #PUT
* entry[=].request.url = "Condition/RAConditionExample1"
* entry[+].fullUrl = "Flag/RAPatientFlagExample1"
* entry[=].resource = RAPatientFlagExample1
* entry[=].request.method = #PUT
* entry[=].request.url = "Flag/RAPatientFlagExample1"
* entry[+].fullUrl = "Flag/RAFlagExample1"
* entry[=].resource = RAFlagExample1
* entry[=].request.method = #PUT
* entry[=].request.url = "Flag/RAFlagExample1"
* entry[+].fullUrl = "Condition/RAConditionExample2"
* entry[=].resource = RAConditionExample2
* entry[=].request.method = #PUT
* entry[=].request.url = "Condition/RAConditionExample2"
* entry[+].fullUrl = "Flag/RAFlagExample2"
* entry[=].resource = RAFlagExample2
* entry[=].request.method = #PUT
* entry[=].request.url = "Flag/RAFlagExample2"
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
31 changes: 31 additions & 0 deletions input/pagecontent/basic-query-examples.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
### Summary

The [HAPI FHIR Starter Server](https://github.com/hapifhir/hapi-fhir-jpaserver-starter) is used to demostrate some basic REST capabilities in FHIR using examples within this implementation guide.

#### Docker invocation of the HAPI Starter Project

This command starts the server on port 8080 and use UUID (as opposed to sequential numbers) for resource ID's. For more options see this [config](https://github.com/hapifhir/hapi-fhir-jpaserver-starter/blob/master/src/main/resources/application.yaml).

```
docker run -p 8080:8080 -e hapi.fhir.daoconfig_client_id_strategy=UUID -e hapi.fhir.client_id_strategy=ANY hapiproject/hapi:latest
```

To pull the latest image, run

```
docker pull hapiproject/hapi:latest
```

#### Swagger

The HAPI starter project provides an OAS interface to the supported FHIR API. Assuming the above docker command is used, this would be available at

```
http://localhost:8080/fhir/swagger-ui/index.html
```

#### Postman

Some transaction and basic query examples are available in a [Postman collection](assets/postman/postman_collection.json).

**NOTE:** Posting the SearchParameters first to the [HAPI FHIR Starter Server](https://github.com/hapifhir/hapi-fhir-jpaserver-starter) will allow them to index/load quicker so they work in the query examples.
Loading

0 comments on commit 31abfab

Please sign in to comment.