Skip to content

Enabled the PUS and Unknown sample materials to SALMONELLOSIS. #14367

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

Merged
KarnaiahPesula merged 3 commits into from
Oct 8, 2026
Merged

Enabled the PUS and Unknown sample materials to SALMONELLOSIS. #14367

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
c77a3ac
Enabled the PUS and Unknown sample materials to SALMONELLOSIS.
KarnaiahPesula Oct 8, 2026
458ecd5
Corrected the test failure
KarnaiahPesula Oct 8, 2026
bf7b754
PUS and UNKNOWN samples are required for Salmonellosis.
KarnaiahPesula Oct 8, 2026
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
40 changes: 20 additions & 20 deletions sormas-api/src/main/java/de/symeda/sormas/api/sample/SampleMaterial.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public enum SampleMaterial {
Disease.PERTUSSIS,
Disease.INFLUENZA,
Disease.YERSINIOSIS,
Disease.DIPHTHERIA,
Disease.DIPHTHERIA,
Disease.GONOCOCCAL_INFECTION }, hide = true)
DRY_BLOOD,

Expand All @@ -75,7 +75,7 @@ public enum SampleMaterial {
Disease.RUBELLA,
Disease.CONGENITAL_RUBELLA,
Disease.YERSINIOSIS,
Disease.DIPHTHERIA,
Disease.DIPHTHERIA,
Disease.GONOCOCCAL_INFECTION }, hide = true)
SERA,

Expand All @@ -86,7 +86,7 @@ public enum SampleMaterial {
Disease.MEASLES,
Disease.MALARIA,
Disease.DENGUE,
Disease.DIPHTHERIA,
Disease.DIPHTHERIA,
Disease.MUMPS,
Disease.SYPHILIS,
Disease.NEW_INFLUENZA,
Expand Down Expand Up @@ -220,7 +220,7 @@ public enum SampleMaterial {
Disease.CRYPTOSPORIDIOSIS,
Disease.MALARIA,
Disease.DENGUE,
Disease.DIPHTHERIA,
Disease.DIPHTHERIA,
Disease.SALMONELLOSIS,
Disease.SHIGELLOSIS,
Disease.MUMPS,
Expand Down Expand Up @@ -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 = {
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand Down Expand Up @@ -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 = {
Expand Down Expand Up @@ -716,7 +716,8 @@ public enum SampleMaterial {
@Diseases({
Disease.SHIGELLOSIS,
Disease.TUBERCULOSIS,
Disease.YERSINIOSIS, })
Disease.YERSINIOSIS,
Disease.SALMONELLOSIS })
PUS,

@Diseases({
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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 = {
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand All @@ -1058,7 +1059,6 @@ public enum SampleMaterial {
Disease.GIARDIASIS,
Disease.CRYPTOSPORIDIOSIS,
Disease.SHIGELLOSIS,
Disease.SALMONELLOSIS,
Disease.YERSINIOSIS,
Disease.GONOCOCCAL_INFECTION }, hide = true)
UNKNOWN,
Expand Down
17 changes: 1 addition & 16 deletions sormas-api/src/test/java/de/symeda/sormas/api/sample/SampleMaterialSalmonellosisTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<SampleMaterial> 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)");
}
}
}
2 changes: 2 additions & 0 deletions sormas-api/src/test/java/de/symeda/sormas/api/sample/SampleMaterialTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}

Expand Down
Loading