From e79bbe058435258a354ee54aa289c14ad0a12733 Mon Sep 17 00:00:00 2001 From: Ali Oezyetimoglu Date: Thu, 26 Oct 2023 16:13:57 +0200 Subject: [PATCH 1/3] RED-7679: Changed joining from same table row --- .../server/service/document/ComponentCreationService.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/document/ComponentCreationService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/document/ComponentCreationService.java index 59410a83..d96ec04e 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/document/ComponentCreationService.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/document/ComponentCreationService.java @@ -422,11 +422,6 @@ public class ComponentCreationService { } 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())) .entrySet() .stream() @@ -434,7 +429,7 @@ public class ComponentCreationService { .map(Map.Entry::getValue) .forEach(entitiesInSameRow -> create(ruleIdentifier, 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, entitiesInSameRow)); }); -- 2.47.2 From aaed6f229b9fda6fd2cdb90dedf6408374e362d8 Mon Sep 17 00:00:00 2001 From: Ali Oezyetimoglu Date: Fri, 27 Oct 2023 13:10:41 +0200 Subject: [PATCH 2/3] RED-7679: logs for debugging --- .../v1/server/service/document/ComponentCreationService.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/document/ComponentCreationService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/document/ComponentCreationService.java index d96ec04e..7c6e652b 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/document/ComponentCreationService.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/document/ComponentCreationService.java @@ -100,6 +100,8 @@ public class ComponentCreationService { */ public void create(String ruleIdentifier, String name, String value, String valueDescription, Collection references) { + System.out.println("AAAA: " + ruleIdentifier + " ; " + name + " ; " + value + " ; " + valueDescription + " ; " + references); + referencedEntities.addAll(references); kieSession.insert(Component.builder().matchedRule(RuleIdentifier.fromString(ruleIdentifier)).name(name).value(value).valueDescription(valueDescription) -- 2.47.2 From 0908cbc96ecb7869975caf08f43c3b232eeb81f1 Mon Sep 17 00:00:00 2001 From: Ali Oezyetimoglu Date: Fri, 27 Oct 2023 17:08:16 +0200 Subject: [PATCH 3/3] RED-7679: changed stream to get row number to differ between same named components --- .../document/ComponentCreationService.java | 30 +++++++++++++------ 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/document/ComponentCreationService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/document/ComponentCreationService.java index 7c6e652b..035ba970 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/document/ComponentCreationService.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/document/ComponentCreationService.java @@ -104,7 +104,11 @@ public class ComponentCreationService { referencedEntities.addAll(references); - kieSession.insert(Component.builder().matchedRule(RuleIdentifier.fromString(ruleIdentifier)).name(name).value(value).valueDescription(valueDescription) + kieSession.insert(Component.builder() + .matchedRule(RuleIdentifier.fromString(ruleIdentifier)) + .name(name) + .value(value) + .valueDescription(valueDescription) .references(new LinkedList<>(references)) .build()); } @@ -356,7 +360,9 @@ public class ComponentCreationService { */ public void createComponentsForUnMappedEntities(String ruleIdentifier, Collection entities) { - entities.stream().filter(entity -> !referencedEntities.contains(entity)).sorted(EntityComparators.first()) + entities.stream() + .filter(entity -> !referencedEntities.contains(entity)) + .sorted(EntityComparators.first()) .forEach(entity -> create(ruleIdentifier, entity.getType(), entity.getValue(), "Unmapped Entity", List.of(entity))); } @@ -428,12 +434,16 @@ public class ComponentCreationService { .entrySet() .stream() .sorted(Comparator.comparingInt(Map.Entry::getKey)) - .map(Map.Entry::getValue) - .forEach(entitiesInSameRow -> create(ruleIdentifier, - name, - entitiesInSameRow.stream().sorted(EntityComparators.first()).map(Entity::getValue).collect(Collectors.joining(", ")), - valueDescription, - entitiesInSameRow)); +// .map(Map.Entry::getValue) + .forEach(integerListEntry -> { + var rowNumber = integerListEntry.getKey(); + var entitiesInSameRow = integerListEntry.getValue(); + create(ruleIdentifier, + name + rowNumber, + entitiesInSameRow.stream().sorted(EntityComparators.first()).map(Entity::getValue).collect(Collectors.joining(", ")), + valueDescription, + entitiesInSameRow); + }); }); } @@ -476,7 +486,9 @@ public class ComponentCreationService { */ public void create(String ruleIdentifier, String name, String value) { - kieSession.insert(Component.builder().matchedRule(RuleIdentifier.fromString(ruleIdentifier)).name(name) + kieSession.insert(Component.builder() + .matchedRule(RuleIdentifier.fromString(ruleIdentifier)) + .name(name) .value(value) .valueDescription("") .references(Collections.emptyList()) -- 2.47.2