Fixed IMI serogroup not being set from externalmessage

- also added the DrugSusceptibilityForm changes

Author: raulbob

sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/processing/ExternalMessageMapper.java

@@ -342,6 +342,16 @@ public List<String[]> mapToPathogenTest(TestReportDto sourceTestReport, Pathogen
 							pathogenTest.getGenoTypeResult(),
 							sourceTestReport.getGenoTypeResult(),
 							PathogenTestDto.GENOTYPE_RESULT),
+						Mapping.of(
+							pathogenTest::setSeroGroupSpecification,
+							pathogenTest.getSeroGroupSpecification(),
+							sourceTestReport.getSeroGroupSpecification(),
+							PathogenTestDto.SERO_GROUP_SPECIFICATION),
+						Mapping.of(
+							pathogenTest::setSeroGroupSpecificationText,
+							pathogenTest.getSeroGroupSpecificationText(),
+							sourceTestReport.getSeroGroupSpecificationText(),
+							PathogenTestDto.SERO_GROUP_SPECIFICATION),
 						Mapping.of(
 							pathogenTest::setRsvSubtype,
 							pathogenTest.getRsvSubtype(),

sormas-ui/src/main/java/de/symeda/sormas/ui/samples/PathogenTestForm.java

@@ -238,7 +238,10 @@ public class PathogenTestForm extends AbstractEditForm<PathogenTestDto> {
 	private ComboBox specieField;
 	private ComboBox genoTypingCB;
 	private TextField genoTypingResultTextTF;
-	// List of tests that are used for serogrouping
+
+	private ComboBox seroGrpSepcCB;
+	private TextField seroGrpSpecTxt;
+
 
 	public PathogenTestForm(
 		AbstractSampleForm sampleForm,
@@ -399,11 +402,21 @@ public void setValue(PathogenTestDto newFieldValue) throws ReadOnlyException, Co
 		specieField.setValue(newFieldValue.getSpecie());
 		if (!genoTypingCB.isReadOnly()) {
 			genoTypingCB.setValue(newFieldValue.getGenoTypeResult());
-			// We only set the genotyping result text if the genotyping result is not read only
-			if (!genoTypingResultTextTF.isReadOnly()) {
-				genoTypingResultTextTF.setValue(newFieldValue.getGenoTypeResultText());
-			}
+
+		}
+
+		if (!genoTypingResultTextTF.isReadOnly()) {
+			genoTypingResultTextTF.setValue(newFieldValue.getGenoTypeResultText());
 		}
+
+		if (!seroGrpSepcCB.isReadOnly()) {
+			seroGrpSepcCB.setValue(newFieldValue.getSeroGroupSpecification());
+		}
+
+		if (!seroGrpSpecTxt.isReadOnly()) {
+			seroGrpSpecTxt.setValue(newFieldValue.getSeroGroupSpecificationText());
+		}
+
 		drugSusceptibilityField.forceUpdateDrugSusceptibilityFields();
 		markAsDirty();
 	}
@@ -582,9 +595,10 @@ protected void addFields() {
 
 		ComboBox seroTypeMetCB = addField(PathogenTestDto.SEROTYPING_METHOD, ComboBox.class);
 		seroTypeMetCB.setVisible(false);
-		ComboBox seroGrpSepcCB = addField(PathogenTestDto.SERO_GROUP_SPECIFICATION, ComboBox.class);
+		seroGrpSepcCB = addField(PathogenTestDto.SERO_GROUP_SPECIFICATION, ComboBox.class);
 		seroGrpSepcCB.setVisible(false);
-		TextField seroGrpSpecTxt = addField(PathogenTestDto.SERO_GROUP_SPECIFICATION_TEXT, TextField.class);
+		seroGrpSpecTxt = addField(PathogenTestDto.SERO_GROUP_SPECIFICATION_TEXT, TextField.class);
+		
 		TextField cqValueField = addField(FieldConfiguration.withConversionError(PathogenTestDto.CQ_VALUE, Validations.onlyNumbersAllowed));
 		if (!FacadeProvider.getConfigFacade().isConfiguredCountry(CountryHelper.COUNTRY_CODE_LUXEMBOURG)) {
 			cqValueField.setVisible(false);

sormas-ui/src/main/java/de/symeda/sormas/ui/therapy/DrugSusceptibilityForm.java

@@ -301,20 +301,34 @@ public void updateFieldsVisibility(Disease disease, PathogenTestType pathogenTes
 		FieldHelper.hideFieldsNotInList(getFieldGroup(), List.of(), true);
 		formHeadingLabel.setVisible(false);
 
-		// Drug susceptibility fields are hidden for other countries than Luxembourg
-		if(!FacadeProvider.getConfigFacade().isConfiguredCountry(CountryHelper.COUNTRY_CODE_LUXEMBOURG)) {
+		// we hide if we don't have a disease
+		if (disease == null) {
 			return;
 		}
 
-		if (disease != null && pathogenTestType != null) {
-			List<String> applicableFieldIds =
-				AnnotationFieldHelper.getFieldNamesWithMatchingDiseaseAndTestAnnotations(DrugSusceptibilityDto.class, disease, pathogenTestType);
+		// we hide if we have another test type than antibiotic susceptibility
+		if (pathogenTestType != PathogenTestType.ANTIBIOTIC_SUSCEPTIBILITY) {
+			return;
+		}
+
+		// we have a disease and a ANTIBIOTIC_SUSCEPTIBILITY test type, so we can proceed
+
+		// TODO: this is kind of temporary as it should be consolidated with the logic in the PathogenTestForm
+		// For other countries if the disease is Tuberculosis/Latent Tuberculosis, drug susceptibility fields should remain hidden
+		if (!FacadeProvider.getConfigFacade().isConfiguredCountry(CountryHelper.COUNTRY_CODE_LUXEMBOURG)
+			&& (disease == Disease.TUBERCULOSIS || disease == Disease.LATENT_TUBERCULOSIS)) {
+			//quit, we do not want to show the fields if TUBERCULOSIS/LATENT_TUBERCULOSIS and we are not in Luxembourg
+			return;
+		}
+
+		// if we passed the exclusions, we show or hide the fields based on annotations
+		List<String> applicableFieldIds =
+			AnnotationFieldHelper.getFieldNamesWithMatchingDiseaseAndTestAnnotations(DrugSusceptibilityDto.class, disease, pathogenTestType);
 
-			formHeadingLabel.setVisible(!applicableFieldIds.isEmpty());
+		formHeadingLabel.setVisible(!applicableFieldIds.isEmpty());
 
-			if (!applicableFieldIds.isEmpty()) {
-				FieldHelper.showOnlyFields(getFieldGroup(), applicableFieldIds, true);
-			}
+		if (!applicableFieldIds.isEmpty()) {
+			FieldHelper.showOnlyFields(getFieldGroup(), applicableFieldIds, true);
 		}
 	}
 }