Skip to content
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

Carry form language selection over to new form version #6621

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Carry form language selection over to new form version #6621

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
fb31c93
Added a failing test
grzesiek2010 Feb 23, 2025
af4972f
Carry form language selection over to new form version
grzesiek2010 Feb 23, 2025
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
7 changes: 7 additions & 0 deletions ...ect_app/src/main/java/org/odk/collect/android/database/forms/DatabaseFormsRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
import java.io.File;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -171,6 +172,12 @@ public Form save(@NotNull Form form) {
if (form.getDbId() == null) {
values.put(DATE, clock.get());

List<Form> existingFormsWithSameFormId = getAllByFormId(form.getFormId());
if (!existingFormsWithSameFormId.isEmpty()) {
Form latestFormWithSameFormId = Collections.max(existingFormsWithSameFormId, Comparator.comparing(Form::getDate));
values.put(LANGUAGE, latestFormWithSameFormId.getLanguage());
}

Long idFromUri = insertForm(values);
if (idFromUri == -1) {
return getOneByMd5Hash(md5Hash);
Expand Down
19 changes: 19 additions & 0 deletions forms-test/src/main/java/org/odk/collect/formstest/FormsRepositoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,25 @@ public void save_whenFormHasId_updatesHash() throws IOException {
assertThat(formsRepository.get(originalForm.getDbId()).getMD5Hash(), is(expectedHash));
}

@Test
public void save_withNewFormVersion_copiesLanguageFromLatestFormVersion() {
FormsRepository formsRepository = buildSubject();

Form formV1 = formsRepository.save(FormUtils.buildForm("id", "1", getFormFilesPath()).build());
formsRepository.save(new Form.Builder(formV1)
.language("Spanish")
.build());

Form formV2 = formsRepository.save(FormUtils.buildForm(formV1.getFormId(), "2", getFormFilesPath()).build());
formsRepository.save(new Form.Builder(formV2)
.language("Polish")
.build());

Form formV3 = formsRepository.save(FormUtils.buildForm(formV1.getFormId(), "3", getFormFilesPath()).build());

assertThat(formsRepository.get(formV3.getDbId()).getLanguage(), is("Polish"));
}

@Test
public void delete_deletesFiles() throws Exception {
FormsRepository formsRepository = buildSubject();
Expand Down
7 changes: 7 additions & 0 deletions forms-test/src/main/java/org/odk/collect/formstest/InMemFormsRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

import java.io.File;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.Objects;
Expand Down Expand Up @@ -141,6 +142,12 @@ public Form save(@NotNull Form form) {
builder.jrCacheFilePath(TempFiles.getPathInTempDir(hash, ".formdef"));
}

List<Form> existingFormsWithSameFormId = getAllByFormId(form.getFormId());
if (!existingFormsWithSameFormId.isEmpty()) {
Form latestFormWithSameFormId = Collections.max(existingFormsWithSameFormId, Comparator.comparing(Form::getDate));
builder.language(latestFormWithSameFormId.getLanguage());
}

Form formToSave = builder.build();
forms.add(formToSave);
return formToSave;
Expand Down