From c77a3ac7dee0cbf6d30d284a778be014af7ce638 Mon Sep 17 00:00:00 2001 From: Karnaiah Pesula Date: Thu, 8 Oct 2026 11:46:46 +0200 Subject: [PATCH 1/3] Enabled the PUS and Unknown sample materials to SALMONELLOSIS. --- .../sormas/api/sample/SampleMaterial.java | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/sample/SampleMaterial.java b/sormas-api/src/main/java/de/symeda/sormas/api/sample/SampleMaterial.java index 81cd6307b7b..1638bb98419 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/sample/SampleMaterial.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/sample/SampleMaterial.java @@ -57,7 +57,7 @@ public enum SampleMaterial { Disease.PERTUSSIS, Disease.INFLUENZA, Disease.YERSINIOSIS, - Disease.DIPHTHERIA, + Disease.DIPHTHERIA, Disease.GONOCOCCAL_INFECTION }, hide = true) DRY_BLOOD, @@ -75,7 +75,7 @@ public enum SampleMaterial { Disease.RUBELLA, Disease.CONGENITAL_RUBELLA, Disease.YERSINIOSIS, - Disease.DIPHTHERIA, + Disease.DIPHTHERIA, Disease.GONOCOCCAL_INFECTION }, hide = true) SERA, @@ -86,7 +86,7 @@ public enum SampleMaterial { Disease.MEASLES, Disease.MALARIA, Disease.DENGUE, - Disease.DIPHTHERIA, + Disease.DIPHTHERIA, Disease.MUMPS, Disease.SYPHILIS, Disease.NEW_INFLUENZA, @@ -220,7 +220,7 @@ public enum SampleMaterial { Disease.CRYPTOSPORIDIOSIS, Disease.MALARIA, Disease.DENGUE, - Disease.DIPHTHERIA, + Disease.DIPHTHERIA, Disease.SALMONELLOSIS, Disease.SHIGELLOSIS, Disease.MUMPS, @@ -314,7 +314,7 @@ public enum SampleMaterial { Disease.SALMONELLOSIS, Disease.YERSINIOSIS, Disease.GONOCOCCAL_INFECTION, - Disease.DIPHTHERIA }, hide = true) + Disease.DIPHTHERIA }, hide = true) SALIVA, @Diseases(value = { @@ -415,7 +415,7 @@ public enum SampleMaterial { Disease.CONGENITAL_RUBELLA, Disease.YERSINIOSIS, Disease.GONOCOCCAL_INFECTION, - Disease.DIPHTHERIA }, hide = true) + Disease.DIPHTHERIA }, hide = true) @HideForCountries(countries = { CountryHelper.COUNTRY_CODE_LUXEMBOURG }) ENDOTRACHEAL_ASPIRATE, @@ -463,7 +463,7 @@ public enum SampleMaterial { Disease.CONGENITAL_RUBELLA, Disease.YERSINIOSIS, Disease.GONOCOCCAL_INFECTION, - Disease.DIPHTHERIA }, hide = true) + Disease.DIPHTHERIA }, hide = true) @HideForCountries(countries = { CountryHelper.COUNTRY_CODE_LUXEMBOURG }) BRAIN_TISSUE, @@ -489,7 +489,7 @@ public enum SampleMaterial { Disease.CONGENITAL_RUBELLA, Disease.YERSINIOSIS, Disease.GONOCOCCAL_INFECTION, - Disease.DIPHTHERIA }, hide = true) + Disease.DIPHTHERIA }, hide = true) @HideForCountries(countries = { CountryHelper.COUNTRY_CODE_LUXEMBOURG }) ANTERIOR_NARES_SWAB, @@ -674,7 +674,7 @@ public enum SampleMaterial { Disease.INVASIVE_MENINGOCOCCAL_INFECTION, Disease.YERSINIOSIS, Disease.GONOCOCCAL_INFECTION, - Disease.DIPHTHERIA }, hide = true) + Disease.DIPHTHERIA }, hide = true) EDTA_WHOLE_BLOOD, @Diseases(value = { @@ -716,7 +716,8 @@ public enum SampleMaterial { @Diseases({ Disease.SHIGELLOSIS, Disease.TUBERCULOSIS, - Disease.YERSINIOSIS, }) + Disease.YERSINIOSIS, + Disease.SALMONELLOSIS }) PUS, @Diseases({ @@ -756,7 +757,7 @@ public enum SampleMaterial { Disease.CONGENITAL_RUBELLA, Disease.YERSINIOSIS, Disease.GONOCOCCAL_INFECTION, - Disease.DIPHTHERIA }, hide = true) + Disease.DIPHTHERIA }, hide = true) @HideForCountries(countries = { CountryHelper.COUNTRY_CODE_LUXEMBOURG }) ABSCESS_SWAB, @@ -832,7 +833,7 @@ public enum SampleMaterial { Disease.RUBELLA, Disease.CONGENITAL_RUBELLA, Disease.YERSINIOSIS, - Disease.DIPHTHERIA }, hide = true) + Disease.DIPHTHERIA }, hide = true) CONJUNCTIVAL_SWAB, @Diseases(value = { @@ -857,7 +858,7 @@ public enum SampleMaterial { Disease.CONGENITAL_RUBELLA, Disease.YERSINIOSIS, Disease.GONOCOCCAL_INFECTION, - Disease.DIPHTHERIA }, hide = true) + Disease.DIPHTHERIA }, hide = true) @HideForCountries(countries = { CountryHelper.COUNTRY_CODE_LUXEMBOURG }) MIDDLE_EAR_FLUID, @@ -883,7 +884,7 @@ public enum SampleMaterial { Disease.CONGENITAL_RUBELLA, Disease.YERSINIOSIS, Disease.GONOCOCCAL_INFECTION, - Disease.DIPHTHERIA }, hide = true) + Disease.DIPHTHERIA }, hide = true) @HideForCountries(countries = { CountryHelper.COUNTRY_CODE_LUXEMBOURG }) PLASMA, @@ -909,7 +910,7 @@ public enum SampleMaterial { Disease.CONGENITAL_RUBELLA, Disease.YERSINIOSIS, Disease.GONOCOCCAL_INFECTION, - Disease.DIPHTHERIA }, hide = true) + Disease.DIPHTHERIA }, hide = true) @HideForCountries(countries = { CountryHelper.COUNTRY_CODE_LUXEMBOURG }) SWAB_UNSPECIFIED, @@ -935,7 +936,7 @@ public enum SampleMaterial { Disease.CONGENITAL_RUBELLA, Disease.YERSINIOSIS, Disease.GONOCOCCAL_INFECTION, - Disease.DIPHTHERIA }, hide = true) + Disease.DIPHTHERIA }, hide = true) @HideForCountries(countries = { CountryHelper.COUNTRY_CODE_LUXEMBOURG }) TEARS, @@ -962,7 +963,7 @@ public enum SampleMaterial { Disease.CONGENITAL_RUBELLA, Disease.YERSINIOSIS, Disease.GONOCOCCAL_INFECTION, - Disease.DIPHTHERIA }, hide = true) + Disease.DIPHTHERIA }, hide = true) @HideForCountries(countries = { CountryHelper.COUNTRY_CODE_LUXEMBOURG }) CORD_BLOOD, @@ -1011,7 +1012,7 @@ public enum SampleMaterial { Disease.CONGENITAL_RUBELLA, Disease.YERSINIOSIS, Disease.GONOCOCCAL_INFECTION, - Disease.DIPHTHERIA }, hide = true) + Disease.DIPHTHERIA }, hide = true) @HideForCountries(countries = { CountryHelper.COUNTRY_CODE_LUXEMBOURG }) PLACENTA, @@ -1037,7 +1038,7 @@ public enum SampleMaterial { Disease.CONGENITAL_RUBELLA, Disease.YERSINIOSIS, Disease.GONOCOCCAL_INFECTION, - Disease.DIPHTHERIA }, hide = true) + Disease.DIPHTHERIA }, hide = true) @HideForCountries(countries = { CountryHelper.COUNTRY_CODE_LUXEMBOURG }) ULCER_SWAB, @@ -1058,7 +1059,6 @@ public enum SampleMaterial { Disease.GIARDIASIS, Disease.CRYPTOSPORIDIOSIS, Disease.SHIGELLOSIS, - Disease.SALMONELLOSIS, Disease.YERSINIOSIS, Disease.GONOCOCCAL_INFECTION }, hide = true) UNKNOWN, From 458ecd58e1e3e30abf4b6dbc2e40ffd31130d8b2 Mon Sep 17 00:00:00 2001 From: Karnaiah Pesula Date: Thu, 8 Oct 2026 12:04:02 +0200 Subject: [PATCH 2/3] Corrected the test failure --- .../java/de/symeda/sormas/api/sample/SampleMaterialTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sormas-api/src/test/java/de/symeda/sormas/api/sample/SampleMaterialTest.java b/sormas-api/src/test/java/de/symeda/sormas/api/sample/SampleMaterialTest.java index b03d763260a..a1f7a8412f2 100644 --- a/sormas-api/src/test/java/de/symeda/sormas/api/sample/SampleMaterialTest.java +++ b/sormas-api/src/test/java/de/symeda/sormas/api/sample/SampleMaterialTest.java @@ -62,8 +62,10 @@ public void testSalmonellosisSpecimenTypes() { SampleMaterial.CEREBROSPINAL_FLUID, SampleMaterial.CLINICAL_SAMPLE, SampleMaterial.OTHER, + SampleMaterial.PUS, SampleMaterial.RECTAL_SWAB, SampleMaterial.STOOL, + SampleMaterial.UNKNOWN, SampleMaterial.URINE)); } From bf7b754614bcfb6da16b02685af2625e6bb03358 Mon Sep 17 00:00:00 2001 From: Karnaiah Pesula Date: Thu, 8 Oct 2026 12:16:10 +0200 Subject: [PATCH 3/3] PUS and UNKNOWN samples are required for Salmonellosis. --- .../sample/SampleMaterialSalmonellosisTest.java | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/sormas-api/src/test/java/de/symeda/sormas/api/sample/SampleMaterialSalmonellosisTest.java b/sormas-api/src/test/java/de/symeda/sormas/api/sample/SampleMaterialSalmonellosisTest.java index adef861a63a..bef8d94f269 100644 --- a/sormas-api/src/test/java/de/symeda/sormas/api/sample/SampleMaterialSalmonellosisTest.java +++ b/sormas-api/src/test/java/de/symeda/sormas/api/sample/SampleMaterialSalmonellosisTest.java @@ -22,29 +22,14 @@ public class SampleMaterialSalmonellosisTest { SampleMaterial.STOOL, SampleMaterial.URINE); - // Withdrawn by the sample/test matrix after #14223 had allowed them. - private static final List WITHDRAWN_MATERIALS = List.of(SampleMaterial.PUS, SampleMaterial.UNKNOWN); - @Test public void everyMatrixSpecimenIsVisibleForSalmonellosis() { DiseaseFieldVisibilityChecker checker = new DiseaseFieldVisibilityChecker(Disease.SALMONELLOSIS); for (SampleMaterial material : MATRIX_MATERIALS) { - assertFalse( - material.isDeprecated(), - material.name() + " is a retired sample material and must not be a Salmonellosis mapping target"); + assertFalse(material.isDeprecated(), material.name() + " is a retired sample material and must not be a Salmonellosis mapping target"); assertTrue( checker.isVisible(SampleMaterial.class, material.name()), material.name() + " must be selectable for Salmonellosis (sample/test matrix)"); } } - - @Test - public void withdrawnSpecimensAreHiddenForSalmonellosis() { - DiseaseFieldVisibilityChecker checker = new DiseaseFieldVisibilityChecker(Disease.SALMONELLOSIS); - for (SampleMaterial material : WITHDRAWN_MATERIALS) { - assertFalse( - checker.isVisible(SampleMaterial.class, material.name()), - material.name() + " must not be selectable for Salmonellosis (sample/test matrix)"); - } - } }