Resolves PR comments

Author: roldy

sormas-api/src/main/java/de/symeda/sormas/api/epidata/EpiDataDto.java

@@ -476,6 +476,10 @@ public EpiDataDto clone() throws CloneNotSupportedException {
 		clone.getExposures().clear();
 		clone.getExposures().addAll(exposureDtos);
 
+		if (foodHistory != null) {
+			clone.setFoodHistory(foodHistory.clone());
+		}
+
 		return clone;
 	}
 }

sormas-api/src/main/java/de/symeda/sormas/api/epidata/FoodHistoryDto.java

@@ -55,7 +55,8 @@ public Map<FoodConsumptionItem, String> getConsumedItemsDetails() {
 	}
 
 	public void setConsumedItemsDetails(Map<FoodConsumptionItem, String> consumedItemsDetails) {
-		this.consumedItemsDetails = consumedItemsDetails;
+		this.consumedItemsDetails =
+			consumedItemsDetails == null ? new EnumMap<>(FoodConsumptionItem.class) : new EnumMap<>(consumedItemsDetails);
 	}
 
 	public String getOtherFoodDetails() {
@@ -65,4 +66,11 @@ public String getOtherFoodDetails() {
 	public void setOtherFoodDetails(String otherFoodDetails) {
 		this.otherFoodDetails = otherFoodDetails;
 	}
+
+	@Override
+	public FoodHistoryDto clone() throws CloneNotSupportedException {
+		FoodHistoryDto clone = (FoodHistoryDto) super.clone();
+		clone.setConsumedItemsDetails(consumedItemsDetails);
+		return clone;
+	}
 }

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

@@ -342,6 +342,10 @@ public String toString() {
 	}
 
 	public static String toString(PathogenTestType value, String details) {
+		return toString(value, details, null);
+	}
+
+	public static String toString(PathogenTestType value, String details, Disease disease) {
 		if (value == null) {
 			return "";
 		}
@@ -350,6 +354,10 @@ public static String toString(PathogenTestType value, String details) {
 			return DataHelper.toStringNullable(details);
 		}
 
+		if (revealsTestTypeText(value, disease) && !DataHelper.isNullOrEmpty(details)) {
+			return value + " (" + details + ")";
+		}
+
 		return value.toString();
 	}
 

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

@@ -1004,6 +1004,7 @@ public static class SampleExportPathogenTest implements Serializable {
 		@SensitiveData
 		private String testTypeText;
 		private String disease;
+		private Disease testedDisease;
 		private Date dateTime;
 		private String lab;
 		private PathogenTestResultType testResult;
@@ -1020,17 +1021,30 @@ public SampleExportPathogenTest(
 			String lab,
 			PathogenTestResultType testResult,
 			Boolean verified) {
+			this(testType, testTypeText, disease, null, dateTime, lab, testResult, verified);
+		}
+
+		public SampleExportPathogenTest(
+			PathogenTestType testType,
+			String testTypeText,
+			String disease,
+			Disease testedDisease,
+			Date dateTime,
+			String lab,
+			PathogenTestResultType testResult,
+			Boolean verified) {
 			this.testType = testType;
 			this.testTypeText = testTypeText;
 			this.disease = disease;
+			this.testedDisease = testedDisease;
 			this.dateTime = dateTime;
 			this.lab = lab;
 			this.testResult = testResult;
 			this.verified = verified;
 		}
 
 		public String formatType() {
-			return PathogenTestType.toString(testType, testTypeText);
+			return PathogenTestType.toString(testType, testTypeText, testedDisease);
 		}
 
 		public String formatString() {

sormas-backend/src/main/java/de/symeda/sormas/backend/epidata/EpiData.java

@@ -347,7 +347,7 @@ public void setActivityAsCaseToDate(Date activityAsCaseToDate) {
 		this.activityAsCaseToDate = activityAsCaseToDate;
 	}
 
-	@OneToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+	@OneToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY, orphanRemoval = true)
 	public FoodHistory getFoodHistory() {
 		return foodHistory;
 	}

sormas-backend/src/main/java/de/symeda/sormas/backend/sample/SampleFacadeEjb.java

@@ -674,6 +674,7 @@ private List<SampleExportDto> getExportList(
 					pathogenTest.getTestType(),
 					pathogenTest.getTestTypeText(),
 					DiseaseHelper.toString(pathogenTest.getTestedDisease(), pathogenTest.getTestedDiseaseDetails()),
+					pathogenTest.getTestedDisease(),
 					pathogenTest.getTestDateTime(),
 					lab,
 					pathogenTest.getTestResult(),

sormas-backend/src/main/resources/sql/sormas_schema.sql

@@ -16033,9 +16033,6 @@ CREATE TRIGGER versioning_trigger
     BEFORE INSERT OR UPDATE OR DELETE ON foodhistory_consumeditems
     FOR EACH ROW EXECUTE PROCEDURE versioning('sys_period', 'foodhistory_consumeditems_history', true);
 DROP TRIGGER IF EXISTS delete_history_trigger ON foodhistory_consumeditems;
-CREATE TRIGGER delete_history_trigger
-    AFTER DELETE ON foodhistory_consumeditems
-    FOR EACH ROW EXECUTE PROCEDURE delete_history_trigger('foodhistory_consumeditems_history', 'foodhistory_id');
 ALTER TABLE foodhistory_consumeditems_history OWNER TO sormas_user;
 
 ALTER TABLE epidata         ADD COLUMN IF NOT EXISTS foodhistory_id bigint REFERENCES foodhistory(id);

sormas-ui/src/main/java/de/symeda/sormas/ui/contact/ContactDataView.java

@@ -258,7 +258,12 @@ protected void initView(String params) {
 				.isPropertyValueTrue(FeatureType.IMMUNIZATION_MANAGEMENT, FeatureTypeProperty.REDUCED)) {
 				layout.addSidePanelComponent(new SideComponentLayout(new ImmunizationListComponent(() -> {
 					ContactDto refreshedContact = FacadeProvider.getContactFacade().getByUuid(getContactRef().getUuid());
-					return new ImmunizationListCriteria.Builder(refreshedContact.getPerson()).withDisease(refreshedContact.getDisease()).build();
+					Disease criteriaDisease = refreshedContact.getDisease();
+					if (criteriaDisease == null && refreshedContact.getCaze() != null) {
+						CaseDataDto refreshedCase = FacadeProvider.getCaseFacade().getCaseDataByUuid(refreshedContact.getCaze().getUuid());
+						criteriaDisease = refreshedCase != null ? refreshedCase.getDisease() : null;
+					}
+					return new ImmunizationListCriteria.Builder(refreshedContact.getPerson()).withDisease(criteriaDisease).build();
 				}, null, this::showUnsavedChangesPopup, editAllowed)), IMMUNIZATION_LOC);
 			} else {
 				layout.addSidePanelComponent(new SideComponentLayout(new VaccinationListComponent(() -> {
@@ -267,7 +272,11 @@ protected void initView(String params) {
 					if (refreshedContact.getCaze() != null) {
 						refreshedCase = FacadeProvider.getCaseFacade().getCaseDataByUuid(refreshedContact.getCaze().getUuid());
 					}
-					return new VaccinationCriteria.Builder(refreshedContact.getPerson()).withDisease(refreshedContact.getDisease())
+					Disease criteriaDisease = refreshedContact.getDisease();
+					if (criteriaDisease == null && refreshedCase != null) {
+						criteriaDisease = refreshedCase.getDisease();
+					}
+					return new VaccinationCriteria.Builder(refreshedContact.getPerson()).withDisease(criteriaDisease)
 						.build()
 						.vaccinationAssociationType(VaccinationAssociationType.CONTACT)
 						.contactReference(getContactRef())

sormas-ui/src/main/java/de/symeda/sormas/ui/samples/pathogentestlink/PathogenTestListEntry.java

@@ -73,7 +73,8 @@ public PathogenTestListEntry(PathogenTestDto pathogenTest, boolean showTestResul
 		topLabelLayout.setMargin(false);
 		topLabelLayout.setWidth(100, Unit.PERCENTAGE);
 		addComponentToField(topLabelLayout);
-		Label labelTopLeft = new Label(PathogenTestType.toString(pathogenTest.getTestType(), pathogenTest.getTestTypeText()));
+		Label labelTopLeft = new Label(
+			PathogenTestType.toString(pathogenTest.getTestType(), pathogenTest.getTestTypeText(), pathogenTest.getTestedDisease()));
 		CssStyles.style(labelTopLeft, CssStyles.LABEL_BOLD, CssStyles.LABEL_UPPERCASE);
 		topLabelLayout.addComponent(labelTopLeft);