-
Notifications
You must be signed in to change notification settings - Fork 118
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix getRelationships API when using query param (#1615)
- Loading branch information
Showing
5 changed files
with
135 additions
and
76 deletions.
There are no files selected for viewing
12 changes: 12 additions & 0 deletions
12
...tadiscovery/oddplatform/repository/reactive/ReactiveDataEntityRelationshipRepository.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| package org.opendatadiscovery.oddplatform.repository.reactive; | ||
|
|
||
| import org.opendatadiscovery.oddplatform.api.contract.model.RelationshipsType; | ||
| import org.opendatadiscovery.oddplatform.dto.RelationshipDto; | ||
| import org.opendatadiscovery.oddplatform.utils.Page; | ||
| import reactor.core.publisher.Mono; | ||
|
|
||
| public interface ReactiveDataEntityRelationshipRepository { | ||
|
|
||
| Mono<Page<RelationshipDto>> getRelationships(final Integer page, final Integer size, | ||
| final String inputQuery, final RelationshipsType type); | ||
| } |
108 changes: 108 additions & 0 deletions
108
...scovery/oddplatform/repository/reactive/ReactiveDataEntityRelationshipRepositoryImpl.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,108 @@ | ||
| package org.opendatadiscovery.oddplatform.repository.reactive; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.Arrays; | ||
| import java.util.List; | ||
| import java.util.stream.Stream; | ||
| import lombok.RequiredArgsConstructor; | ||
| import lombok.extern.slf4j.Slf4j; | ||
| import org.apache.commons.lang3.StringUtils; | ||
| import org.jooq.Condition; | ||
| import org.jooq.Field; | ||
| import org.jooq.Record; | ||
| import org.jooq.ResultQuery; | ||
| import org.jooq.Select; | ||
| import org.jooq.SortOrder; | ||
| import org.jooq.Table; | ||
| import org.jooq.impl.DSL; | ||
| import org.opendatadiscovery.oddplatform.api.contract.model.RelationshipsType; | ||
| import org.opendatadiscovery.oddplatform.dto.DataEntityTypeDto; | ||
| import org.opendatadiscovery.oddplatform.dto.RelationshipDto; | ||
| import org.opendatadiscovery.oddplatform.model.tables.pojos.DataEntityPojo; | ||
| import org.opendatadiscovery.oddplatform.model.tables.pojos.RelationshipsPojo; | ||
| import org.opendatadiscovery.oddplatform.model.tables.records.DataEntityRecord; | ||
| import org.opendatadiscovery.oddplatform.model.tables.records.RelationshipsRecord; | ||
| import org.opendatadiscovery.oddplatform.repository.util.JooqQueryHelper; | ||
| import org.opendatadiscovery.oddplatform.repository.util.JooqReactiveOperations; | ||
| import org.opendatadiscovery.oddplatform.repository.util.OrderByField; | ||
| import org.opendatadiscovery.oddplatform.utils.Page; | ||
| import org.springframework.stereotype.Repository; | ||
| import reactor.core.publisher.Mono; | ||
|
|
||
| import static org.opendatadiscovery.oddplatform.model.Tables.DATA_ENTITY; | ||
| import static org.opendatadiscovery.oddplatform.model.Tables.RELATIONSHIPS; | ||
|
|
||
| @Slf4j | ||
| @Repository | ||
| @RequiredArgsConstructor | ||
| public class ReactiveDataEntityRelationshipRepositoryImpl | ||
| implements ReactiveDataEntityRelationshipRepository { | ||
| private static final String RELATIONSHIPS_CTE = "relationships_cte"; | ||
| private static final String SOURCE_DATA_ENTITY = "source_data_entity"; | ||
| private static final String TARGET_DATA_ENTITY = "target_data_entity"; | ||
|
|
||
| private final JooqReactiveOperations jooqReactiveOperations; | ||
| private final JooqQueryHelper jooqQueryHelper; | ||
|
|
||
| @Override | ||
| public Mono<Page<RelationshipDto>> getRelationships(final Integer page, final Integer size, | ||
| final String inputQuery, final RelationshipsType type) { | ||
| final Table<RelationshipsRecord> relationships = RELATIONSHIPS.asTable(RELATIONSHIPS_CTE); | ||
| final Table<DataEntityRecord> srcDataEntity = DATA_ENTITY.asTable(SOURCE_DATA_ENTITY); | ||
| final Table<DataEntityRecord> trgtDataEntity = DATA_ENTITY.asTable(TARGET_DATA_ENTITY); | ||
|
|
||
| final List<Condition> conditionList = new ArrayList<>(); | ||
|
|
||
| if (!StringUtils.isBlank(inputQuery)) { | ||
| conditionList.add(DATA_ENTITY.EXTERNAL_NAME.containsIgnoreCase(inputQuery)); | ||
| } | ||
|
|
||
| conditionList.add(DATA_ENTITY.TYPE_ID.eq(DataEntityTypeDto.RELATIONSHIP.getId())); | ||
|
|
||
| final Select<DataEntityRecord> homogeneousQuery = DSL.selectFrom(DATA_ENTITY) | ||
| .where(conditionList); | ||
|
|
||
| final Select<? extends Record> relationshipSelect = | ||
| jooqQueryHelper.paginate(homogeneousQuery, | ||
| List.of(new OrderByField(DATA_ENTITY.ID, SortOrder.ASC)), (page - 1) * size, size); | ||
|
|
||
| final Table<? extends Record> relationshipsDataEntityCTE = | ||
| relationshipSelect.asTable("data_entity_relationship_cte"); | ||
|
|
||
| final List<Field<?>> groupByFields = | ||
| Stream.of(relationshipsDataEntityCTE.fields(), srcDataEntity.fields(), | ||
| trgtDataEntity.fields(), relationships.fields()) | ||
| .flatMap(Arrays::stream) | ||
| .toList(); | ||
|
|
||
| final ResultQuery<Record> resultQuery = DSL.with(relationshipsDataEntityCTE.getName()) | ||
| .as(relationshipSelect) | ||
| .select(relationshipsDataEntityCTE.fields()) | ||
| .select(relationships.asterisk(), srcDataEntity.asterisk(), trgtDataEntity.asterisk()) | ||
| .from(relationshipsDataEntityCTE.getName()) | ||
| .join(relationships) | ||
| .on(relationshipsDataEntityCTE.field(DATA_ENTITY.ID).eq(relationships.field(RELATIONSHIPS.DATA_ENTITY_ID)) | ||
| .and(RelationshipsType.ALL == type | ||
| ? DSL.noCondition() | ||
| : relationships.field(RELATIONSHIPS.RELATIONSHIP_TYPE).eq(type.getValue()))) | ||
| .leftJoin(srcDataEntity) | ||
| .on(relationships.field(RELATIONSHIPS.SOURCE_DATASET_ODDRN).eq(srcDataEntity.field(DATA_ENTITY.ODDRN))) | ||
| .leftJoin(trgtDataEntity) | ||
| .on(relationships.field(RELATIONSHIPS.TARGET_DATASET_ODDRN).eq(trgtDataEntity.field(DATA_ENTITY.ODDRN))) | ||
| .groupBy(groupByFields); | ||
|
|
||
| return jooqReactiveOperations.flux(resultQuery) | ||
| .collectList() | ||
| .flatMap(record -> jooqQueryHelper.pageifyResult( | ||
| record, | ||
| r -> RelationshipDto.builder() | ||
| .relationshipPojo(r.into(relationships).into(RelationshipsPojo.class)) | ||
| .dataEntityRelationship(r.into(relationshipsDataEntityCTE).into(DataEntityPojo.class)) | ||
| .sourceDataEntity(r.into(srcDataEntity).into(DataEntityPojo.class)) | ||
| .targetDataEntity(r.into(trgtDataEntity).into(DataEntityPojo.class)) | ||
| .build(), | ||
| jooqReactiveOperations | ||
| .mono(DSL.selectCount().from(DATA_ENTITY).where(conditionList)) | ||
| .map(r -> r.component1().longValue()))); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters