RED-7679: Changed joining from same table row

This commit is contained in:
Ali Oezyetimoglu 2023-10-26 16:13:57 +02:00
parent ddb94e4480
commit e79bbe0584

View File

@ -422,11 +422,6 @@ public class ComponentCreationService {
} }
groupedEntities.stream() groupedEntities.stream()
.filter(entity -> !(entity.getContainingNode() instanceof TableCell))
.forEach(entity -> create(ruleIdentifier, name, entity.getValue(), valueDescription, entity));
groupedEntities.stream()
.filter(entity -> entity.getContainingNode() instanceof TableCell)
.collect(Collectors.groupingBy(entity -> ((TableCell) entity.getContainingNode()).getRow())) .collect(Collectors.groupingBy(entity -> ((TableCell) entity.getContainingNode()).getRow()))
.entrySet() .entrySet()
.stream() .stream()
@ -434,7 +429,7 @@ public class ComponentCreationService {
.map(Map.Entry::getValue) .map(Map.Entry::getValue)
.forEach(entitiesInSameRow -> create(ruleIdentifier, .forEach(entitiesInSameRow -> create(ruleIdentifier,
name, name,
entitiesInSameRow.stream().sorted(Comparator.comparing(Entity::getType).reversed()).map(Entity::getValue).collect(Collectors.joining(", ")), entitiesInSameRow.stream().sorted(EntityComparators.first()).map(Entity::getValue).collect(Collectors.joining(", ")),
valueDescription, valueDescription,
entitiesInSameRow)); entitiesInSameRow));
}); });