#32 - Remove codex references in settings #314
Merged
Conversation
This file contains 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
Collaborator
michael-82
commented
Jul 2, 2024
•
michael-82
commented
- replace/rename codex references with mii or just feasibility
- package names remain unchanged
- please be aware that feasibility-deploy must be adapted to these changes (see corresponding PR)
michael-82
force-pushed
the
feature/32-remove-codex-references-in-settings
branch
from
cfb0f47
to
606cdd2
Compare
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## develop #314 +/- ##
==========================================
Coverage 78.51% 78.51%
Complexity 547 547
==========================================
Files 135 135
Lines 2374 2374
Branches 143 143
==========================================
Hits 1864 1864
Misses 453 453
Partials 57 57 ☔ View full report in Codecov by Sentry. |
michael-82
force-pushed
the
feature/32-remove-codex-references-in-settings
branch
from
145ba84
to
bccbd8d
Compare
juliangruendner
requested changes
Sep 3, 2024
| @@ -77,7 +78,7 @@ services: | |||
| environment: | |||
| POSTGRES_USER: "guidbuser" | |||
| POSTGRES_PASSWORD: "guidbpw" | |||
| POSTGRES_DB: "codex_ui" | |||
| POSTGRES_DB: "feasibility_ui" | |||
There was a problem hiding this comment.
change to dataportal
| DATABASE_PORT: 5432 | ||
| DATABASE_USER: "guidbuser" | ||
| DATABASE_PASSWORD: "guidbpw" | ||
| DATABASE_DBNAME: "feasibility_ui" |
There was a problem hiding this comment.
change feasibility to dataportal for all occurences
Dockerfile
Outdated
| @@ -3,24 +3,24 @@ FROM eclipse-temurin:17-jre | |||
| RUN apt update -yqq && apt upgrade -yqq && \ | |||
| apt-get autoremove -y && apt-get clean && rm -rf /var/lib/apt/lists/ | |||
|
|
|||
| WORKDIR /opt/codex-feasibility-backend | |||
| WORKDIR /opt/mii-feasibility-backend | |||
src/main/resources/application.yml
Outdated
| username: ${FEASIBILITY_DATABASE_USER:codex-postgres} | ||
| password: ${FEASIBILITY_DATABASE_PASSWORD:codex-password} | ||
| url: jdbc:postgresql://${DATABASE_HOST:localhost}:${DATABASE_PORT:5432}/${DATABASE_DBNAME:feasibility_ui} | ||
| username: ${DATABASE_USER:guidbuser} |
There was a problem hiding this comment.
dataportaluser
dataportalpw
| @@ -63,8 +63,8 @@ public class FhirQueryTranslatorIT { | |||
| @Container | |||
| private final GenericContainer<?> flare = new GenericContainer<>(DockerImageName.parse("ghcr.io/num-codex/codex-flare:0.0.8")) | |||
| .withExposedPorts(5000) | |||
| .withFileSystemBind("ontology/codex-code-tree.json", "/opt/flare/src/query_parser/codex/codex-code-tree.json", READ_ONLY) | |||
| .withFileSystemBind("ontology/codex-term-code-mapping.json", "/opt/flare/src/query_parser/codex/codex-mapping.json", READ_ONLY) | |||
| .withFileSystemBind("ontology/mii-code-tree.json", "/opt/flare/src/query_parser/codex/codex-code-tree.json", READ_ONLY) | |||
There was a problem hiding this comment.
adjust to new file names
- replace/rename codex references with mii or just feasibility - package names remain unchanged
- add env variable for dbname in datasource url
- remove prefix from db env variables
- replace any feasibility, mii or ui references with dataportal references
michael-82
force-pushed
the
feature/32-remove-codex-references-in-settings
branch
from
bccbd8d
to
b7037b1
Compare
- change rolenames in tests
- fix wrong filename for ontology dl in github integration test
- fix wrong servicename in github action compose file
michael-82
deleted the
feature/32-remove-codex-references-in-settings
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.