Skip to content

Commit b378f08

Browse files
authored
Merge pull request #43 from Breeding-Insight/bug/BI-2432
BI-2432 BJTS List updating broken
2 parents c036d8a + 2568c86 commit b378f08

File tree

1 file changed

+15
-10
lines changed

1 file changed

+15
-10
lines changed

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

+15-10
Original file line numberDiff line numberDiff line change
@@ -268,14 +268,15 @@ private void updateEntity(ListEntity entity, @Valid ListNewRequest list) throws
268268
entity.setListOwnerPerson(person);
269269
}
270270

271-
if (entity.getData() != null) {
272-
entity.getData().stream().forEach((item) -> {
273-
item.setList(null);
274-
});
275-
}
276-
277271
if (list.getData() != null) {
278-
List<ListItemEntity> items = new ArrayList<>();
272+
// Clear existing items
273+
if (entity.getData() == null) {
274+
entity.setData(new ArrayList<>());
275+
} else {
276+
entity.getData().clear();
277+
}
278+
279+
// Add new items
279280
ListIterator<String> iter = list.getData().listIterator();
280281
while (iter.hasNext()) {
281282
String item = iter.next();
@@ -284,12 +285,16 @@ private void updateEntity(ListEntity entity, @Valid ListNewRequest list) throws
284285
itemEntity.setPosition(iter.nextIndex());
285286
itemEntity.setItem(item);
286287
itemEntity.setList(entity);
287-
items.add(itemEntity);
288+
entity.getData().add(itemEntity);
288289
}
289290
}
290-
entity.setData(items);
291291
} else {
292-
entity.setData(new ArrayList<>());
292+
if (entity.getData() == null) {
293+
entity.setData(new ArrayList<>());
294+
} else {
295+
entity.getData().clear();
296+
}
293297
}
298+
294299
}
295300
}

0 commit comments

Comments
 (0)