Commit Graph

412 Commits

Author SHA1 Message Date
jamesagnew 4d441ad7f2 Version bump to 5.2.0 2020-11-18 06:30:20 -05:00
James Agnew 63b7b379c2
Improve ValueSet filtering (#2162)
* Improve filter search

* Filter improvements

* Tests passing

* Test fixes

* Fix transaction filter

* Add changelog

* Test fix

* Update hapi-fhir-base/src/main/resources/ca/uhn/fhir/i18n/hapi-messages.properties

Co-authored-by: Diederik Muylwyk <diederik.muylwyk@gmail.com>

* Update hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/BaseTermReadSvcImpl.java

Co-authored-by: Diederik Muylwyk <diederik.muylwyk@gmail.com>

* Resolve FIXME

* Test fix

* Update hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/ValueSetExpansionR4Test.java

Co-authored-by: Diederik Muylwyk <diederik.muylwyk@gmail.com>

Co-authored-by: Diederik Muylwyk <diederik.muylwyk@gmail.com>
2020-11-10 11:01:13 -05:00
IanMMarshall 38a975f09d
Im 20201028 fix versioned valueset expansions (#2151)
* Fixes to ValueSet expansion for cases where CodeSystem is versioned.

* Fixes to ValueSet expansion for case where URL and filter parameters specified.

* Restore maven-wrapper.properties file inadvertently deleted from GitHub.

* Fix JUnit tests and ValueSet exclude.

Co-authored-by: ianmarshall <ian@simpatico.ai>
2020-11-04 16:36:43 -05:00
ianmarshall 1dc4a533d6 Fixes to terminology loader. 2020-09-25 21:43:15 -04:00
ianmarshall 47244c54dc Merge remote-tracking branch 'origin/feature_2020_09_02_term_multi_version_support' into im_20200728_term_multi_version_support
# Conflicts:
#	hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoCodeSystem.java
#	hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/BaseTermReadSvcImpl.java
#	hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/BaseLoincHandler.java
#	hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincIeeeMedicalDeviceCodeHandler.java
#	hapi-fhir-jpaserver-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/tasks/HapiFhirJpaMigrationTasks.java
#	hapi-fhir-validation/src/main/java/org/hl7/fhir/common/hapi/validation/support/CommonCodeSystemsTerminologyService.java
2020-09-25 09:10:07 -04:00
ianmarshall e5daea17b7 Additional cleanup and migration tasks. 2020-09-23 17:17:07 -04:00
ianmarshall 302bbca8fd Changes to support multi-versioning in ValueSet $expand operation. 2020-09-20 22:01:21 -04:00
ianmarshall 087c9e3c3b Merge remote-tracking branch 'remotes/origin/master' into feature_2020_09_02_term_multi_version_support 2020-09-15 12:34:11 -04:00
Frank Tao 448caa3f93 Changed the ConceptMap.VER to nullable 2020-09-11 09:02:46 -04:00
Frank Tao 16a5f57ae9 Added for ConceptMap DB migration 2020-09-10 21:41:06 -04:00
jamesagnew 0e34f16890 Make PID column name configurable in migrator 2020-09-07 20:46:53 -04:00
Mike G 8167a0c509 use new getters 2020-09-03 10:15:55 -04:00
Mike G 1de1ebb794 rename getters 2020-09-03 10:15:07 -04:00
Mike G faab567095 replace fetching of query strings with running of tasks 2020-09-03 00:58:49 -04:00
Mike G 60c03c429b add constraint dropping when dropping index in case of unique 2020-09-03 00:57:32 -04:00
Mike G 6012bc4c56 add getters and modify some setters to return a reference to itself 2020-09-03 00:56:12 -04:00
jamesagnew a0710d4f47 Add constructor 2020-08-19 06:05:23 -04:00
jamesagnew 92718c7ef2 Version bump to 5.2.0-SNAPSHOT 2020-08-12 10:23:46 -04:00
jamesagnew 5fb7bd5156 Version bump to 5.1.0 2020-08-11 17:43:24 -04:00
Tadgh 2cf48eb9b9 Move field length into constants 2020-08-01 13:11:33 -07:00
Tadgh 0e88f359f5 Merge remote-tracking branch 'remotes/origin/master' into batch-empi-job 2020-07-29 09:42:12 -07:00
jamesagnew 20d1ab2fac Mark renameTask as deprecated 2020-07-28 08:38:28 -04:00
jamesagnew a6213fe1e0 One more tweak for #2002 on Oracle 2020-07-28 08:27:13 -04:00
Tadgh 82dcc395ec Merge branch 'master' into batch-empi-job 2020-07-27 14:59:27 -07:00
James Agnew 06fd306898
Allow constraints to be deleted by the migrator on H2 (#2002) 2020-07-27 10:20:27 -04:00
Mike G b67f30a03b fix oracle and derby default 2020-07-24 10:03:21 -04:00
Tadgh 9236cdc211 Add length to migration to string type 2020-07-22 14:02:03 -07:00
Tadgh 16c6071062 Fix migration 2020-07-22 12:43:36 -07:00
Tadgh bbe6d5600e Address review comments 2020-07-22 11:58:08 -07:00
Mike G 92312537a6 Modify drop index syntax for mssql 2020-07-22 12:22:08 -04:00
Mike G 6f1d46dc68 modify add index logic to behave like the other jdbc databases 2020-07-22 12:21:58 -04:00
Mike G f285318185 Add mssql to drop FK constraints when column is dropped 2020-07-22 12:21:50 -04:00
Tadgh 1e12c740f6 Merge branch 'master' into batch-empi-job 2020-07-17 09:28:10 -07:00
Ken Stevens ebd6ca4b64
Empi 3 ruleset version (#1978)
* add rule version

* add rule version

* Rough in model for Golden Record.

* Test Link Rule Version

* add eid match boolean

* added new fields to EmpiLink to provide more information about how the link was created

* add logging to check an edge case

* all tests pass

* wip with failing tests

* tests pass

* FIXME

* optimize imports

* test score in provider output

* FIXME

* FIXME

* Fix jpa test app context

* fix migration string length

* review feedback param name

* review feedback javadoc

* review feedback javadoc

* bean config reorganization for cdr

* add more tests
2020-07-17 08:31:15 -04:00
Tadgh 6bb92717f5 Merge branch 'master' into batch-empi-job 2020-07-16 11:00:32 -07:00
Ken Stevens 50ae07acaa
stub out all migrations if an empty schema was initialized (#1975) 2020-07-09 20:18:54 -04:00
Tadgh 57f5c10bca Add migration for MPI Score/TargetType 2020-07-07 07:56:43 -07:00
Ken Stevens 1e2505e548
change migration to correct table. (#1970)
* change migration to correct table.

QUESTION: Do we need to stub this migration and add new ones?

* fix variable name
2020-07-07 05:45:39 -04:00
Ken Stevens 79862c449a
add migration cutpoint (#1968) 2020-07-06 16:12:44 -04:00
James Agnew 6fb6675b1e
Resolve validation errors to ValueSet with UCUM (#1948)
* Add tests for validation errors

* Work on validation errors

* Bump core version

* Fix validation errors

* Test fixes

* Add changelog

* Test fix

* Test fix

* Test fix
2020-07-05 19:59:21 -04:00
James Agnew f356c7c385
Migrate to JUnit5 (#1952)
* Work on junit

* Work on junit 5

* Work on junit 5

* Bump errorprone vcersion

* Work on tests

* Junit 5 tweaks

* Fixes

* Work on tests

* Work on junit5

* Work on tests

* Test fixes

* Work on junit5

* Test work

* Get junit5 working

* Test fix

* Work on tests

* WOrk on tests

* Work on tests

* fixes

* Compile fix

* One more tweak

* Compile fix

* Add changelog

* Fix compile error

* Compile fix
2020-07-04 18:28:16 -04:00
dependabot[bot] ef4b79da7e
Bump mysql-connector-java in /hapi-fhir-jpaserver-migrate (#1955)
Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 6.0.5 to 8.0.16.
- [Release notes](https://github.com/mysql/mysql-connector-j/releases)
- [Changelog](https://github.com/mysql/mysql-connector-j/blob/release/8.0/CHANGES)
- [Commits](https://github.com/mysql/mysql-connector-j/compare/6.0.5...8.0.16)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-07-01 18:29:57 -04:00
Tadgh e365e643ba
Merge pull request #1906 from jamesagnew/spring-batch-integration
Spring batch integration
2020-06-28 16:10:43 -07:00
ianmarshall 053094f2a6 Apply recent fixes for MySQL migration tasks to MariaDB as well. 2020-06-24 17:42:46 -04:00
Tadgh bb7a773f41 Merge branch 'master' into spring-batch-integration 2020-06-23 16:02:41 -07:00
ianmarshall 5b120ee71e Removed unused code and import statement. 2020-06-17 11:57:37 -04:00
ianmarshall 5d22af45bf Added tests for cases where a renamed column is used in a Foreign Key constraint. 2020-06-17 11:56:20 -04:00
ianmarshall eb990e9a68 Enhance added JUnit test. 2020-06-17 09:05:53 -04:00
ianmarshall cc7ed1b036 Cleanup JUnit test. 2020-06-16 17:21:17 -04:00
ianmarshall 2d857f484c Fix broken JUnit. 2020-06-16 17:13:00 -04:00
ianmarshall 0bd8084b5e Additional fixes to migration tasks for MySQL. 2020-06-16 16:05:10 -04:00
Tadgh 798fdb9cc2 Merge branch 'master' into spring-batch-integration 2020-06-15 09:10:41 -07:00
jamesagnew db4b749436 License updates 2020-06-14 15:44:33 -04:00
Tadgh 4270636d43 Merge branch 'master' into spring-batch-integration 2020-06-12 16:20:54 -07:00
Tadgh 0f469c1a56 Rework to allow for job creation inside of batch 2020-06-12 14:20:50 -07:00
ianmarshall 1ed65f2e03 Enable rename table column migration task for MySQL. 2020-06-12 09:01:46 -04:00
Tadgh a9c704c06e Merge branch 'master' into spring-batch-integration 2020-06-10 12:24:19 -07:00
jamesagnew 05df4f0827 Migration task updates 2020-06-10 09:56:49 -04:00
James Agnew b8da4f0140
Add package support (#1911)
* Begin rework of package management

* Work on NPM

* Work on package management

* Work on NPM

* NPM rework

* Work on NPM

* NPM package rework

* Updates

* Updates

* Add license

* Work on package server

* Work on package importing

* Work on package management

* Package rework

* Work on packages

* Work on package manager

* Work on pkgs

* NPM work

* NPM rework

* Work on package cache

* Work on NPM

* Work on NPM

* Package fixes

* Add tests

* Tweaks

* Test fixes

* Add changelog

* Avoid snapshot dep
2020-06-10 05:30:20 -04:00
Tadgh 9c153527dd remove dead imports 2020-06-09 09:03:56 -07:00
Tadgh 8b995f8be7 Remove dead test 2020-06-08 17:16:22 -07:00
Tadgh 278a1070ae :Merge branch 'master' into spring-batch-integration 2020-06-08 17:16:11 -07:00
Tadgh aa7d1cbcb7 Wip getting tasks built 2020-06-01 11:32:36 -07:00
Tadgh 81d5ff8f5a Add schema initialization 2020-05-27 17:06:52 -07:00
James Agnew 22af36ae7b
Conditional update on Partitioned Server fails (#1870)
* Fix #1869

* Remove FIXME

* Test fix

* Test fix
2020-05-27 10:40:29 -04:00
jamesagnew 5482367e37 Remove redundant index - Already covered by FK 2020-05-26 08:54:00 -04:00
jamesagnew 499f1ce672 Test order fix 2020-05-26 05:41:45 -04:00
jamesagnew 9192d41448 Credit for #1637 2020-05-23 17:16:19 -04:00
Jacob Stampe Mikkelsen 262a964a31
Add index on CONCEPT_PID on TRM_CONCEPT_PROPERTY to optimize a full-reindex of lucene index which can be needed when running in a docker container where the lucene files are discarded on redeploy. (#1637)
Co-authored-by: James Agnew <jamesagnew@gmail.com>
2020-05-23 17:11:21 -04:00
Tadgh d1b963321a
MVP EMPI implementation (#1857)
EMPI Initial Implementation (still plenty of known gaps)
2020-05-22 15:03:20 -04:00
jamesagnew 52c8e3551c Version bump to 5.1.0-SNAPSHOT 2020-05-15 14:43:32 -04:00
jamesagnew b46f4a993d One more fix for 5.0.1 2020-05-15 09:58:45 -04:00
jamesagnew fe0e07a313 Bump to 5.0.1 2020-05-15 05:47:01 -04:00
Tadgh 9fec726b0e
Add missing indexes on ResourceIndexedSearchParamDate (#1847)
* Add migration tasks for new indexes. Add new indexes to ResourceIndexedSearchParamDate

* fix dates on task, remove redundant index

* Today is not the 20th

* Fix incorrectly named migration indexes

* out of order indexes
2020-05-15 05:38:16 -04:00
jamesagnew 1d13e29ac0 Version bump to 5.1.0-SNAPSHOT 2020-05-12 20:04:20 -04:00
jamesagnew d631ecff4a Prepare for 5.0.0 2020-05-12 11:49:18 -04:00
jamesagnew 034e878a6f Add NOP tasks for 4.3.0 to avoid migrator issues 2020-05-10 12:09:47 -04:00
James Agnew a77aa6a28e
Multitenancy Ticket 2 - #1813 (#1821)
* Work on multitenancy

* Second ticket started

* More multitenancy work

* Work on tenancy security

* Work on multitenancy

* Test fixes

* Add docs

* cs tweak

* Multitenancy fixes

* Add debug log

* Fix build

* Add headers

* Add partition selection interceptor hook

* Update hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/Constants.java

Co-authored-by: Ken Stevens <khstevens@gmail.com>

* Account for review comments

* Resolve FIXMES

* Work on tests

* Test fixes

* A bit more cleanup

* Work on multitenancy

* Update hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ClientExamples.java

Co-authored-by: Ken Stevens <khstevens@gmail.com>

* Update hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/client/examples.md

Co-authored-by: Ken Stevens <khstevens@gmail.com>

* Address review comments

* Allow disabling text modifier indexing

* Add changelog

* Docs fixes

* Address review comment

* Resolve merge conflicts

* Merge master

* Compile fix

* Test fix

Co-authored-by: Ken Stevens <khstevens@gmail.com>
2020-05-05 15:12:15 -04:00
jamesagnew 8b49142b94 Clean up migrator tasks 2020-05-01 15:03:36 -04:00
James Agnew 3d5a8bb3f8
Add UCUM support (#1824)
* Add UCUM support

* Add changelog

* Some cleanup

* Test fix

* Add flywayDB callback

* Add hooks to schema migrator
2020-04-30 15:22:41 -04:00
Tadgh a5e1b3d159 Minor changes for merge conflicts 2020-04-29 16:18:02 -07:00
Tadgh 8f8a8a3dc2 Merge branch 'master' into date-match-bug 2020-04-29 16:17:50 -07:00
jamesagnew 0d8c42ee1a Migrator tweaks 2020-04-29 10:13:55 -04:00
jamesagnew 36a7e9c980 Test fixes 2020-04-22 14:56:13 -04:00
jamesagnew af43c4377a Roll back a change that was causing test failures 2020-04-22 14:11:01 -04:00
jamesagnew 465bce952e A couple more migration fixes 2020-04-20 18:32:48 -04:00
jamesagnew 9ed358f665 One more migration fix 2020-04-20 17:44:50 -04:00
jamesagnew e98bf2b0d3 Migration fix 2020-04-20 17:39:12 -04:00
jamesagnew 00b1912a67 Fix typo 2020-04-20 16:59:32 -04:00
jamesagnew e6c806283e Merge branch 'ja_20200206_multitenancy' of github.com:jamesagnew/hapi-fhir into ja_20200206_multitenancy 2020-04-20 16:58:59 -04:00
jamesagnew 544d9fbc6c Add migration tasks 2020-04-20 16:58:48 -04:00
jamesagnew bbab016ca6 Rename config 2020-04-20 12:38:04 -04:00
jamesagnew 982b54df57 Work on multitenancy 2020-04-13 11:50:49 -04:00
jamesagnew c26a5553e9 Multitenancy work 2020-04-12 20:47:32 -04:00
jamesagnew e55ccf88fc Work on multitenancy 2020-04-10 20:01:59 -04:00
jamesagnew e0fcbe1df2 Merge branch 'master' into ja_20200206_multitenancy 2020-04-09 11:52:27 -04:00
jamesagnew edc30568f2 Address review changes 2020-04-07 19:07:07 -04:00
jamesagnew 7f2605def1 Run migrator tests against DERBY and H2 2020-03-31 15:48:11 -04:00
jamesagnew 691f2c4e9a Work on muiltitenancy 2020-03-29 13:35:20 -04:00
jamesagnew 9df4c58122 Work on multitenancy 2020-03-27 09:22:00 -04:00