-
Notifications
You must be signed in to change notification settings - Fork 3
feat(#114): Create OpenMRS Mediator #115
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
witash
wants to merge
70
commits into
main
Choose a base branch
from
openmrs-mediator
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
70 commits
Select commit
Hold shift + click to select a range
5e4451f
feat(#114): Create OpenMRS Mediator for Patient resource
witash 4e3de0f
feat(#114): add endpoints for openmrs and cht
witash 534b1fd
feat(#114): add missing routes
witash 50a3f3f
feat(#114): add openmrs poller
witash 494ae3d
feat(#114): id exchange and sms forms
witash 8c3c4fe
feat(#114): add patient to bundle from openmrs
witash 6ed106d
feat(#114): allow palce id in name
witash 76e9012
feat(#124): remove openmrs endpoints, add mappers for cht, openmrs
witash ffaa7e0
feat(#124): add openmrs sync
witash 9b7978d
feat(#114): add sequence diagrams for document endpoints
witash ac83b03
feat(#125): sequence diagrams for outgoing patients
witash 1fb1351
feat(#114): fix uit tests
witash d9e1c13
feat(#125): sequence diagrams for incoming patients and forms
witash 449de72
feat(#114): sonar fixes
witash 613bf6b
feat(#114): add openmrs channel to configurator
witash 6d03a4f
feat(#114): fix bundle format
witash aba7c95
feat(#114): get observations and patients together with encounters
witash fda229f
feat(#114): configurator changes
witash f7a834d
feat(#114): add openmrs to startup
witash dfe749d
feat(#114): add timeout, fix timing issues
witash 6c3ff27
feat(#114): pagination for openmrs sync
witash 3eab817
feat(#114): fix reference for encounters and don't allow updates
witash 0e38c83
feat(#114): fix unit tests
witash d05968e
feat(#114): fix unit tests
witash 70aee07
feat(#114): remove cht from main startup script
witash 6141ce8
feat(#114): adding source ot prevent infinite loops
witash 5bb2eae
feat(#114): don't save encounters until complete
witash 12e2a53
feat(#114): boundary conditions for sync
witash 88f1014
feat(#114): add sync_interval to index
witash 7a5243c
feat(#114): fix tests
witash 3db5945
feat(#114): fix defualt sync_interval
witash 82e29ec
feat(#114): fix unit tests for default sync_interval
witash ee8e8dd
feat: add platform to failing containers
njuguna-n 6d2c7d2
no service line in compose files, pin to cht core 4.10, improve start…
mrjones-plip e91be25
fix(#138): change ltfu mediator to cht mediator and add openmrs mediator
witash c1cc023
fix(#138): env.template changes and small fixes
witash f325edd
chore (#123): openmrs mediator e2e test (#128)
lorerod 7470359
fix(#123): fixing tests
witash a0fc96b
fix(#123): fixing tests
witash 86bdc31
chore(#142): adding tests to increase coverage
witash 59f607b
Merge branch 'main' into openmrs-mediator
witash 1a5be52
chore(#142): sonar fixes
witash d6db1d6
chore(#142): sonar fixes
witash 7d279c1
chore(#142): adding tests to increase coverage (#143)
witash d5b0252
fix: fixing startup script
witash ef558a2
chore(#136): skipping e2e-tests until rate limiting is fixed
witash d8cb295
feat(#138): move polling to openhim channel config (#139)
witash e3f1a4c
chore(#142): add tests and small fixes
witash dfe2107
Merge branch '142-unit-tests' into openmrs-mediator
witash 59bf494
fix(#123): use up-test command in retry_startup
0f7ef52
fix(#123): remove conditional to enable E2E tests in CI
61ccd62
fix(#123): remove conditional to enable E2E tests in CI
5be2b00
fix: convert sync period to milliseconds before subtracting from the …
njuguna-n 8abfa10
fix(#123): remove conditional to enable E2E tests in CI
3cc6a55
fix(#123): revert remove conditional to enable E2E tests in CI
3216ce7
fix(#123): add wait time before asserting fhir response
71df8de
fix(#123): add logic to retry image pulls
1ec5181
fix(#123): enable e2e test in ci
670f3a5
feat: make encounter requests idempotent by using the identifier
njuguna-n 0bca7ae
feat: get fhir resource by identifier
njuguna-n dcb5e61
feat(#147): adding value types (#149)
witash 40716e8
chore: adding sample forms
witash 1de75e4
fix: removing date check
witash c9354ff
chore: address sonarlint issues
njuguna-n 7b89788
chore: remove unused variable
andrablaj f361ca4
fix: adding postman collection
witash 9290c0f
fix: app setting changes for testing
witash 85d0484
Merge branch 'main' into openmrs-mediator
witash 539f03e
feat: separating test and openmrs job
witash 07ca30d
fix: removing unecessarry test
witash File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| name: Test | ||
|
|
||
| on: [push, pull_request] | ||
| on: [push] | ||
|
|
||
| jobs: | ||
| unit: | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| FROM node:16-slim | ||
|
|
||
| RUN apt update \ | ||
| && apt install --no-install-recommends -y \ | ||
| curl \ | ||
| git \ | ||
| python3-pip \ | ||
| python3-setuptools \ | ||
| python3-wheel \ | ||
| && apt-get clean \ | ||
| && rm -rf /var/lib/apt/lists/* \ | ||
| && python3 -m pip install git+https://github.com/medic/pyxform.git@medic-conf-1.17#egg=pyxform-medic | ||
|
|
||
| WORKDIR /scripts/cht-config | ||
|
|
||
| COPY ./ ./ | ||
|
|
||
| RUN npm install --ignore-scripts && npm install -g --ignore-scripts cht-conf | ||
|
|
||
| CMD ["npm", "run", "deploy"] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,23 +1,12 @@ | ||
| FROM node:16-alpine | ||
|
|
||
| RUN apk add g++ make py3-pip git curl chromium | ||
| FROM node:22-alpine | ||
|
|
||
| WORKDIR /scripts/configurator | ||
|
|
||
| COPY ./configurator ./ | ||
| COPY ./package.json ./package.json | ||
| COPY ./package-lock.json ./package-lock.json | ||
|
|
||
| RUN npm install | ||
|
|
||
| WORKDIR /scripts/cht-config | ||
|
|
||
| COPY ../cht-config ./ | ||
|
|
||
| RUN npm install && npm install -g cht-conf && python -m pip install git+https://github.com/medic/pyxform.git@medic-conf-1.17#egg=pyxform-medic | ||
witash marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| WORKDIR /scripts | ||
|
|
||
| RUN echo "cd /scripts/configurator && npm run configure && cd /scripts/cht-config && npm run deploy && exit 0" > ./startup.sh | ||
|
|
||
| RUN chmod +x ./startup.sh | ||
| COPY ./ ./ | ||
|
|
||
| CMD ["sh", "./startup.sh"] | ||
| CMD ["npm", "run", "configure"] | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,11 +9,23 @@ const OPENHIM_API_USERNAME = | |
| const OPENHIM_CLIENT_PASSWORD = process.env.OPENHIM_CLIENT_PASSWORD || 'interop-password'; | ||
| const OPENHIM_USER_PASSWORD = process.env.OPENHIM_USER_PASSWORD || 'interop-password'; | ||
|
|
||
| const OPENMRS_HOST = process.env.OPENMRS_HOST; | ||
| const OPENMRS_PORT = process.env.OPENMRS_PORT || 8080; | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The default value here conflicts with the default value for |
||
| const OPENMRS_USERNAME = process.env.OPENMRS_USERNAME; | ||
| const OPENMRS_PASSWORD = process.env.OPENMRS_PASSWORD; | ||
| const OPENMRS_PROTOCOL = process.env.OPENMRS_PROTOCOL || 'http'; | ||
|
|
||
| module.exports = { | ||
| OPENHIM_API_HOSTNAME, | ||
| OPENHIM_API_PASSWORD, | ||
| OPENHIM_API_PORT, | ||
| OPENHIM_API_USERNAME, | ||
| OPENHIM_CLIENT_PASSWORD, | ||
| OPENHIM_USER_PASSWORD | ||
| OPENHIM_USER_PASSWORD, | ||
|
|
||
| OPENMRS_HOST, | ||
| OPENMRS_PORT, | ||
| OPENMRS_USERNAME, | ||
| OPENMRS_PASSWORD, | ||
| OPENMRS_PROTOCOL | ||
| }; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is also still needed @witash
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, I am getting this error without it: