Merge pull request SORMAS-Foundation#3347 from hzi-braunschweig/bug-3260-case_generation_should_respect_disease_and_country_annotations

fixed SORMAS-Foundation#3260

Author: sergiupacurariu

sormas-ui/src/main/java/de/symeda/sormas/ui/configuration/DevModeView.java

@@ -17,6 +17,23 @@
  *******************************************************************************/
 package de.symeda.sormas.ui.configuration;
 
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.temporal.ChronoUnit;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Random;
+import java.util.concurrent.ThreadLocalRandom;
+import java.util.stream.Collectors;
+
 import com.vaadin.data.Binder;
 import com.vaadin.data.converter.StringToIntegerConverter;
 import com.vaadin.icons.VaadinIcons;
@@ -30,6 +47,7 @@
 import com.vaadin.ui.Label;
 import com.vaadin.ui.TextField;
 import com.vaadin.ui.VerticalLayout;
+
 import de.symeda.sormas.api.Disease;
 import de.symeda.sormas.api.EntityDto;
 import de.symeda.sormas.api.FacadeProvider;
@@ -57,6 +75,9 @@
 import de.symeda.sormas.api.user.UserReferenceDto;
 import de.symeda.sormas.api.utils.DateHelper;
 import de.symeda.sormas.api.utils.SortProperty;
+import de.symeda.sormas.api.utils.fieldvisibility.FieldVisibilityCheckers;
+import de.symeda.sormas.api.utils.fieldvisibility.checkers.CountryFieldVisibilityChecker;
+import de.symeda.sormas.api.utils.fieldvisibility.checkers.DiseaseFieldVisibilityChecker;
 import de.symeda.sormas.api.visit.VisitDto;
 import de.symeda.sormas.api.visit.VisitStatus;
 import de.symeda.sormas.ui.UserProvider;
@@ -65,23 +86,6 @@
 import de.symeda.sormas.ui.utils.DateFormatHelper;
 import de.symeda.sormas.ui.utils.DateHelper8;
 
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.time.temporal.ChronoUnit;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Random;
-import java.util.concurrent.ThreadLocalRandom;
-import java.util.stream.Collectors;
-
 public class DevModeView extends AbstractConfigurationView {
 
 	private static final long serialVersionUID = -6589135368637794263L;
@@ -93,6 +97,8 @@ public class DevModeView extends AbstractConfigurationView {
 	private Binder<CaseGenerationConfig> caseGeneratorConfigBinder = new Binder<>();
 	private Binder<ContactGenerationConfig> contactGeneratorConfigBinder = new Binder<>();
 
+	private FieldVisibilityCheckers fieldVisibilityCheckers;
+
 	public DevModeView() {
 
 		super(VIEW_NAME);
@@ -337,8 +343,10 @@ private void fillEntity(EntityDto entity, LocalDateTime referenceDateTime) {
 			Class<? extends EntityDto> entityClass = entity.getClass();
 			List<Method> setters = setters(entityClass);
 			for (Method setter : setters) {
-				if (randomPercent(40)) {
-					continue; // leave some empty/default
+				String propertyId = setter.getName().substring(3, 4).toLowerCase() + setter.getName().substring(4);
+				// leave some empty/default
+				if (randomPercent(40) || !fieldVisibilityCheckers.isVisible(entityClass, propertyId)) {
+					continue;
 				}
 				Class<?> parameterType = setter.getParameterTypes()[0];
 				// doesn't make sense
@@ -434,6 +442,9 @@ private void generateCases() {
 				disease = random(diseases);
 			}
 
+			fieldVisibilityCheckers = new FieldVisibilityCheckers().add(new DiseaseFieldVisibilityChecker(disease))
+				.add(new CountryFieldVisibilityChecker(FacadeProvider.getConfigFacade().getCountryLocale()));
+
 			LocalDateTime referenceDateTime = getReferenceDateTime(i, config.getCaseCount(), baseOffset, disease, config.getStartDate(), daysBetween);
 
 			// person
@@ -500,6 +511,9 @@ private void generateContacts() {
 				disease = random(diseases);
 			}
 
+			fieldVisibilityCheckers = new FieldVisibilityCheckers().add(new DiseaseFieldVisibilityChecker(disease))
+				.add(new CountryFieldVisibilityChecker(FacadeProvider.getConfigFacade().getCountryLocale()));
+
 			LocalDateTime referenceDateTime =
 				getReferenceDateTime(i, config.getContactCount(), baseOffset, disease, config.getStartDate(), daysBetween);