Skip to content

More code merge 2026-05-05 - #46

Merged
westei merged 51 commits into
developfrom
more/code-merge-2026-05-05
May 6, 2026
Merged

More code merge 2026-05-05#46
westei merged 51 commits into
developfrom
more/code-merge-2026-05-05

Conversation

@westei

@westei westei commented May 5, 2026

Copy link
Copy Markdown
Member

This merges all changes from the MORE develop branch back to UMM

Rupert Westenthaler and others added 30 commits March 11, 2026 10:24
…e in the compile-test pipeline configuration as those are not needed in the target repository
…ribution-2026-02

code contribution 2026 02 from UMM
…but being extensible for other application types.
…ndling

# Conflicts:
#	studymanager-services/src/main/java/io/redlink/more/studymanager/model/Participant.java
#	studymanager-services/src/main/java/io/redlink/more/studymanager/service/ParticipantService.java
#	studymanager-services/src/test/java/io/redlink/more/studymanager/service/ParticipantServiceTest.java
…gin-code-generator

MORE-Platform#469: Implemented application login token generation for participants
…on-access-bug

634 application access bug
…on-access-bug

#634: Small default pp url change
* added FIXME notes for things to change in a follow-up issue
* added the participantId to a log statement

Co-authored-by: Rupert Westenthaler <rupert.westenthaler@gmail.com>
…y-improvements

371 limesurvey improvements
…a dependency to the `LoginTokenService`. The `ApplicationAccessService` already cares about the necessary cleanups
…388_reset_tokens_after_preview

Prehab2rehab/388 reset tokens after preview
…urvey-submit-date-fix

MORE-Platform#440: Fixed the lime survey submit date if empty
janoliver20 and others added 21 commits April 9, 2026 07:01
…mesurvey-data-storage

MORE-Platform#481: Reverted the limesurvey answer storage to the short id form
…-tags

#15: Implemented tags into the pipeline to correctly tag new versions…
…ce of the data gateway. Added the functionality also to the OccurredObservation repo & service of the study manager backend so that it is possible to write component tests!
…280_occurred-observation-by-start-end

MORE-Platform#280: OccurredObservation by start/end time
… observation and removed the token from being stored in the elastic
* Checks that only a single Survey is present for the Observation
* Checks that the `id` and `seed` data are present for the Observation

NOTE: Checks for actual Survey Data are not implemented as those would require API calls to the Lime Server and this is not feasible for periodic data health check. In addition their is no guarantee that a LimeSurvey is still available and unmodified on the server.
…esurvey-upgrade-fix

#24: Fixed an issue that prevented to change the lime survey id of an…
…479_data-health-lime-observation

MORE-Platform#479: DataHealth for LimeObservation
…ultiple studies and observations. It encodes the study, observation and participant in the givenname and adds more as lastname. It keeps backward compatibility for old/current studies by accepting the old format where the participantId was added as given and last name. It adds a UnitTest for the activate Method that checks if it performs the expected calls to the LimeServer and the SDK
Co-authored-by: Jan Cortiel <37823749+janoliver20@users.noreply.github.com>
…491_lime-survey-mapping-study-observation-participant

MORE-Platform#491: Multi Sudy/Observation LimeSurvey support
@westei
westei requested review from iaigner and janoliver20 May 5, 2026 07:01
@westei westei self-assigned this May 5, 2026
@github-actions

github-actions Bot commented May 5, 2026

Copy link
Copy Markdown

Test Results

187 tests  +77   186 ✅ +77   1m 54s ⏱️ +32s
 54 suites +18     1 💤 + 1 
 54 files   +18     0 ❌  -  1 

Results for commit 4566578. ± Comparison against base commit 94fb470.

This pull request removes 1 and adds 78 tests. Note that renamed tests count towards both.
io.redlink.more.studymanager.component.observation.lime.LimeSurveyRequestServiceTest ‑ responseTest
io.redlink.more.studymanager.ApplicationTest ‑ contextLoads
io.redlink.more.studymanager.component.observation.lime.LimeSurveyObservationTest ‑ testActivation
io.redlink.more.studymanager.component.observation.lime.LimeSurveyObservationTest ‑ testValidation
io.redlink.more.studymanager.component.observation.lime.LimeSurveyRequestServiceTest ‑ fixNullDateTest
io.redlink.more.studymanager.controller.studymanager.ApplicationsAPIV1ControllerTest ‑ testGetStudyApplications
io.redlink.more.studymanager.controller.studymanager.AuditLogControllerTest ‑ testExportAuditLogs
io.redlink.more.studymanager.controller.studymanager.AuditLogControllerTest ‑ testGetAuditlogMetadata
io.redlink.more.studymanager.controller.studymanager.CalendarControllerTest ‑ testGetStudyTimeline
io.redlink.more.studymanager.controller.studymanager.ComponentControllerTest ‑ testComponentSpecificEndpointDoesNotExist
io.redlink.more.studymanager.controller.studymanager.ComponentControllerTest ‑ testComponentSpecificEndpointExists
…

@janoliver20 janoliver20 left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@westei
westei merged commit 83a4f51 into develop May 6, 2026
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants