Merge pull request #13961 from SORMAS-Foundation/feature/13948-ast-refactor

Tests are categorised and AST structure (DrugSusceptibility) enhancement

Author: roldy

sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java

@@ -2401,6 +2401,7 @@ public interface Captions {
 	String PathogenTest_specie = "PathogenTest.specie";
 	String PathogenTest_specieText = "PathogenTest.specieText";
 	String PathogenTest_strainCallStatus = "PathogenTest.strainCallStatus";
+	String PathogenTest_testCategory = "PathogenTest.testCategory";
 	String PathogenTest_testDateTime = "PathogenTest.testDateTime";
 	String PathogenTest_testedDisease = "PathogenTest.testedDisease";
 	String PathogenTest_testedDiseaseDetails = "PathogenTest.testedDiseaseDetails";

sormas-api/src/main/java/de/symeda/sormas/api/i18n/Strings.java

@@ -1925,12 +1925,14 @@ public interface Strings {
 	String promptSelfReportEpiWeekFrom = "promptSelfReportEpiWeekFrom";
 	String promptSelfReportEpiWeekTo = "promptSelfReportEpiWeekTo";
 	String promptSelfReportFreeTextSearch = "promptSelfReportFreeTextSearch";
+	String promptSurveillanceInterpretation = "promptSurveillanceInterpretation";
 	String promptSurvey = "promptSurvey";
 	String promptSurveyAssignedFrom = "promptSurveyAssignedFrom";
 	String promptSurveyAssignedTo = "promptSurveyAssignedTo";
 	String promptSurveyFreeTextSearch = "promptSurveyFreeTextSearch";
 	String promptSurveyResponseStatus = "promptSurveyResponseStatus";
 	String promptSurveyTokenFreeTextSearch = "promptSurveyTokenFreeTextSearch";
+	String promptSusceptibilityMethod = "promptSusceptibilityMethod";
 	String promptSystemConfigurationSearchField = "promptSystemConfigurationSearchField";
 	String promptTaskDateFrom = "promptTaskDateFrom";
 	String promptTaskDateTo = "promptTaskDateTo";
@@ -1947,6 +1949,7 @@ public interface Strings {
 	String promptTreatmentTextFilter = "promptTreatmentTextFilter";
 	String promptTypeToAdd = "promptTypeToAdd";
 	String promptUserSearch = "promptUserSearch";
+	String promptZoneDiameter = "promptZoneDiameter";
 	String promtSampleDataType = "promtSampleDataType";
 	String pseudonymizedCasesSelectedWarning = "pseudonymizedCasesSelectedWarning";
 	String pseudonymizedEntitiesSelectedWarning = "pseudonymizedEntitiesSelectedWarning";

sormas-api/src/main/java/de/symeda/sormas/api/sample/NotSelectableForNewTests.java

@@ -0,0 +1,39 @@
+/*
+ * SORMAS® - Surveillance Outbreak Response Management & Analysis System
+ * Copyright © 2016-2026 Helmholtz-Zentrum für Infektionsforschung GmbH (HZI)
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.symeda.sormas.api.sample;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Marks a {@link PathogenTestType} value as a legacy method that must no longer be offered when
+ * adding a <em>new</em> pathogen test, regardless of disease — for example methods that were merged
+ * into a broader entry (the old IgM/IgG/IgA serum antibody values, now ELISA) or superseded
+ * (e.g. {@code CQ_VALUE_DETECTION}).
+ *
+ * <p>
+ * The constant is intentionally kept rather than deleted: it is still referenced by case
+ * classification, external-message mapping and exports, and existing tests recorded with it must
+ * continue to display and export unchanged. Only the new-test method picker filters it out (read at
+ * runtime by {@link PathogenTestType#isSelectableForNewTests(PathogenTestType)}); the "keep the
+ * currently-saved value" behaviour of the form still lets such records be edited.
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.FIELD)
+public @interface NotSelectableForNewTests {
+}

sormas-api/src/main/java/de/symeda/sormas/api/sample/PathogenTestCategory.java

@@ -0,0 +1,40 @@
+/*
+ * SORMAS® - Surveillance Outbreak Response Management & Analysis System
+ * Copyright © 2016-2026 Helmholtz-Zentrum für Infektionsforschung GmbH (HZI)
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.symeda.sormas.api.sample;
+
+import de.symeda.sormas.api.i18n.I18nProperties;
+
+/**
+ * Broad grouping of laboratory test methods. When adding a pathogen test the user first picks a
+ * category, which scopes the available {@link PathogenTestType} methods to those annotated with the
+ * matching {@link PathogenTestCategoryRel}. The seven values come from the approved
+ * "Categories" reference sheet of the laboratory specification.
+ */
+public enum PathogenTestCategory {
+
+	MOLECULAR_ASSAYS,
+	SEROLOGICAL_TESTS,
+	ANTIGEN_DETECTION,
+	CULTURE_AND_ISOLATION,
+	MICROSCOPY_AND_STAINING,
+	ANTIMICROBIAL_SUSCEPTIBILITY_TESTING,
+	FUNCTIONAL_IMMUNE_ASSAYS;
+
+	@Override
+	public String toString() {
+		return I18nProperties.getEnumCaption(this);
+	}
+}

sormas-api/src/main/java/de/symeda/sormas/api/sample/PathogenTestCategoryRel.java

@@ -0,0 +1,36 @@
+/*
+ * SORMAS® - Surveillance Outbreak Response Management & Analysis System
+ * Copyright © 2016-2026 Helmholtz-Zentrum für Infektionsforschung GmbH (HZI)
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.symeda.sormas.api.sample;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Associates a {@link PathogenTestType} value with the {@link PathogenTestCategory} it belongs to.
+ *
+ * <p>
+ * Read at runtime by {@link PathogenTestType#getCategory(PathogenTestType)}; the category is derived
+ * from the method rather than persisted, so editing an existing test re-selects its category from the
+ * saved method. A value without this annotation has no category (e.g. the free-text {@code OTHER}).
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.FIELD)
+public @interface PathogenTestCategoryRel {
+
+	PathogenTestCategory value();
+}