From 6b132613f5b0b4dc739255fc5e62f5b848f9e8f9 Mon Sep 17 00:00:00 2001 From: jainshrk Date: Wed, 23 Oct 2024 16:45:44 +0530 Subject: [PATCH 1/2] fix duplication of rows in lf exports --- .../waltz/web/endpoints/extracts/LogicalFlowExtractor.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/waltz-web/src/main/java/org/finos/waltz/web/endpoints/extracts/LogicalFlowExtractor.java b/waltz-web/src/main/java/org/finos/waltz/web/endpoints/extracts/LogicalFlowExtractor.java index 676b2401aa..a8d72e738f 100644 --- a/waltz-web/src/main/java/org/finos/waltz/web/endpoints/extracts/LogicalFlowExtractor.java +++ b/waltz-web/src/main/java/org/finos/waltz/web/endpoints/extracts/LogicalFlowExtractor.java @@ -22,6 +22,7 @@ import org.finos.waltz.data.application.ApplicationIdSelectorFactory; import org.finos.waltz.data.data_type.DataTypeIdSelectorFactory; import org.finos.waltz.model.EntityKind; +import org.finos.waltz.model.FlowDirection; import org.finos.waltz.model.IdSelectionOptions; import org.finos.waltz.schema.tables.FlowClassification; import org.finos.waltz.web.WebUtilities; @@ -170,9 +171,11 @@ private SelectConditionStep prepareQuery(DSLContext dsl, IdSelectionOpti .on(DATA_TYPE.ID.eq(LOGICAL_FLOW_DECORATOR.DECORATOR_ENTITY_ID) .and(LOGICAL_FLOW_DECORATOR.DECORATOR_ENTITY_KIND.eq(EntityKind.DATA_TYPE.name()))) .innerJoin(sourceClassification) - .on(sourceClassification.CODE.eq(LOGICAL_FLOW_DECORATOR.RATING)) + .on(sourceClassification.CODE.eq(LOGICAL_FLOW_DECORATOR.RATING) + .and(sourceClassification.DIRECTION.eq(FlowDirection.OUTBOUND.name()))) .innerJoin(targetClassification) - .on(targetClassification.CODE.eq(LOGICAL_FLOW_DECORATOR.TARGET_INBOUND_RATING)) + .on(targetClassification.CODE.eq(LOGICAL_FLOW_DECORATOR.TARGET_INBOUND_RATING) + .and(targetClassification.DIRECTION.eq(FlowDirection.INBOUND.name()))) .where(dsl.renderInlined(LOGICAL_FLOW.ENTITY_LIFECYCLE_STATUS.ne(REMOVED.name()) .and(LOGICAL_FLOW.IS_REMOVED.isFalse()) .and(conditionForDataType) From d9dc0e49a03c3124a984abd9461363abda4bbc0f Mon Sep 17 00:00:00 2001 From: jainshrk Date: Wed, 23 Oct 2024 16:59:21 +0530 Subject: [PATCH 2/2] indentation changes --- .../waltz/web/endpoints/extracts/LogicalFlowExtractor.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/waltz-web/src/main/java/org/finos/waltz/web/endpoints/extracts/LogicalFlowExtractor.java b/waltz-web/src/main/java/org/finos/waltz/web/endpoints/extracts/LogicalFlowExtractor.java index a8d72e738f..acf0bca191 100644 --- a/waltz-web/src/main/java/org/finos/waltz/web/endpoints/extracts/LogicalFlowExtractor.java +++ b/waltz-web/src/main/java/org/finos/waltz/web/endpoints/extracts/LogicalFlowExtractor.java @@ -172,10 +172,10 @@ private SelectConditionStep prepareQuery(DSLContext dsl, IdSelectionOpti .and(LOGICAL_FLOW_DECORATOR.DECORATOR_ENTITY_KIND.eq(EntityKind.DATA_TYPE.name()))) .innerJoin(sourceClassification) .on(sourceClassification.CODE.eq(LOGICAL_FLOW_DECORATOR.RATING) - .and(sourceClassification.DIRECTION.eq(FlowDirection.OUTBOUND.name()))) + .and(sourceClassification.DIRECTION.eq(FlowDirection.OUTBOUND.name()))) .innerJoin(targetClassification) .on(targetClassification.CODE.eq(LOGICAL_FLOW_DECORATOR.TARGET_INBOUND_RATING) - .and(targetClassification.DIRECTION.eq(FlowDirection.INBOUND.name()))) + .and(targetClassification.DIRECTION.eq(FlowDirection.INBOUND.name()))) .where(dsl.renderInlined(LOGICAL_FLOW.ENTITY_LIFECYCLE_STATUS.ne(REMOVED.name()) .and(LOGICAL_FLOW.IS_REMOVED.isFalse()) .and(conditionForDataType)