Merge pull request #44 from Breeding-Insight/bug/BI-2438

BI-2438 Regression: Append Workflow Messes Up Experiment Display And Download

Author: dmeidlin

src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/ListItemEntity.java

@@ -9,7 +9,7 @@
 @Table(name = "list_item")
 @Where(clause = "soft_deleted = false")
 public class ListItemEntity extends BrAPIBaseEntity {
-	@ManyToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+	@ManyToOne(fetch = FetchType.LAZY)
 	private ListEntity list;
 	@Column
 	private String item;

src/main/java/org/brapi/test/BrAPITestServer/service/core/ListService.java

@@ -20,6 +20,7 @@
 
 import javax.transaction.Transactional;
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 @Service
@@ -247,7 +248,7 @@ private ListBaseFieldsInterface convertToBaseFields(ListEntity entity, ListBaseF
 	}
 
 	private void updateEntity(ListEntity entity, @Valid ListNewRequest list) throws BrAPIServerException {
-
+		// Update simple fields
 		if (list.getAdditionalInfo() != null)
 			entity.setAdditionalInfo(list.getAdditionalInfo());
 		if (list.getListDescription() != null)
@@ -268,33 +269,46 @@ private void updateEntity(ListEntity entity, @Valid ListNewRequest list) throws
 			entity.setListOwnerPerson(person);
 		}
 
+		// Update list items
 		if (list.getData() != null) {
-			// Clear existing items
+			// Initialize entity.getData() if it's null
 			if (entity.getData() == null) {
 				entity.setData(new ArrayList<>());
-			} else {
-				entity.getData().clear();
 			}
 
-			// Add new items
-			ListIterator<String> iter = list.getData().listIterator();
-			while (iter.hasNext()) {
-				String item = iter.next();
+			// Create a map of existing items for efficient lookup
+			Map<String, ListItemEntity> existingItems = entity.getData().stream()
+					.filter(item -> item.getItem() != null)
+					.collect(Collectors.toMap(
+							ListItemEntity::getItem,
+							Function.identity(),
+							(existing, replacement) -> existing,
+							HashMap::new
+					));
+
+			List<ListItemEntity> updatedItems = new ArrayList<>();
+			int position = 0;
+
+			for (String item : list.getData()) {
 				if (item != null) {
-					ListItemEntity itemEntity = new ListItemEntity();
-					itemEntity.setPosition(iter.nextIndex());
-					itemEntity.setItem(item);
-					itemEntity.setList(entity);
-					entity.getData().add(itemEntity);
+					ListItemEntity itemEntity = existingItems.get(item);
+					if (itemEntity == null) {
+						// Create new item if it doesn't exist
+						itemEntity = new ListItemEntity();
+						itemEntity.setItem(item);
+						itemEntity.setList(entity);
+					}
+					itemEntity.setPosition(position++);
+					updatedItems.add(itemEntity);
 				}
 			}
+
+			// Update the list with new and updated items
+			entity.getData().clear();
+			entity.getData().addAll(updatedItems);
 		} else {
-			if (entity.getData() == null) {
-				entity.setData(new ArrayList<>());
-			} else {
-				entity.getData().clear();
-			}
+			// If data is null, initialize an empty list
+			entity.setData(new ArrayList<>());
 		}
-
 	}
 }