SORMAS-Foundation#4140 Unify serverFeature config query, filter to type.isServerFeature()

Author: Stefan Kock

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

@@ -124,12 +124,9 @@ public Predicate createUserFilter(CriteriaBuilder cb, CriteriaQuery cq, From<?,
 
 	public void createMissingFeatureConfigurations() {
 
-		List<FeatureConfiguration> featureConfigurations = getAll();
-		Map<FeatureType, FeatureConfiguration> existingListOfConfigurations =
-			featureConfigurations.stream().collect(Collectors.toMap(FeatureConfiguration::getFeatureType, Function.identity(), (e1, e2) -> e2));
-
+		Map<FeatureType, FeatureConfiguration> configs = getServerFeatureConfigurations();
 		FeatureType.getAllServerFeatures().forEach(featureType -> {
-			FeatureConfiguration savedConfiguration = existingListOfConfigurations.get(featureType);
+			FeatureConfiguration savedConfiguration = configs.get(featureType);
 			if (savedConfiguration == null) {
 				FeatureConfiguration configuration = FeatureConfiguration.build(featureType, featureType.isEnabledDefault());
 				ensurePersisted(configuration);
@@ -139,23 +136,31 @@ public void createMissingFeatureConfigurations() {
 
 	public void updateFeatureConfigurations() {
 
-		List<FeatureConfiguration> featureConfigurations = getAll();
-		Map<FeatureType, FeatureConfiguration> featureConfigurationMap =
-			featureConfigurations.stream().collect(Collectors.toMap(FeatureConfiguration::getFeatureType, Function.identity(), (e1, e2) -> e2));
-
+		Map<FeatureType, FeatureConfiguration> configs = getServerFeatureConfigurations();
 		FeatureType.getAllServerFeatures().forEach(featureType -> {
 			if (featureType.isDependent()) {
-				boolean hasEnabledDependentFeature = hasEnabledDependentFeature(featureType, featureConfigurationMap);
-
+				boolean hasEnabledDependentFeature = hasEnabledDependentFeature(featureType, configs);
 				if (!hasEnabledDependentFeature) {
-					FeatureConfiguration configuration = featureConfigurationMap.get(featureType);
+					FeatureConfiguration configuration = configs.get(featureType);
 					configuration.setEnabled(false);
 					ensurePersisted(configuration);
 				}
 			}
 		});
 	}
 
+	private Map<FeatureType, FeatureConfiguration> getServerFeatureConfigurations() {
+
+		List<FeatureConfiguration> featureConfigurations = getAll();
+		Map<FeatureType, FeatureConfiguration> configurationsMap =
+			featureConfigurations.stream()
+				.filter(e -> e.getFeatureType().isServerFeature())
+				// In case a serverFeature happens not to be unique in the database, take the last one
+				.collect(Collectors.toMap(FeatureConfiguration::getFeatureType, Function.identity(), (e1, e2) -> e2));
+
+		return configurationsMap;
+	}
+
 	private boolean hasEnabledDependentFeature(FeatureType featureType, Map<FeatureType, FeatureConfiguration> featureConfigurationMap) {
 
 		for (FeatureType dependentFeatureType : featureType.getDependentFeatures()) {