Skip to content

#13557 - Make "Verified by Supervisor" checkbox in the pathogen test … #13783

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

Open
roldy wants to merge 3 commits into
base: development
Choose a base branch
from
Open

#13557 - Make "Verified by Supervisor" checkbox in the pathogen test … #13783

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c2f1e48
#13557 - Make "Verified by Supervisor" checkbox in the pathogen test …
roldy Dec 24, 2025
0bc2853
#13557 - Fix unsafe null handling of testResultVerified field across …
roldy Dec 24, 2025
7ad38b2
#13557 - Fix unsafe null handling of testResultVerified field across …
roldy Dec 24, 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
1 change: 0 additions & 1 deletion sormas-api/src/main/java/de/symeda/sormas/api/sample/PathogenTestDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,6 @@ public class PathogenTestDto extends PseudonymizableDto {
@SensitiveData
@Size(max = FieldConstraints.CHARACTER_LIMIT_BIG, message = Validations.textTooLong)
private String testResultText;
@NotNull(message = Validations.requiredField)
private Boolean testResultVerified;
private boolean fourFoldIncreaseAntibodyTiter;
@SensitiveData
Expand Down
5 changes: 2 additions & 3 deletions ...pp/app/src/main/java/de/symeda/sormas/app/pathogentest/edit/PathogenTestEditActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import android.os.AsyncTask;
import android.util.Log;
import android.view.Menu;

import de.symeda.sormas.api.disease.DiseaseVariant;
import de.symeda.sormas.api.i18n.I18nProperties;
import de.symeda.sormas.api.i18n.Strings;
Expand Down Expand Up @@ -100,7 +99,7 @@ public void saveData() {
DiseaseVariant caseDiseaseVariant = associatedCase.getDiseaseVariant();
DiseaseVariant newDiseaseVariant = pathogenTestToSave.getTestedDiseaseVariant();
if (pathogenTestToSave.getTestResult() == PathogenTestResultType.POSITIVE
&& pathogenTestToSave.getTestResultVerified()
&& Boolean.TRUE.equals(pathogenTestToSave.getTestResultVerified())
&& !DataHelper.equal(newDiseaseVariant, caseDiseaseVariant)) {

String heading = I18nProperties.getString(Strings.headingUpdateCaseWithNewDiseaseVariant);
Expand Down Expand Up @@ -155,7 +154,7 @@ protected void onPostExecute(AsyncTaskResult<TaskResultHolder> taskResult) {
if (taskResult.getResultStatus().isSuccess()) {
Sample sampleOfPathogenTestToSave = pathogenTestToSave.getSample();
if (sampleOfPathogenTestToSave != null
&& Boolean.TRUE == pathogenTestToSave.getTestResultVerified()
&& Boolean.TRUE.equals(pathogenTestToSave.getTestResultVerified())
&& pathogenTestToSave.getTestedDisease() == associatedCase.getDisease()
&& pathogenTestToSave.getTestResult() != sampleOfPathogenTestToSave.getPathogenTestResult()) {
final ConfirmationDialog confirmationDialog = new ConfirmationDialog(
Expand Down
2 changes: 1 addition & 1 deletion ...app/app/src/main/java/de/symeda/sormas/app/pathogentest/edit/PathogenTestNewActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ public void saveData() {
DiseaseVariant caseDiseaseVariant = associatedCase.getDiseaseVariant();
DiseaseVariant newDiseaseVariant = pathogenTestToSave.getTestedDiseaseVariant();
if (pathogenTestToSave.getTestResult() == PathogenTestResultType.POSITIVE
&& pathogenTestToSave.getTestResultVerified()
&& Boolean.TRUE.equals(pathogenTestToSave.getTestResultVerified())
&& !DataHelper.equal(newDiseaseVariant, caseDiseaseVariant)) {

String heading = I18nProperties.getString(Strings.headingUpdateCaseWithNewDiseaseVariant);
Expand Down
2 changes: 1 addition & 1 deletion sormas-backend/src/main/java/de/symeda/sormas/backend/sample/PathogenTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ public void setTestResultText(String testResultText) {
this.testResultText = testResultText;
}

@Column(nullable = false)
@Column
public Boolean getTestResultVerified() {
return testResultVerified;
}
Expand Down
3 changes: 2 additions & 1 deletion sormas-backend/src/main/java/de/symeda/sormas/backend/sample/PathogenTestFacadeEjb.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -490,7 +490,8 @@ public void validate(PathogenTestDto pathogenTest) throws ValidationRuntimeExcep
Validations.required,
I18nProperties.getPrefixCaption(PathogenTestDto.I18N_PREFIX, PathogenTestDto.TEST_RESULT)));
}
if (pathogenTest.getTestResultVerified() == null) {
// Validate testResultVerified is required when test comes via LIMS (laboratory is directly connected)
if (pathogenTest.isViaLims() && pathogenTest.getTestResultVerified() == null) {
throw new ValidationRuntimeException(
I18nProperties.getValidationError(
Validations.required,
Expand Down
6 changes: 6 additions & 0 deletions sormas-backend/src/main/resources/sql/sormas_schema.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15062,4 +15062,10 @@ ALTER TABLE testreport_history ADD COLUMN serotype character varying(255);
ALTER TABLE testreport_history ADD COLUMN straincallstatus character varying(255);

INSERT INTO schema_version (version_number, comment) VALUES (602, 'External message additional fields');

-- 2025-12-18 Make testResultVerified optional in pathogentest #13557
ALTER TABLE pathogentest ALTER COLUMN testresultverified DROP NOT NULL;
ALTER TABLE pathogentest_history ALTER COLUMN testresultverified DROP NOT NULL;

INSERT INTO schema_version (version_number, comment) VALUES (603, 'Make testResultVerified optional in pathogentest #13557');
-- *** Insert new sql commands BEFORE this line. Remember to always consider _history tables. ***
18 changes: 9 additions & 9 deletions sormas-ui/src/main/java/de/symeda/sormas/ui/samples/PathogenTestController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,12 +372,12 @@ private void handleAssociatedCase(List<PathogenTestDto> pathogenTests, CaseRefer
Map<Disease, List<PathogenTestDto>> testsByDisease = pathogenTests.stream().collect(Collectors.groupingBy(PathogenTestDto::getTestedDisease));
Optional<PathogenTestDto> positiveWithSameDisease = testsByDisease.getOrDefault(caze.getDisease(), Collections.emptyList())
.stream()
.filter(t -> t.getTestResult() == PathogenTestResultType.POSITIVE && t.getTestResultVerified())
.filter(t -> t.getTestResult() == PathogenTestResultType.POSITIVE && Boolean.TRUE.equals(t.getTestResultVerified()))
.findFirst();

Optional<PathogenTestDto> negativeWithSameDisease = testsByDisease.getOrDefault(caze.getDisease(), Collections.emptyList())
.stream()
.filter(t -> t.getTestResult() == PathogenTestResultType.NEGATIVE && t.getTestResultVerified())
.filter(t -> t.getTestResult() == PathogenTestResultType.NEGATIVE && Boolean.TRUE.equals(t.getTestResultVerified()))
.findFirst();

PathogenTestDto resultedPathogenTest;
Expand All @@ -401,7 +401,7 @@ private void handleAssociatedCase(List<PathogenTestDto> pathogenTests, CaseRefer
List<PathogenTestDto> tests = testsByDisease.get(disease);

Optional<PathogenTestDto> positiveWithOtherDisease =
tests.stream().filter(t -> t.getTestResult() == PathogenTestResultType.POSITIVE && t.getTestResultVerified()).findFirst();
tests.stream().filter(t -> t.getTestResult() == PathogenTestResultType.POSITIVE && Boolean.TRUE.equals(t.getTestResultVerified())).findFirst();

if (positiveWithOtherDisease.isPresent()) {
List<CaseDataDto> duplicatedCases =
Expand Down Expand Up @@ -441,12 +441,12 @@ private void handleAssociatedContact(List<PathogenTestDto> pathogenTests, Contac
Map<Disease, List<PathogenTestDto>> testsByDisease = pathogenTests.stream().collect(Collectors.groupingBy(PathogenTestDto::getTestedDisease));
Optional<PathogenTestDto> positiveWithSameDisease = testsByDisease.getOrDefault(contact.getDisease(), Collections.emptyList())
.stream()
.filter(t -> t.getTestResult() == PathogenTestResultType.POSITIVE && t.getTestResultVerified())
.filter(t -> t.getTestResult() == PathogenTestResultType.POSITIVE && Boolean.TRUE.equals(t.getTestResultVerified()))
.findFirst();

Optional<PathogenTestDto> negativeWithSameDisease = testsByDisease.getOrDefault(contact.getDisease(), Collections.emptyList())
.stream()
.filter(t -> t.getTestResult() == PathogenTestResultType.NEGATIVE && t.getTestResultVerified())
.filter(t -> t.getTestResult() == PathogenTestResultType.NEGATIVE && Boolean.TRUE.equals(t.getTestResultVerified()))
.findFirst();

final boolean caseCreationPossible = UiUtil.permitted(FeatureType.CASE_SURVEILANCE, UserRight.CASE_CREATE);
Expand All @@ -467,7 +467,7 @@ private void handleAssociatedContact(List<PathogenTestDto> pathogenTests, Contac
List<PathogenTestDto> tests = testsByDisease.get(disease);

Optional<PathogenTestDto> positiveWithOtherDisease =
tests.stream().filter(t -> t.getTestResult() == PathogenTestResultType.POSITIVE && t.getTestResultVerified()).findFirst();
tests.stream().filter(t -> t.getTestResult() == PathogenTestResultType.POSITIVE && Boolean.TRUE.equals(t.getTestResultVerified())).findFirst();
if (positiveWithOtherDisease.isPresent()) {
List<CaseDataDto> duplicatedCases =
FacadeProvider.getCaseFacade().getDuplicatesWithPathogenTest(contact.getPerson(), positiveWithOtherDisease.get());
Expand Down Expand Up @@ -504,12 +504,12 @@ private void handleAssociatedEventParticipant(List<PathogenTestDto> pathogenTest
Map<Disease, List<PathogenTestDto>> testsByDisease = pathogenTests.stream().collect(Collectors.groupingBy(PathogenTestDto::getTestedDisease));
Optional<PathogenTestDto> positiveWithSameDisease = testsByDisease.getOrDefault(eventDisease, Collections.emptyList())
.stream()
.filter(t -> t.getTestResult() == PathogenTestResultType.POSITIVE && t.getTestResultVerified())
.filter(t -> t.getTestResult() == PathogenTestResultType.POSITIVE && Boolean.TRUE.equals(t.getTestResultVerified()))
.findFirst();

Optional<PathogenTestDto> negativeWithSameDisease = testsByDisease.getOrDefault(eventDisease, Collections.emptyList())
.stream()
.filter(t -> t.getTestResult() == PathogenTestResultType.NEGATIVE && t.getTestResultVerified())
.filter(t -> t.getTestResult() == PathogenTestResultType.NEGATIVE && Boolean.TRUE.equals(t.getTestResultVerified()))
.findFirst();

final boolean caseCreationPossible = UiUtil.permitted(FeatureType.CASE_SURVEILANCE, UserRight.CASE_CREATE);
Expand All @@ -531,7 +531,7 @@ private void handleAssociatedEventParticipant(List<PathogenTestDto> pathogenTest
List<PathogenTestDto> tests = testsByDisease.get(disease);

Optional<PathogenTestDto> positiveWithOtherDisease =
tests.stream().filter(t -> t.getTestResult() == PathogenTestResultType.POSITIVE && t.getTestResultVerified()).findFirst();
tests.stream().filter(t -> t.getTestResult() == PathogenTestResultType.POSITIVE && Boolean.TRUE.equals(t.getTestResultVerified())).findFirst();
if (positiveWithOtherDisease.isPresent() && UiUtil.enabled(FeatureType.CASE_SURVEILANCE)) {
List<CaseDataDto> duplicatedCases = FacadeProvider.getCaseFacade()
.getDuplicatesWithPathogenTest(eventParticipant.getPerson().toReference(), positiveWithOtherDisease.get());
Expand Down
12 changes: 10 additions & 2 deletions sormas-ui/src/main/java/de/symeda/sormas/ui/samples/PathogenTestForm.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,7 @@ protected void addFields() {
getContent().addComponent(pathogenTestHeadingLabel, PATHOGEN_TEST_HEADING_LOC);

addDateField(PathogenTestDto.REPORT_DATE, DateField.class, 0);
addField(PathogenTestDto.VIA_LIMS);
CheckBox viaLimsField = addField(PathogenTestDto.VIA_LIMS);
addField(PathogenTestDto.EXTERNAL_ID);
addField(PathogenTestDto.EXTERNAL_ORDER_ID);
testTypeField = addField(PathogenTestDto.TEST_TYPE, ComboBox.class);
Expand Down Expand Up @@ -951,9 +951,17 @@ protected void addFields() {
PathogenTestDto.TUBE_MITOGENE_GT10);

NullableOptionGroup testResultVerifiedField = addField(PathogenTestDto.TEST_RESULT_VERIFIED, NullableOptionGroup.class);
testResultVerifiedField.setRequired(true);
addField(PathogenTestDto.PRELIMINARY).addStyleName(CssStyles.VSPACE_4);

// Make TEST_RESULT_VERIFIED required only when the test comes via LIMS (laboratory is directly connected)
viaLimsField.addValueChangeListener(e -> {
boolean isViaLims = Boolean.TRUE.equals(e.getProperty().getValue());
testResultVerifiedField.setRequired(isViaLims);
});

// Set initial required state based on current viaLims value
testResultVerifiedField.setRequired(Boolean.TRUE.equals(viaLimsField.getValue()));

CheckBox fourFoldIncrease = addField(PathogenTestDto.FOUR_FOLD_INCREASE_ANTIBODY_TITER, CheckBox.class);
CssStyles.style(fourFoldIncrease, VSPACE_3, VSPACE_TOP_4);
fourFoldIncrease.setVisible(false);
Expand Down
Loading