Fix legacy pathogen-test method/category dropped on load for disease-hidden methods

Author: roldy

sormas-api/src/test/java/de/symeda/sormas/api/sample/PathogenTestTypeTest.java

@@ -130,4 +130,19 @@ public void legacyTestTypeStillResolvesForExistingDiseaseConfiguration() {
 			.getVisibleValues(PathogenTestType.class, Disease.INVASIVE_PNEUMOCOCCAL_INFECTION);
 		assertThat(visibleForIpi, hasItem(PathogenTestType.SEQUENCING));
 	}
+
+	@Test
+	public void diseaseHiddenLegacyMethodIsDroppedByVisibleValues() {
+		// Guards the scenario behind the retainType re-add in FormComponent#updateTestTypeItemsByCategory
+		// and the retainCategory re-add in #getVisibleTestCategories: a legacy method that is
+		// @Diseases(hide = true) for a disease is excluded by getVisibleValues for that disease, so a
+		// saved test recorded with it can only be kept selectable by adding it back explicitly.
+		List<PathogenTestType> visibleForDengue =
+			de.symeda.sormas.api.utils.Diseases.DiseasesConfiguration.getVisibleValues(PathogenTestType.class, Disease.DENGUE);
+		assertFalse(
+			visibleForDengue.contains(PathogenTestType.ANTIBODY_DETECTION),
+			"ANTIBODY_DETECTION is hidden for DENGUE, so it must not be among the disease-visible values");
+		// Its category is still resolvable from the method itself, independent of disease visibility.
+		assertThat(PathogenTestType.getCategory(PathogenTestType.ANTIBODY_DETECTION), is(PathogenTestCategory.SEROLOGICAL_TESTS));
+	}
 }

sormas-ui/src/main/java/de/symeda/sormas/ui/samples/components/TestMethodComponent.java

@@ -390,6 +390,9 @@ public void setDto(PathogenTestDto dto) {
 		// test recorded with a now-hidden/legacy method still loads and displays its method + category.
 		PathogenTestType savedType = dto != null ? dto.getTestType() : null;
 		PathogenTestCategory savedCategory = PathogenTestType.getCategory(savedType);
+		// A legacy/hidden saved method's category may not be among the scoped categories; include it so
+		// the selection is a member of the combo's items (Vaadin 8 won't display a value outside them).
+		testCategoryField.setItems(getVisibleTestCategories(currentDisease, savedCategory));
 		testCategoryField.setValue(savedCategory);
 		updateTestTypeItemsByCategory(testTypeField, currentDisease, savedCategory, savedType);
 		super.setDto(dto);

sormas-ui/src/main/java/de/symeda/sormas/ui/utils/FormComponent.java

@@ -322,8 +322,14 @@ protected static void updateTestTypeItemsByCategory(
 			.stream()
 			.filter(type -> type == retainType || PathogenTestType.isSelectableForNewTests(type))
 			.filter(type -> type == retainType || category == null || PathogenTestType.getCategory(type) == category)
-			.sorted(Comparator.comparing(Object::toString))
 			.collect(Collectors.toList());
+		// getVisibleValues drops values marked @Diseases(hide = true) for this disease, so the
+		// type == retainType guards above cannot re-add a saved legacy method that is hidden here.
+		// Add it explicitly so an existing test recorded with such a method still loads and displays.
+		if (retainType != null && !filtered.contains(retainType)) {
+			filtered.add(retainType);
+		}
+		filtered.sort(Comparator.comparing(Object::toString));
 		comboBox.setItems(filtered);
 		if (retainType != null && filtered.contains(retainType)) {
 			comboBox.setValue(retainType);
@@ -335,14 +341,26 @@ protected static void updateTestTypeItemsByCategory(
 	 * for the given disease, so empty categories are not offered. Sorted alphabetically.
 	 */
 	protected static List<PathogenTestCategory> getVisibleTestCategories(Disease disease) {
+		return getVisibleTestCategories(disease, null);
+	}
+
+	/**
+	 * As {@link #getVisibleTestCategories(Disease)} but additionally includes {@code retainCategory}
+	 * even when no selectable, disease-visible method maps to it — used when loading an existing test
+	 * whose (possibly legacy/hidden) method's category would otherwise be absent from the selector.
+	 */
+	protected static List<PathogenTestCategory> getVisibleTestCategories(Disease disease, PathogenTestCategory retainCategory) {
 		List<PathogenTestCategory> categories = Diseases.DiseasesConfiguration.getVisibleValues(PathogenTestType.class, disease)
 			.stream()
 			.filter(PathogenTestType::isSelectableForNewTests)
 			.map(PathogenTestType::getCategory)
 			.filter(java.util.Objects::nonNull)
 			.distinct()
-			.sorted(Comparator.comparing(Object::toString))
 			.collect(Collectors.toList());
+		if (retainCategory != null && !categories.contains(retainCategory)) {
+			categories.add(retainCategory);
+		}
+		categories.sort(Comparator.comparing(Object::toString));
 		return categories;
 	}