Merge remote-tracking branch 'origin/feature-4140-fix-automatic-serverfeature-updates' into hotfix-1.54.1

Author: MateStrysewske

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()));
-
+		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()));
-
+		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()) {

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

@@ -0,0 +1,68 @@
+package de.symeda.sormas.backend.feature;
+
+import org.junit.Test;
+
+import de.symeda.sormas.api.Disease;
+import de.symeda.sormas.api.feature.FeatureType;
+import de.symeda.sormas.backend.AbstractBeanTest;
+import de.symeda.sormas.backend.TestDataCreator.RDCF;
+import de.symeda.sormas.backend.region.District;
+import de.symeda.sormas.backend.region.Region;
+
+public class FeatureConfigurationServiceTest extends AbstractBeanTest {
+
+	@Test
+	public void testCreateMissingFeatureConfigurations() {
+
+		createConfigurations();
+		FeatureConfigurationService featureConfigurationService = getBean(FeatureConfigurationService.class);
+		featureConfigurationService.createMissingFeatureConfigurations();
+	}
+
+	@Test
+	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();
+	}
+
+	private void createConfigurations() {
+
+		// Some serverFeatures
+		build(FeatureType.EVENT_SURVEILLANCE);
+		build(FeatureType.TASK_MANAGEMENT);
+
+		// Some features configured on district level
+		RDCF rdcf = creator.createRDCF();
+		Region region = getRegionService().getByUuid(rdcf.region.getUuid());
+		build(FeatureType.LINE_LISTING, null, region, getDistrictService().getByUuid(rdcf.district.getUuid()));
+		build(FeatureType.LINE_LISTING, null, region, creator.createDistrict("d2", region));
+	}
+
+	private FeatureConfiguration build(FeatureType type) {
+
+		return build(type, null, null, null);
+	}
+
+	private FeatureConfiguration build(FeatureType type, Disease disease, Region region, District district) {
+
+		FeatureConfigurationService featureConfigurationService = getBean(FeatureConfigurationService.class);
+
+		FeatureConfiguration entity = new FeatureConfiguration();
+		entity.setFeatureType(type);
+		entity.setEnabled(type.isEnabledDefault());
+		entity.setDisease(disease);
+		entity.setRegion(region);
+		entity.setDistrict(district);
+		featureConfigurationService.ensurePersisted(entity);
+
+		return entity;
+	}
+}