Skip to content

Commit

Permalink
Pull request #411: fix duplication of rows in lf exports
Browse files Browse the repository at this point in the history
Merge in WALTZ/waltz from WALTZ/waltz-sj:db-feature/CTCTOWALTZ-3399-duplicatation-of-rows-lf-export to db-feature/7179-duplicatation-of-rows-in-logical-flow-export

* commit 'd9dc0e49a03c3124a984abd9461363abda4bbc0f':
  indentation changes
  fix duplication of rows in lf exports
  • Loading branch information
jain-shreyans-db committed Nov 4, 2024
2 parents 5a3a543 + d9dc0e4 commit e945ffb
Showing 1 changed file with 5 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -170,9 +171,11 @@ private SelectConditionStep<Record> 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)
Expand Down

0 comments on commit e945ffb

Please sign in to comment.