Skip to content

#385: Fixed a bug for importing GoalTopic #69

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.

Sign up for GitHub

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

Merged
westei merged 2 commits into from
Jul 10, 2026
Merged

#385: Fixed a bug for importing GoalTopic #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
933e58d
#385: Fixed a bug where while importing `GoalTopic` a check was done …
Jul 10, 2026
f398bdb
#385: Looks like this bug was possible because the assertion in the r…
Jul 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions .../main/java/io/redlink/more/studymanager/repository/goals/GoalConfigurationRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ public GoalTopic saveTopic(GoalTopic topic) {

@Transactional
public GoalTopic doImport(Long studyId, GoalTopic topic) {
var existing = getTopic(topic.getStudyId(), topic.getKey());
var existing = getTopic(studyId, topic.getKey());
if(existing == null) {
// Force the correct studyId — ignore whatever came in the object
topic.setStudyId(studyId);
Expand Down Expand Up @@ -159,8 +159,7 @@ public GoalAdherenceCheck doImport(Long studyId, GoalAdherenceCheck check) {
namedTemplate.update(
IMPORT_ADHERENCE_CHECK,
toParams(check)
.addValue("study_id", studyId)
.addValue("check_id", check.getCheckId()),
.addValue("study_id", studyId),
keyHolder,
new String[]{"check_id"}
);
Expand Down
6 changes: 4 additions & 2 deletions ...t/java/io/redlink/more/studymanager/repository/goals/GoalConfigurationRepositoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,10 +322,12 @@ void testDoImportGoalTopic() {
GoalTopic reImported = goalConfigurationRepository.doImport(studyB, updatedVersion);

assertThat(reImported.getStudyId()).isEqualTo(studyB);
assertThat(reImported.getTitle()).isEqualTo("Updated - Drink More Water");
//it is expected that it is NOT overridden if already existing. So the old title is expected
assertThat(reImported.getTitle()).isEqualTo("Drink Water");

//validate also directly in the DB
assertThat(goalConfigurationRepository.getTopic(studyB, "hydration").getTitle())
.isEqualTo("Updated - Drink More Water");
.isEqualTo("Drink Water");
}

@Test
Expand Down
Loading