Close #280

Author: Open Lowcode SAS

src/org/openlowcode/server/data/properties/HasmultidimensionalchildFlatFileLoaderHelper.java

@@ -107,6 +107,7 @@ public FlatFileLoaderColumn<E> getFlatFileLoaderColumn(
 		if (columnattributes.length >= 2) {
 			if (maincolumnattribute.equals(this.mainvaluehelper.getFieldName())) {
 				String maincolumnvalue = columnattributes[1];
+				
 				String[] extraattributes = null;
 				if (columnattributes.length > 2) {
 					extraattributes = new String[columnattributes.length - 2];
@@ -333,6 +334,9 @@ public boolean generateNewRowForContext(
 				iscontextvalid = false;
 			}
 		}
+		
+		
+		
 		if (!iscontextvalid)
 			return false;
 		DataObjectDefinition<F> childdefinition = this.hasmultidimensionalchilddefinition
@@ -344,7 +348,8 @@ public boolean generateNewRowForContext(
 			helper.fillWithValue(firstblank, value, applocale, extraattributes);
 		}
 		logger.fine(" -> First blank = "+firstblank.dropToString());
-		ArrayList<F> newobjects = mainvaluehelper.generateElementsForAllMandatory(firstblank,parent);
+		
+		ArrayList<F> newobjects = mainvaluehelper.generateElementsForAllMandatory(firstblank,parent,helper,childrenbykey);
 		logger.fine("Generating elements number = "+(newobjects==null?"null":newobjects.size()));
 		if (newobjects!=null) if (newobjects.size()>0) {
 			for (int i=0;i<newobjects.size();i++) {

src/org/openlowcode/server/data/properties/multichild/MultichildValueHelper.java

@@ -279,6 +279,20 @@ public String getAndPrint(E object) {
 	 * @return the mandatory values required for this field
 	 */
 	public abstract F[] getMandatoryValues();
+	
+	/**
+	 * Returns true if the value is part of mandatory values
+	 * 
+	 * @param mainvalue the value
+	 * @return
+	 */
+	public boolean isIsMandatory(Object mainvalue) {
+		F[] mandatoryvalues = getMandatoryValues();
+		if (mandatoryvalues!=null) for (int i=0;i<mandatoryvalues.length;i++) {
+			if (mandatoryvalues[i]!=null) if (mandatoryvalues[i].equals(mainvalue)) return true;
+		}
+		return false;
+	}
 
 	/**
 	 * gets the optional values that have to exist for this field on the list of
@@ -464,7 +478,6 @@ public class MainValueTotalFlatFileLoader
 		private HasmultidimensionalchildFlatFileLoaderHelper<G, E> helper;
 		@SuppressWarnings("unused")
 		private ChoiceValue<ApplocaleChoiceDefinition> applocale;
-		@SuppressWarnings("unused")
 		private MultichildValueHelper<E, F, G> payloadhelper;
 		private String[] extraattributes;
 		private MultichildValueHelper<E, ?, G> mainvaluehelper;
@@ -548,10 +561,12 @@ public boolean processAfterLineInsertion() {
 		public boolean load(G object, Object value, PostUpdateProcessingStore<G> postupdateprocessingstore) {
 			helper.setContext(object);
 			String helpercontextkey = helper.getContextKey();
+			helper.getMainValueHelper().setContext(object);
+			if (!helper.getMainValueHelper().isIsMandatory(mainvalue)) throw new RuntimeException("Column is not valid: "+mainvalue);
 			E relevantchild = helper.getChildForLineAndColumnKey(helpercontextkey,
 					MultichildValueHelper.this.print(mainvalue));
 			if (relevantchild == null) {
-
+				
 				boolean valid = helper.generateNewRowForContext(object, applocale, extraattributes);
 				if (valid) {
 					relevantchild = helper.getChildForLineAndColumnKey(helpercontextkey,
@@ -636,14 +651,19 @@ public boolean isTextValid(
 	 * @return
 	 * @since 1.12
 	 */
-	public ArrayList<E> generateElementsForAllMandatory(E thisoptional, G thisparent) {
+	public ArrayList<E> generateElementsForAllMandatory(E thisoptional, G thisparent,MultidimensionchildHelper<E,G> helper,HashMap<String, HashMap<String, E>> childrenbykey) {
 		ArrayList<E> returnelements = new ArrayList<E>();
 		this.setContext(thisparent);
 		F[] allmandatories = this.getMandatoryValues();
 		for (int i = 0; i < allmandatories.length; i++) {
 			E thischild = thisoptional.deepcopy();
 			setter.accept(thischild, allmandatories[i]);
-			returnelements.add(thischild);
+			
+			String keyforchild = helper.generateKeyForObject(thischild, true);
+			String mainvalue = helper.getMainValueHelper().getAndPrint(thischild);
+			boolean alreadypresent=false;
+			if (childrenbykey.containsKey(keyforchild)) if (childrenbykey.get(keyforchild).containsKey(mainvalue)) alreadypresent=true;
+			if (!alreadypresent) returnelements.add(thischild);
 		}
 		return returnelements;
 	}