https://github.com/jamesagnew/hapi-fhir

sort by:
Revision Author Date Message Commit Date
a04a49c Schema migrator returns status (#4937) * Migrator should return status * Cleanup * Add changelog * Delete unused * Test fix 24 May 2023, 23:31:39 UTC
c98c4a4 Implement codeowners (#4938) * Initial run through codeowners * Remove dead action * Add consent intercept and auth interceptor 24 May 2023, 21:48:55 UTC
d9530a9 Bump snake yaml (#4929) * Bump snakeyaml * Bump jackson to be compatible with new snakeyaml 24 May 2023, 04:39:38 UTC
3b9a9c6 Oracle Testcontainers and Test Data (#4897) * OracleEmbeddedDatabase + test data 23 May 2023, 22:59:41 UTC
970befa Fixes broken Oracle migration (#4933) 23 May 2023, 21:06:27 UTC
93a4a7b Bump deps (#4926) 23 May 2023, 16:53:52 UTC
32a4ee0 Bump snake yaml (#4929) * Bump snakeyaml * Bump jackson to be compatible with new snakeyaml 23 May 2023, 16:32:55 UTC
cfc8b02 Bump spring-security-core from 5.7.5 to 5.7.8 in /hapi-fhir-storage-cr (#4927) Bumps [spring-security-core](https://github.com/spring-projects/spring-security) from 5.7.5 to 5.7.8. - [Release notes](https://github.com/spring-projects/spring-security/releases) - [Changelog](https://github.com/spring-projects/spring-security/blob/main/RELEASE.adoc) - [Commits](https://github.com/spring-projects/spring-security/compare/5.7.5...5.7.8) --- updated-dependencies: - dependency-name: org.springframework.security:spring-security-core dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 21 May 2023, 22:17:59 UTC
82ab61f Expunge performance tweak (#4920) * Expunge performance tweak * Add changelog * Address review comment 21 May 2023, 17:56:31 UTC
805e80e 6.6.0 Mergeback (#4924) * Force Verify tests * fix ITs (#4809) * fix RestHookTestR5IT * fix intermittent --------- Co-authored-by: Ken Stevens <ken@smilecdr.com> * Fix migrator error on Oracle (#4814) * Fix Oracle SQL error * Add changelog * Update clinical reasoning version (#4816) * Update clinical reasoning version * Update version * Update version * Clean-up and more wireup of evaluationSettings * Add changelog --------- Co-authored-by: Jonathan Percival <jonathan.i.percival@gmail.com> * Opening the care-gaps endpoint for GET. (#4823) Co-authored-by: Chalma Maadaadi <chalma@alphora.com> * added version to mdm golden resource tag (#4820) Co-authored-by: Long Ma <long@smilecdr.com> * Update the changelog for 4697 to be more descriptive (#4827) * Update the changelog for 4697 to be more descriptive * Futher tweaks of the changelog * Fixes a bug with tags. (#4813) * Test, fix * Drop constraint, add migration * Add changelog * Fix userSelected null vs false * Fix merge * Fix up checkstyle whining * One more failure * Fix test * wip * changelog clarity Co-authored-by: James Agnew <jamesagnew@gmail.com> * change index --------- Co-authored-by: Michael Buckley <michaelabuckley@gmail.com> Co-authored-by: James Agnew <jamesagnew@gmail.com> * fix migration issue (#4830) Co-authored-by: Ken Stevens <ken@smilecdr.com> * Create correct version enum * Remove superfluous migration * fixing test (#4835) Co-authored-by: leif stawnyczy <leifstawnyczy@leifs-MacBook-Pro.local> * email subscription, throw NullPointerException (#4790) * fix bug * Favoring constructor initialization to autowiring. * enhancing test. * Making class LoggingEmailSender available outside of the hapi-fhir-japserver-uhnfhirtest module. * Passing all tests. * adding changelog. * Bumping version to 6.5.20-SNAPSHOT * addressing code review comment. --------- Co-authored-by: peartree <etienne.poirier@smilecdr.com> * Add docs for CR operations (#4855) * Add docs for CR operations * Correct changelog and javadoc for $package * Add documentation for $apply parameters * Add additional documentation for $package * Cleanup * Cleanup * Cleanup * Address review comments * Add documentation for $care-gaps operation. (#4862) * Add documentation for -gaps. * addressing the comments. --------- Co-authored-by: Chalma Maadaadi <chalma@alphora.com> * 4853 validation does not error when display is not the same as the display defined in the codesystem 2 (#4854) * added failing test * implemented the solution * changed test name * added change log * Update hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_6_0/4853-validation-does-not-error-when-display-is-not-the-same-as-the-display-defined-in-the-codesystem-2.yaml Co-authored-by: James Agnew <jamesagnew@gmail.com> --------- Co-authored-by: Steven Li <steven@smilecdr.com> Co-authored-by: James Agnew <jamesagnew@gmail.com> * fixing patient everything operator (#4845) * fixing patient everything operator * review fix --------- Co-authored-by: leif stawnyczy <leifstawnyczy@leifs-MacBook-Pro.local> * fix link * Move image file * Bundle resources containing over 100 references to the same Organization will fail with HAPI-2207 (#4871) * Add failing unit test. * Fix JpaId Long equality comparison to use ! equals() instead of !=, which fails for different instances of the same Long value. * Add changelog. * added warn message and test (#4848) * added warn message and test * code review fixes --------- Co-authored-by: Long Ma <long@smilecdr.com> * Issue 4804 full table scan on mpi link during mdm clear (#4805) * version bump for next release (#4793) * version bump * Bump to correctnumber * Version Enum and folder * Remove interim from list * wip * Fix operation on nested type-choices in FhirPatch implementation (#4783) * Fix operation on nested type-choices in FhirPatch implementation * Add credit for #4783 --------- Co-authored-by: James Agnew <jamesagnew@gmail.com> * #4468 fix previous link offset no cache pagination (#4489) * #4468 Add test reproducing the issue * #4468 Fix previous link for no cache offset pagination * #4468 Use unchecked URI parsing * Credit for #4489 --------- Co-authored-by: James Agnew <jamesagnew@gmail.com> * Changelog and data generating test * Add MdmLink index * Avoid double link deletion * Use ThreadLocal safely --------- Co-authored-by: Tadgh <garygrantgraham@gmail.com> Co-authored-by: Zach Smith <85943952+zachdoctolib@users.noreply.github.com> Co-authored-by: James Agnew <jamesagnew@gmail.com> Co-authored-by: Aleksej Parovysnik <100864000+alparodev@users.noreply.github.com> Co-authored-by: juan.marchionatto <juan.marchionatto@smilecdr.com> * Fix erroneous batch 2 $export 75% complete count when the job is COMPLETE (#4859) * Add failing unit test. * Add conditional logic to the InstanceProgress progress percentage to disregard the incomplete count if this is called from the reduction step. This is to get around a race condition in which a work chunk is QUEUED and not yet complete when the reduction step calculates the progress. * Add final. * Add changelog. * disable wars (#4877) Co-authored-by: Ken Stevens <ken@smilecdr.com> * 4868 fix paging hapi (#4870) * fixing some offset and adding a test * fixing the offset paging * Removing duplicate --------- Co-authored-by: leif stawnyczy <leifstawnyczy@leifs-MacBook-Pro.local> Co-authored-by: Aleksej Parovysnik <100864000+alparodev@users.noreply.github.com> * 4875-binary-access-write-doest-trigger-STORAGE-BINARY-ASSIGN-BLOB-ID-PREFIX-pointcut (#4876) * Add failing test * Add failing test * Fix and changelog * Pass content type parameter * Back to auto wiring the context * Invoke interceptor only when getting blobId, not also when storing it * Avoid breaking implementers * Address review comment * Add new exception Msg code * Fix broken test --------- Co-authored-by: juan.marchionatto <juan.marchionatto@smilecdr.com> * Fix batch job (bulk export) processed record count (#4879) * Remove racy stats recalc. * Throw 404 when requesting $export of non-existent Group or Patient (#4890) * Remove default implementation intended only for interim backwards compatibility (#4894) Co-authored-by: juan.marchionatto <juan.marchionatto@smilecdr.com> * Rule apply patient export (#4893) * Test, fix, and changelog * Better partition resolution * Add checks based on rule applier * Fix ordering failure due to hash set * Allow empty auth interceptor * Fix up operation type on invocation * Add more tests, make hack implementation for patient instance level operation * Tighten test name * Changelog * Default method * remove dead method * Remove dead autowire --------- Co-authored-by: Michael Buckley <michaelabuckley@gmail.com> * cve pom changes (#4898) Co-authored-by: Long Ma <long@smilecdr.com> * backport subscription topic bean cleanup (#4904) * 4891 bulk export do not recurse unasked for resources (#4895) * updating tests * fixing bulk export to not fetch resources not requested * cleanup * cleanup * more warning suppressing * adding error code * blah * fix test * review fixes --------- Co-authored-by: leif stawnyczy <leifstawnyczy@leifs-MacBook-Pro.local> * lowers log level to remove bootup noise (#4908) * CVE rel 6 6 (#4907) * cve pom changes * bump javax.el to jakarta.el --------- Co-authored-by: Long Ma <long@smilecdr.com> * Issue 4905 post binary failure invoking interceptor for pointcuts storage preshow resources (#4906) * Initial failing test * Avoid applying binary blob id prefix multiple times * Remove recently introduced method not needed anymore --------- Co-authored-by: juan.marchionatto <juan.marchionatto@smilecdr.com> * Enhance LogbackCaptureTestExtension (#4869) * repro bug with test, fix bug * ken informed me he resolved this bug on master, so i'm switching to use his solution * disable wars * review feedback * review feedback * review feedback again --------- Co-authored-by: josie <josie.vandewetering@smilecdr.com> Co-authored-by: Ken Stevens <ken@smilecdr.com> * Resolve 4863 from release branch searchparametercanonicalizer does not account for search parameters for custom resources types when converting dstu23 into runtimesearchparam (#4887) * Modified canonicalizeSearchParameterDstu2 and 3, now correctly detect search parameters for custom resources * Canonicalizers now correctly handle search parameters for custom resources * created changelog * Modification based on comments: - remove Resource from target field when there are custom resource types - fixed changelog typo - removed unnecessary variable providesMembershipInCompartments * Added tests for the SearchParameterCanonicalizer to test if base and target of RuntimeSearchParam is set as expected for DSTU2, DSTU3, R4, R4B, and R5 resources * Fixed typo and removed commented code * re-ordered init methods * Update changelog Co-authored-by: Tadgh <garygrantgraham@gmail.com> * modifications following first code review. --------- Co-authored-by: Tadgh <garygrantgraham@gmail.com> Co-authored-by: peartree <etienne.poirier@smilecdr.com> * License * Remove _lastUpdated filtering of _revincludes. (#4899) Remove _lastUpdated filtering of _revincludes. * 4910-dm-migration-error-for-oracle-19c (#4916) * Remove all_constraints references which break in oracle 19c * Add changelog --------- Co-authored-by: juan.marchionatto <juan.marchionatto@smilecdr.com> * 4873 empty fhirid causes missing resource (#4874) * add check for empty fhirid string and add test * add test for populateid * changelog * version bump * version bump * reverse version bump * Back to 6.5.21-SNAPSHOT. --------- Co-authored-by: justindar <justin.dar@smilecdr.com> Co-authored-by: Luke deGruchy <luke.degruchy@smilecdr.com> * Fix include canonical url performance (#4919) Use hash_identity for canonical join * License * Version bump * Fix failure in test * Licenses * Review comments for pipeline * Dead entry * other typo --------- Co-authored-by: Ken Stevens <khstevens@gmail.com> Co-authored-by: Ken Stevens <ken@smilecdr.com> Co-authored-by: James Agnew <jamesagnew@gmail.com> Co-authored-by: Brenin Rhodes <brenin@alphora.com> Co-authored-by: Jonathan Percival <jonathan.i.percival@gmail.com> Co-authored-by: chalmarm <44471040+chalmarm@users.noreply.github.com> Co-authored-by: Chalma Maadaadi <chalma@alphora.com> Co-authored-by: longma1 <32119004+longma1@users.noreply.github.com> Co-authored-by: Long Ma <long@smilecdr.com> Co-authored-by: Michael Buckley <michaelabuckley@gmail.com> Co-authored-by: TipzCM <leif.stawnyczy@gmail.com> Co-authored-by: leif stawnyczy <leifstawnyczy@leifs-MacBook-Pro.local> Co-authored-by: Sam Gunter <123124187+samguntersmilecdr@users.noreply.github.com> Co-authored-by: peartree <etienne.poirier@smilecdr.com> Co-authored-by: StevenXLi <stevenli_8118@hotmail.com> Co-authored-by: Steven Li <steven@smilecdr.com> Co-authored-by: Luke deGruchy <luke.degruchy@smilecdr.com> Co-authored-by: jmarchionatto <60409882+jmarchionatto@users.noreply.github.com> Co-authored-by: Zach Smith <85943952+zachdoctolib@users.noreply.github.com> Co-authored-by: Aleksej Parovysnik <100864000+alparodev@users.noreply.github.com> Co-authored-by: juan.marchionatto <juan.marchionatto@smilecdr.com> Co-authored-by: Josie <80289977+pepsiofficial@users.noreply.github.com> Co-authored-by: josie <josie.vandewetering@smilecdr.com> Co-authored-by: TynerGjs <132295567+TynerGjs@users.noreply.github.com> Co-authored-by: jdar8 <69840459+jdar8@users.noreply.github.com> Co-authored-by: justindar <justin.dar@smilecdr.com> 21 May 2023, 03:38:35 UTC
307e52f Index name fix (#4921) * Index name fix * Build fix * Test restore * Revert change 20 May 2023, 21:29:56 UTC
d932730 Fixed R5 Subscription deserialization (#4922) * review feedback * fixed * changelog * test both ways * add bundle test * change how toplevel is detected since in some contexts the parent state can be a non-null pre-resource state * fix v2 issues --------- Co-authored-by: Ken Stevens <ken@smilecdr.com> 20 May 2023, 00:32:25 UTC
a722cc4 SubscriptionTopicDispatcher (#4911) * Extract SubscriptionTopicBundleDispatcher into a separate service for use by custom interceptors that need to dispatch their own notifications * rename * changelog * rename * review feedback * Msg.code * review feedback --------- Co-authored-by: Ken Stevens <ken@smilecdr.com> 18 May 2023, 22:46:00 UTC
d94627c 4847 allow filtering batch jobs by status (#4849) * Add method to get all jobs of a certain status * add queries * add tests * Refactor so extra parameter is not added * Version bump * Fix broken test * Revert accidental change to pom unrelated to version --------- Co-authored-by: David Chen <david.chen@smilecdr.com> 18 May 2023, 18:46:44 UTC
1c66e57 Update resource provenance indexing strategy (#4883) * Add migration * Update indexes * Update hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/migrate/tasks/HapiFhirJpaMigrationTasks.java Co-authored-by: michaelabuckley <michaelabuckley@gmail.com> * Address review comments * Test fixes * Test fixes * Test fix --------- Co-authored-by: michaelabuckley <michaelabuckley@gmail.com> 18 May 2023, 17:23:57 UTC
54cec79 fix subscription topic beans (#4903) Co-authored-by: Ken Stevens <ken@smilecdr.com> 17 May 2023, 14:45:36 UTC
55940bd Add PreviousVersion service with tests (#4902) * started writing PreviousVersionReader * started writing PreviousVersionReader * moar tests * add partitioning to the test * switch subscription to use previous version reader --------- Co-authored-by: Ken Stevens <ken@smilecdr.com> 17 May 2023, 02:59:47 UTC
2fd2d95 Fixed broken Unit Tester. (#4889) * Fixed broken Unit Tester. * Fixed issue with compilation against CDR. * Fixed an overlay id value in the kotlin pom.xml. 16 May 2023, 01:48:29 UTC
05defb5 Server fixes from Connectathon 32 (#4838) * NPM test cleanup * fix imports * Ongoing cleanup * Rework memory queue * Reindex cleanup * Cleanup * Clean up * Test fixes * Test fixes * Test fixes * Test fix * Test fix 15 May 2023, 12:28:55 UTC
483ddca Transaction with delete then update should not fail (#4831) * Fixed * Test fixes * Add test * Ongoing work * Work on xactx * Cleanup * Changelog cleanup * Resolve fixme * Rework broken APIs * Version bump * Add license headers * License header update * License * rk on fixes * Test fixes * Address review comments * Test fixes * Add license headers * License header 15 May 2023, 11:41:40 UTC
8cf14c8 Dont crash indexing contained references on Bundle (#4881) * Dont crash indexing contained references on Bundle * Add changelog 15 May 2023, 01:33:32 UTC
a308f60 relax (#4880) Co-authored-by: Ken Stevens <ken@smilecdr.com> 14 May 2023, 02:35:18 UTC
4313dc9 pointcut exceptions (#4822) * enforce no exceptions on the invoking thread in PointCutLatch * comment * Msg.code * Catch exceptions outside of await block * fix migration issue * Refactor PointcutLatch and add tests * fix tests * fix tests * fix tests * fix test * fix test * fix test * fix test * fix test * fix test * fix test * fix test * fix test * fix test * fix test! * fix test! * fix test * fix test * clean up latch error formatting * fix test * fix test * fix test * fix test * fix test * fix tests * fix test * fix test * Remove hapi-fhir-jpaserver-uhnfhirtest from build as it is crashing CI * fix test * fix intermittent * A SNAPSHOT dependency on an upstream module was added to HAPI FHIR, which changed and caused some downstream tests to break. * fix intermittent * Add Maven enforcer plugin for CR dependencies * Make maven enforcer conditional on CI builds * Remove hapi-fhir-jpaserver-uhnfhirtest from build as it is crashing CI * improve test logging * pre-review cleanup * review feedback * remove hapi-fhir-base-test-jaxrsserver-kotlin from the build --------- Co-authored-by: Ken Stevens <ken@smilecdr.com> Co-authored-by: Jonathan Percival <jonathan.i.percival@gmail.com> 12 May 2023, 02:31:38 UTC
0475cb6 Jr 20230502 fhir patch test coverage (#4841) * add tests for fhir patch * extract constants * extract some methods * isolate add operation * isolate delete operation * isolate replace operation * isolate move operation * clean up integer handling * enumeration creation * improve variable naming * code review feedback 11 May 2023, 20:40:57 UTC
9d34e6b Credit for #4842 (#4865) * Add credit * Typo 11 May 2023, 18:34:22 UTC
679b809 Fix: Replace basic field with empty value in TerserUtil (#4842) * add test proving bug * fix: handle empty fromValue in TerserUtil.replaceField * add comment to TerserUtilTest.testReplaceFieldByEmptyValue 11 May 2023, 03:09:43 UTC
c052663 Change to a release version of the Clinical Reasoning dependency. (#4858) * A SNAPSHOT dependency on an upstream module was added to HAPI FHIR, which changed and caused some downstream tests to break. * Add Maven enforcer plugin for CR dependencies * Make maven enforcer conditional on CI builds 10 May 2023, 20:25:42 UTC
224b7f6 SubscriptionTopic part3 (#4817) * Force Verify tests * wip * merge troubleshooting rel_6_6 troubleshooting changes * fix ITs (#4809) * fix RestHookTestR5IT * fix intermittent --------- Co-authored-by: Ken Stevens <ken@smilecdr.com> * post-merge cleanup * fix test * fix mock test * fix wiring * fix mock test * fix test * use IBaseResource.isDeleted() * fixmes * cleanup * change log --------- Co-authored-by: Tadgh <garygrantgraham@gmail.com> Co-authored-by: Ken Stevens <ken@smilecdr.com> 09 May 2023, 20:29:21 UTC
e354544 Mergeback of release into master branch (#4839) * Force Verify tests * fix ITs (#4809) * fix RestHookTestR5IT * fix intermittent --------- Co-authored-by: Ken Stevens <ken@smilecdr.com> * Fix migrator error on Oracle (#4814) * Fix Oracle SQL error * Add changelog * Update clinical reasoning version (#4816) * Update clinical reasoning version * Update version * Update version * Clean-up and more wireup of evaluationSettings * Add changelog --------- Co-authored-by: Jonathan Percival <jonathan.i.percival@gmail.com> * Opening the care-gaps endpoint for GET. (#4823) Co-authored-by: Chalma Maadaadi <chalma@alphora.com> * added version to mdm golden resource tag (#4820) Co-authored-by: Long Ma <long@smilecdr.com> * Update the changelog for 4697 to be more descriptive (#4827) * Update the changelog for 4697 to be more descriptive * Futher tweaks of the changelog * Fixes a bug with tags. (#4813) * Test, fix * Drop constraint, add migration * Add changelog * Fix userSelected null vs false * Fix merge * Fix up checkstyle whining * One more failure * Fix test * wip * changelog clarity Co-authored-by: James Agnew <jamesagnew@gmail.com> * change index --------- Co-authored-by: Michael Buckley <michaelabuckley@gmail.com> Co-authored-by: James Agnew <jamesagnew@gmail.com> * fix migration issue (#4830) Co-authored-by: Ken Stevens <ken@smilecdr.com> * Create correct version enum * Remove superfluous migration * fixing test (#4835) Co-authored-by: leif stawnyczy <leifstawnyczy@leifs-MacBook-Pro.local> --------- Co-authored-by: Ken Stevens <khstevens@gmail.com> Co-authored-by: Ken Stevens <ken@smilecdr.com> Co-authored-by: James Agnew <jamesagnew@gmail.com> Co-authored-by: Brenin Rhodes <brenin@alphora.com> Co-authored-by: Jonathan Percival <jonathan.i.percival@gmail.com> Co-authored-by: chalmarm <44471040+chalmarm@users.noreply.github.com> Co-authored-by: Chalma Maadaadi <chalma@alphora.com> Co-authored-by: longma1 <32119004+longma1@users.noreply.github.com> Co-authored-by: Long Ma <long@smilecdr.com> Co-authored-by: Michael Buckley <michaelabuckley@gmail.com> Co-authored-by: TipzCM <leif.stawnyczy@gmail.com> Co-authored-by: leif stawnyczy <leifstawnyczy@leifs-MacBook-Pro.local> 09 May 2023, 18:23:02 UTC
648d14c Parser: Reporting unexpected repeating element for choice (#4574) (#4590) * Parser: Reporting unexpected repeating element for choice (#4574) IParserErrorHandler.unexpectedRepeatingElement is now also called for unexpected repeating elements of type choice, where concrete names may be different based on the choice's data type. * setting test-utilities java version to the test version * added changelog * added Max to the developer liss * removed unneeded dependency --------- Co-authored-by: patrick-werner <pa.f.werner@gmail.com> 08 May 2023, 20:42:25 UTC
9ae71ab 4379: allow interceptor annotation on methods (#4380) * 4379: allow interceptor annotation on methods * 4379: document order parameter when annotation set on method * Credit for #4380 --------- Co-authored-by: James Agnew <jamesagnew@gmail.com> 07 May 2023, 12:25:29 UTC
d5184a8 Don't generate empty JSON element for comment (#4832) * Don't generate empty JSON element for comment * Fixed 06 May 2023, 20:05:48 UTC
93f93d5 Add Migration Reviewer Workflow (#4828) * Add new workflow * Add some whitespace * Empty spaces in non-migration file * wip * Tidy up workflow 06 May 2023, 17:33:17 UTC
17423e4 fix migration issue (#4830) Co-authored-by: Ken Stevens <ken@smilecdr.com> 06 May 2023, 16:13:50 UTC
f0726a3 Fixes a bug with tags. (#4813) * Test, fix * Drop constraint, add migration * Add changelog * Fix userSelected null vs false * Fix merge * Fix up checkstyle whining * One more failure * Fix test * wip * changelog clarity Co-authored-by: James Agnew <jamesagnew@gmail.com> * change index --------- Co-authored-by: Michael Buckley <michaelabuckley@gmail.com> Co-authored-by: James Agnew <jamesagnew@gmail.com> 05 May 2023, 19:06:03 UTC
c637cec 4801 - Added new Index on HFJ_RESOURCE table (#4802) * 4801 - Added new Index on HFJ_RESOURCE table. * 4801 - Added new migration task for new Index on HFJ_RESOURCE table. * Update hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceTable.java Co-authored-by: michaelabuckley <michaelabuckley@gmail.com> * Update hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/migrate/tasks/HapiFhirJpaMigrationTasks.java Co-authored-by: michaelabuckley <michaelabuckley@gmail.com> * Applied review changes. --------- Co-authored-by: michaelabuckley <michaelabuckley@gmail.com> 05 May 2023, 17:37:25 UTC
87e8a81 Merge 4821 back to master (#4825) * Merge 4821 into master * Update to PRE3 snapshot 05 May 2023, 15:50:53 UTC
350d1a4 merge release branch to master (#4811) * Force Verify tests * fix ITs (#4809) * fix RestHookTestR5IT * fix intermittent --------- Co-authored-by: Ken Stevens <ken@smilecdr.com> --------- Co-authored-by: Tadgh <garygrantgraham@gmail.com> Co-authored-by: Ken Stevens <ken@smilecdr.com> 03 May 2023, 19:51:43 UTC
a3c33d2 Add BasicAuditEventLogging (BALP) Interceptor (#4787) * Begin work on BALP interceptor * Work on BALP * Basic profile * Work on BALP * Add BALP * Work on balp * Add update and delete * Work on BALP * Add logging * Tests * Modify test server * Work on docs * Add documentation * Add changelog * Fix #4728 - Typos in docs * Test fixes * Move changelog * Update hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/interceptor/balp/BalpAuditCaptureInterceptor.java Co-authored-by: michaelabuckley <michaelabuckley@gmail.com> * Resolve PR comments * Test fixes --------- Co-authored-by: michaelabuckley <michaelabuckley@gmail.com> 03 May 2023, 15:46:22 UTC
f4c0f6e #4468 fix previous link offset no cache pagination (#4489) * #4468 Add test reproducing the issue * #4468 Fix previous link for no cache offset pagination * #4468 Use unchecked URI parsing * Credit for #4489 --------- Co-authored-by: James Agnew <jamesagnew@gmail.com> 02 May 2023, 12:49:36 UTC
9c1d235 Fix operation on nested type-choices in FhirPatch implementation (#4783) * Fix operation on nested type-choices in FhirPatch implementation * Add credit for #4783 --------- Co-authored-by: James Agnew <jamesagnew@gmail.com> 01 May 2023, 09:52:34 UTC
9a095cc version bump for next release (#4793) * version bump * Bump to correctnumber * Version Enum and folder * Remove interim from list * wip 30 April 2023, 19:01:28 UTC
79c96dc Port changes to master from release branch 6_4 (#4785) * Start porting changes to master that were lost from the release branch. * Add remainder of tag changes from release branch. * Changelog changes. * Fix schema migration. * Remove duplicate lines. * Update core to 6.0.1. * Fixes for new core. * Bump to snapshot 19 to mirror James' changes. * Fix migration tasks. * Fix some of the tests due to the core upgrade. * Fix rest of tests. 28 April 2023, 19:56:02 UTC
81854ba Batch2 cleanup (#4779) Post review batch2 cleanup. Review fixes and cleanup from #4647 Deleted methods in IJobPersistence unused in prod paths, and replaced their usage in tests. Lots of docs. Replace copy-on-write pattern in JobDefinitionRegistry with simple ConcurrentHashMap Fixed bad mappings from job ERRORED state to external APIs. People think ERRORED is a failed state. ¯\_(ツ)_/¯ Added some spec tests for chunk purging Deprecated ERRORED. For deleting in 6.8 Lots of plans for 6.8. Too risky for 6.6 28 April 2023, 19:44:30 UTC
e2e5ff6 Version bump HAPI FHIR (#4788) 28 April 2023, 19:30:51 UTC
69a79e3 Subscription retriggering enhancements (#4758) * Work on forward porting reindex optimize storage * Subscription retriggering performance enhancements * Adjust readmes * Add a test * Add test * Cleanup * Test cleanup * Add comment * Add changelogs * Test fixes * Test fixes * Bump size * Fixes * Test logging * Restore forkcount * Test fix * Test fix * Version bump * Clean up changelogs * Address review comment 28 April 2023, 16:06:38 UTC
78ff582 Make inline resource storage use a better column type (#4763) * Use text column on postgres * Add changelog * Test fix * Merge 28 April 2023, 16:06:27 UTC
e2717bd Bump corelib to FHIR R5 Final (#4727) * Core bump * Build build issues * Bump core * Cleanup * Cleanup * Resolve intermittent * Work on core * Add failing test for a check * Test fixes * Fixes * DOn't mangle subscriptions * Fix * License headers * Build fixes * Version bump * Compile fixes * Fix compile issues 28 April 2023, 10:28:22 UTC
2171ad0 3924 mdm match resources across partitions and storing golden resources on a specific partition (#4770) * added mdm search all partition for golden resource functionality * added mdm partition setting * build header fix * test fixes and added missing side effect of allowing cross partition links on opeartions * added changelog, also test fixes * fixed changelog to an actual yaml file * review fixes, also simplified tests * reverted one test because the original test schenario was correct * added setting clearing in afterEach method so test dont fail while run in maven * bump to pre-15 --------- Co-authored-by: Long Ma <long@smilecdr.com> 28 April 2023, 08:15:35 UTC
457b39b Fix $mdm clear doesn't expunge golden record resources (#4767) * Failing test * Add method to expunge collection of deleted resources * Failing test passes * Add changelog * Version bump * Forgot to commit change * Update test * Check type validity * Fix broken tests --------- Co-authored-by: David Chen <david.chen@smilecdr.com> 28 April 2023, 03:35:27 UTC
ae1e740 delete operation removes element from list (#4782) * delete operation removes element from list * changelog 28 April 2023, 00:01:28 UTC
78b3b14 Support `_exportId` for bulk exports. (#4781) * Full implementation, test, changelogs * Add changelogs * Add default method * Update hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/export/WriteBinaryStep.java Co-authored-by: James Agnew <jamesagnew@gmail.com> * Code Review Comments * Compilation failures --------- Co-authored-by: James Agnew <jamesagnew@gmail.com> 27 April 2023, 21:46:09 UTC
f9de5c9 Apply fixes to review comments for #4772 (#4780) * Add post-fetch filtering to bulk export * Add changelog * Add validator * Test fixes * Test fix * Review comments for #4772 * Commit fix 27 April 2023, 14:23:01 UTC
f6094ee removing backport tag from 4772 27 April 2023, 12:22:13 UTC
855e10a Add post-fetch filtering to bulk export (#4772) * Add post-fetch filtering to bulk export * Add changelog * Add validator * Test fixes * Test fix 26 April 2023, 21:05:03 UTC
6b9af32 R5 Subscriptions (#4748) * comments from conversation with Gino * rewrite R5 subscription canonicalization. Expect the r5 subscription tests to fail now * SubscriptionTopicR5Test passes now * R4B tests pass now * first two tests in RestHookTestR5Test now pass. just need to convert the rest * third test passes * fourth test passes * tests pass up to line 294 * wow what a marathon. Turns out when we stripped the version we didn't remove it from the meta version. * passes up to 427 * RestHookTestR5Test tests pass up to line 582 * RestHookTestR5Test tests pass up to line 591 Added SubscriptionTopicRegisteringSubscriber * RestHookTestR5Test tests pass up to line 591 Added SubscriptionTopicRegisteringSubscriber * RestHookTestR5Test tests pass up to line 636 Added SubscriptionTopicValidatingInterceptor * RestHookTestR5Test tests pass up to line 689 * RestHookTestR5Test tests pass up to line 758 * 4 failures left * woohoo all tests pass * all tests pass and no PointCutLatch errors * Msg.code * changelog * checkstyle * fix some tests * compile issue * fix test * fix regression * fix test * R5 currently runs tests in multiple threads, so change the sensitive one to an IT * licenses * review feedback --------- Co-authored-by: Ken Stevens <ken@smilecdr.com> 26 April 2023, 17:01:00 UTC
8813d9b Batch stabilization (#4647) * Use java event names for work chunk transitions. * Cherry-pick d5ebd1f667 from rel_6_4 Avoid fetching work-chunk data (#4622) * add end time to reduction step (#4640) * add end time to reduction step * add changelog --------- Co-authored-by: Long Ma <long@smilecdr.com> (cherry picked from commit 37f5e59ffc41e20a3ea7e7f6d3bb05ca6840f642) * Cancel processing Provide error message in cancelled jobs, and avoid transitions in final states. * Apply tx boundary to starting job and first chunk. * cleanup * Apply tx boundary to work chunk processing * Delete BatchWorkChunk * Introduce events for job create, and chunk dequeue * Apply tx boundary to chunk handler * Move instance cancellation to database * tx boundary around stats collection and completion * tx boundary around stats collection and completion * Extend tx boundary to error, fail, and cancel * Move failure into status calc * ERROR is not an "ended" state. * Revert generics cleanup to avoid noise * Avoid sending gated chunks twice. * Make no-data path safer. Cleanup * Fix mock test for step advance. * Delete unsafe updateInstace() call * Cleanup * Changelog and notes * Fix cancel boundary. Cleanups * Cleanup * Sort mongo chunks for stable paging. Other cleanup * Document error handling * Cleanup * Update hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/Batch2JobHelper.java Co-authored-by: StevenXLi <stevenli_8118@hotmail.com> --------- Co-authored-by: longma1 <32119004+longma1@users.noreply.github.com> Co-authored-by: StevenXLi <stevenli_8118@hotmail.com> 25 April 2023, 22:47:23 UTC
d6d2ff5 4757 externalized binary npe (#4759) * Basic test for reading from provider * Basic test for reading from provider * Failing test * Add changelog * Update hapi-fhir-jpaserver-test-r4/src/test/java/ca/uhn/fhir/jpa/provider/r4/BinaryStorageInterceptorR4Test.java Co-authored-by: Ken Stevens <khstevens@gmail.com> --------- Co-authored-by: Ken Stevens <khstevens@gmail.com> 25 April 2023, 18:34:27 UTC
20c7a32 Add covering data to res_link index for all tgt->src queries. (#4769) Add covering data to res_link index for all tgt->src queries. 24 April 2023, 23:24:11 UTC
08c997c Compile CDR Master against specific HAPI Branch (#4768) * Create new workflow * Remove dead calls 24 April 2023, 23:18:40 UTC
b7bc630 4745 one source record should create no match link with no errors when two golden records are possible matches (#4765) * created failing test for issue * remove unused code from IT * Fixed an issue where marking a golden resource as no match would fail. --------- Co-authored-by: Steven Li <steven@smilecdr.com> 24 April 2023, 18:38:40 UTC
9670150 4697 - Add Clinical Reasoning Operations (#4722) * Initial stub out of the CR repo API * Pagination first pass * Add HapiFhirRepository and Questionnaire operations * Add services and providers for ActivityDefinition, PlanDefinition and QuestionnaireResponse * Simplify the repo usage * Simplified constructors * Fix pom * Setup service config * Add test * Add tests * Add canonical and resource parameters to cr operations * Add $questionnaire-package operation * Remove services and cleanup beans * Cleanup * Add changelog * Fix pom * Add id parameter to extract * Break out config by IG * cleanup * cleanup * cleanup * cleanup * Add type level operations * Move loadProvider call out of constructors with an EventListener annotation * Cleanup package operation * Update BaseCrR4Test.java * cleanup * cleanup * Fix tests * Fix test * Fix $package arguments * Remove $questionnaire-package * Add r5 apply operation name * Remove config * cleanup * cleanup * cleanup * cleanup * Comment out failing tests. Fix coming in another branch. * Fix config for 1.3 cql measure tests * Fix checkstyle * Change measure service config to resolve intermittent test issues --------- Co-authored-by: Jonathan Percival <jonathan.i.percival@gmail.com> 24 April 2023, 18:37:55 UTC
1c0adda transaction bundle multi-threading issues (#4739) * a solution for trying to avoid multi-thread issues for transaction bundle processing * cleanup * using retries * mnor tweaks * checking in * changes * updating changelog * some minor tweaks * cleanup * flip if --------- Co-authored-by: leif stawnyczy <leifstawnyczy@leifs-MacBook-Pro.local> Co-authored-by: Ken Stevens <ken@smilecdr.com> 20 April 2023, 18:43:37 UTC
58850fe try removing fork count from surefire (#4752) * try removing fork count from test-r4 * try removing fork count from the rest of the projects --------- Co-authored-by: Ken Stevens <ken@smilecdr.com> 20 April 2023, 17:58:35 UTC
55613a9 Fixed the Null Pointer Exception on mdm-submit operation (#4751) * Fixed the Null Pointer Exception on mdm-submit operation * Addressing suggestion 19 April 2023, 19:24:39 UTC
6eafd3f The Lenient error handler will now throw exceptions when encode invalid extension containing value and nested extensions (#4747) * The Lenient error handler will throw exceptions when encode invalid extension containing value and nested extensions * Addressing suggestions * Minor changes * Minor fix 18 April 2023, 17:59:23 UTC
9e741cb remove enabled flag and instead only create the subscription topic beans in the fhir versions that use them (#4737) Co-authored-by: Ken Stevens <ken@smilecdr.com> 18 April 2023, 14:20:43 UTC
396007a test + change + changelog (#4732) 18 April 2023, 13:25:15 UTC
88459d0 4657 method name is inconsistent with the method behavior (#4659) * Test implementation * providing method getMessageKeyOrDefault(); * providing changelog * preping codereview. * Deprecating method getMessageKeyOrNull in favor of getMessagekey() * updating comments following code review. * Bumping version to 6.5.13-SNAPSHOT * passing all tests. --------- Co-authored-by: peartree <etienne.poirier@smilecdr.com> 17 April 2023, 14:41:08 UTC
7bdbda9 Improve Subscription Retriggering Efficiency (#4742) * Improve subscription efficiency * Reduce number of queries * Add changelog * Fix ITs * Review comments * Test fix 17 April 2023, 12:18:57 UTC
83f216b Add `old-intellij` profile to support the old way. (#4740) Activate the `old-intellij` profile to get the old behaviour where everything is Java 17. 14 April 2023, 21:38:38 UTC
35bd1c4 Fix bundle auto-create by checking for IBaseReference.hasIdentifier() before validating URL-based references (#4731) * First commit: New tests, logs, and comments. * Add hacky fix to run pipelines on. Add another unit test. * Disable baseUrl checking if hasIdentifier() is true. * Add changelog. Tweak unit tests. * Remove junk. * Add more assertions to unit tests. Make new production fix code clearer. * Add more clarity to unit tests. * Another unit test fix. 14 April 2023, 17:55:31 UTC
869b6c3 Allow transaction with conditional create and patch in same bundle (#4735) * Allow transaction with conditional create and patch in same bundle * Add changelog * Cleanup 13 April 2023, 19:51:46 UTC
cc9d1b9 fix subscription module restart bug (#4734) * fix subscription module restart bug * changelog --------- Co-authored-by: Ken Stevens <ken@smilecdr.com> 13 April 2023, 17:06:04 UTC
b88ccbc R4B SubscriptionTopic support (#4724) * add tests for r4b subscriptions * begin with failing test * prepare for SubscriptionTopicLoader * backwards compatibility * subscription topic registry done * topic matching is working * all but delivery is working now * yay test passes with FIXMEs * FIXME -> WIP * switch notification to bundle * message codes * fixme * disable services for fhir versions below R4B * fix regression * fix intermittent * this change will likely break some other tests * try a safer option * fix tests * fix intermittent (I hope) * unit test * improve logic around topic subscription categorization * moar test * moar test * changed to support both r4b and r5 * moar test * cleanup for test * moar test * moar test * moar test * changelog * comment * Msg.code * fix mock * add update test * fix test cleanup * tracking link for version converter issue * review * fix test * fix test --------- Co-authored-by: Ken Stevens <ken@smilecdr.com> 12 April 2023, 00:44:08 UTC
450ccb5 $care-gaps functionality integration (#4561) * care gaps integration * fix review comments. * Clean up for HAPI Conventions * More cleanup to share constants * More cleanup of tests * More cleanup * Update CQL versions * Added changelog * fix failing test cases for care gaps. * WIP care-gaps tests * implementation of end to end care gaps test case. * addressing the code review comments. * addressing comments to bring to hapi-fhir standards. * added the docs required. * Adding hapi-fhir-storage-cr module for test coverage inclusion. * Addressing the comments. * addressing comments and updated with master. * Addressing comments for minor changes requested. --------- Co-authored-by: Jonathan Percival <jonathan.i.percival@gmail.com> Co-authored-by: Chalma Maadaadi <chalma@alphora.com> 11 April 2023, 16:28:14 UTC
3a2b722 Clinical Reasoning code fixes (#4726) * Try removing the IFhirResourceDaoValueSet Bean. * Add more TODOs. * Push changes before testing with master. * Prevent the following error from happening with mongo, dqm, and no validation support module configured: org.springframework.context.annotation.AnnotationConfigApplicationContext@4a5b9e6b has not been refreshed yet * Cleanup unnecessary changes. * Add changelog. 11 April 2023, 14:25:44 UTC
89cb179 Fix fhirweb diff template error (#4721) * Add test to check template returned is not empty * Check operation is diff so web template does not error * Refactor for clarity * add changelog --------- Co-authored-by: David Chen <david.chen@smilecdr.com> 11 April 2023, 13:28:16 UTC
e500b23 Instance level reindex operations (#4699) * Reindex improvements * Work * Work on reindex * Test fixes * Generator now working * Add instance reindex * Work * Build fixes * Build fix * Fixes * Add changelog * Test fixes * Resolve checkstyle fix * Version bump * Address review comments * Resolve imports * Address review comments * Test fix 06 April 2023, 21:00:41 UTC
182ac3b Initial stub out of the CR repo API (#4627) * Initial stub out of the CR repo API * Pagination first pass * cleanup * add transaction tests * add search param conversion working logic * add result parameter conversion * add test for keymap * add type checking logic and tests * remove and / or logic from test and cleanup * Initial stub out of the CR repo API * Pagination first pass * cleanup * add transaction tests * add search param conversion working logic * add result parameter conversion * add test for keymap * add type checking logic and tests * Fix repository tests to use parameters * Cleanup after latest merge * Cleanup * Cleanup * Fix Msg codes * Fix Msg codes * Rename variable for clinical reasoning module * Update clinical-reasoning version * Fix version * review comments --------- Co-authored-by: Brenin Rhodes <brenin@alphora.com> Co-authored-by: Rosie Elphick <rosalie.elphick@smilecdr.com> 06 April 2023, 19:53:29 UTC
0255618 Fix versions of httpcore-osgi and httpcore-nio to match httpcore (#4720) Declare versions of httpcore-osgi and httpcore-nio to match httpcore. 06 April 2023, 19:42:29 UTC
f1166fe Tune postgres settings for Hapi indexing. (#4712) Tune postgress settings for Hapi indexing. 05 April 2023, 17:01:24 UTC
49a39c1 Improve performance of ResourceSearchView (use hfj_resource res_id instead of hfj_res_ver res_id when querying by resource pids) (#4716) * Improve performance of ResourceSearchView (use hfj_resource res_id instead of hfj_res_ver res_id when querying by resource pids) * Add changelog and credit --------- Co-authored-by: Primož Delopst <primoz.delopst@better.care> Co-authored-by: James Agnew <jamesagnew@gmail.com> 04 April 2023, 18:30:28 UTC
fa00ef2 Remove IntelliJ workaround now that IDEA-85478 is fixed. (#4710) Remove IntelliJ workaround now that IDEA-85478 is fixed. 03 April 2023, 20:04:18 UTC
a2bc9a7 Partition aware search cleanup (#4706) * Partition aware search cleanup * Compile fixes * Build fixes * HAPI FHIR version bump * License * License header * Tests 02 April 2023, 15:50:20 UTC
4fbeecc enable some disabled tests (#4662) * enabled test * added explanations to disabled tests * added explanations to disabled tests * yay enabled another one * yay enabled another one * testEverythingWithLargeSet2 failing intermittently * fix intermittent regression introduced by splitting test class * test passes * need to document * updated documentation * prereview cleanup * change log * cleanup * cleanup * added breaking changes * update changelog and breaking changes upgrade document to reverse the change to always return 200 per the spec. * back out documentation change * update documentation * fix tests * dstu2 * dstu3 * fix r4 validation warning test * changelog * hapi-fhir version bump to 6.5.10-SNAPSHOT * fix cdr test * fix tests * remove accidental commit --------- Co-authored-by: Ken Stevens <ken@smilecdr.com> 02 April 2023, 12:47:16 UTC
9066ad6 Bug cql engine paging (#4664) * WIP paging * iterable HapifhirRetrieveProvider * Bundle iterating action * cr config update * adding paging functionality for search in cr * updating BundleIterable logic and removing paging references * add measureeval threaded config into cr * update properties * adding hapi change log 4663 * version bump for hapi * update exception with msg.code, move copyright * exorcism of paging provider from cr * updating IT tests for terminology evaluatemeasure * unit test, javadocs, removed reflection code * added comments for explanation * fix javadoc, iterable.size instead of method * update from master --------- Co-authored-by: Jonathan Percival <jonathan.i.percival@gmail.com> Co-authored-by: justin.mckelvy <justin.mckelvy@smilecdr.com> 31 March 2023, 15:09:50 UTC
3fb9a16 4693 enable partitioning in bulk import (#4694) * created failing tests * implemented feature, added more tests * added documentation and changelog * fixed duplicate error code * code review changes --------- Co-authored-by: Steven Li <steven@smilecdr.com> 31 March 2023, 13:43:40 UTC
ccd1e94 Fix index uniqueness (#4703) 30 March 2023, 18:49:07 UTC
1faf77d Fix error message for bad $mdm-link-history input and handle comma-delimited input (#4701) * Fix error message for bad $mdm-link-history input and handle comma-delimited input. * Code review feedback: filter out null objects in the stream. 30 March 2023, 16:51:17 UTC
ee8b5b3 Render narrative in HTML resource view (#4702) * Working * Add changelog 30 March 2023, 14:18:35 UTC
e69fe05 Re-enable "Flush SP cache after SP change" (#4635) * Revert "Revert "Flush SP cache after SP change (#4566)" (#4614)" This reverts commit 9492999ed6346cff3679e10ef9ef35894abc1eca. * Additions for performance * HAPI version bump * Test logging improvement * Test fixes * Test fix * Test fix * Compile fix * Fix * License headers * Test fix 29 March 2023, 23:57:57 UTC
05b3bff Order Location searches using near in closest distance to center of the box (#4687) * All working * CHangelog tweak * Address review comments 29 March 2023, 03:19:34 UTC
2e70b35 tests + change + changelog (#4672) 28 March 2023, 19:52:05 UTC
4883be0 removing hapi-fhir-jpa-server from MR pipeline 28 March 2023, 19:31:30 UTC
734bb3c Ensure querying $mdm-link-history on only golden resource or resource only does not result in an error (#4681) * Ensure querying $mdm-link-history on only golden resource or resource ID does not result in an error. * Change MdmHistorySearchParameters semantics back to set**** so we don't need to a hapi-fhir to cdr bump. * Remove envers disabling from HibernatePropertiesProvider.getDialect as by then it's too late. * Update hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_6_0/4680-mdm-link-history-only-one-of-each-param-no-error.yaml Co-authored-by: Ken Stevens <khstevens@gmail.com> --------- Co-authored-by: Ken Stevens <khstevens@gmail.com> 28 March 2023, 16:25:59 UTC
479e412 Ensure that source resource type of Provenance is also excluded from the $everything linkage. (#4692) 28 March 2023, 14:41:24 UTC
b2c0a48 4610 enable partitioning in bulk export (#4682) * Initial commit adding support for partition awareness to Bulk Export. * Additional cleanup and remove references in tests to "all partitions". * Additional cleanup and remove references in tests to "all partitions". * More cleanup, test fixes and additional checking to validate partition accesses. * Additional changes to ensure checking of partition during polling operations. * Add change log. * More cleanup. * Change recommended in code review. --------- Co-authored-by: ianmarshall <ian@simpatico.ai> 27 March 2023, 18:22:30 UTC
90da12f _has query with non-existent reference field (#4676) * handle empty values for QueryParameterUtils.toEqualToOrInPredicate and QueryParameterUtils.toNotEqualToOrInPredicate * fix tests that were improperly mocked * Revert "handle empty values for QueryParameterUtils.toEqualToOrInPredicate and QueryParameterUtils.toNotEqualToOrInPredicate" This reverts commit 4382cd31 * throw InvalidRequestException if non-existent reference field is provided for a _has query 27 March 2023, 15:52:29 UTC
47262f5 Ks 20230324 include prov (#4685) * fix test * fixed * changelog * add another test * improve docs * fix change log * fix test * fix test --------- Co-authored-by: Ken Stevens <ken@smilecdr.com> 25 March 2023, 21:50:12 UTC
back to top