SORMAS-Foundation#4140 Bugfix: Added a merge function with last wins (as before)

Author: Stefan Kock

sormas-backend/src/main/java/de/symeda/sormas/backend/feature/FeatureConfigurationService.java

@@ -126,7 +126,7 @@ public void createMissingFeatureConfigurations() {
 
 		List<FeatureConfiguration> featureConfigurations = getAll();
 		Map<FeatureType, FeatureConfiguration> existingListOfConfigurations =
-			featureConfigurations.stream().collect(Collectors.toMap(FeatureConfiguration::getFeatureType, Function.identity()));
+			featureConfigurations.stream().collect(Collectors.toMap(FeatureConfiguration::getFeatureType, Function.identity(), (e1, e2) -> e2));
 
 		FeatureType.getAllServerFeatures().forEach(featureType -> {
 			FeatureConfiguration savedConfiguration = existingListOfConfigurations.get(featureType);
@@ -141,7 +141,7 @@ public void updateFeatureConfigurations() {
 
 		List<FeatureConfiguration> featureConfigurations = getAll();
 		Map<FeatureType, FeatureConfiguration> featureConfigurationMap =
-			featureConfigurations.stream().collect(Collectors.toMap(FeatureConfiguration::getFeatureType, Function.identity()));
+			featureConfigurations.stream().collect(Collectors.toMap(FeatureConfiguration::getFeatureType, Function.identity(), (e1, e2) -> e2));
 
 		FeatureType.getAllServerFeatures().forEach(featureType -> {
 			if (featureType.isDependent()) {

sormas-backend/src/test/java/de/symeda/sormas/backend/feature/FeatureConfigurationServiceTest.java

@@ -24,6 +24,12 @@ public void testUpdateFeatureConfigurations() {
 
 		createConfigurations();
 		FeatureConfigurationService featureConfigurationService = getBean(FeatureConfigurationService.class);
+
+		/*
+		 * update relies on that all serverFeature configurations are already present,
+		 * that's why the createMissing needs to be run before.
+		 */
+		featureConfigurationService.createMissingFeatureConfigurations();
 		featureConfigurationService.updateFeatureConfigurations();
 	}