diff --git a/odd-platform-api/src/main/java/org/opendatadiscovery/oddplatform/controller/DataQualityRunsController.java b/odd-platform-api/src/main/java/org/opendatadiscovery/oddplatform/controller/DataQualityRunsController.java index 8914a83e2..dbcb2f077 100644 --- a/odd-platform-api/src/main/java/org/opendatadiscovery/oddplatform/controller/DataQualityRunsController.java +++ b/odd-platform-api/src/main/java/org/opendatadiscovery/oddplatform/controller/DataQualityRunsController.java @@ -16,19 +16,19 @@ public class DataQualityRunsController implements DataQualityRunsApi { private final DataQualityRunsService service; @Override - public Mono> getDataQualityTestsRuns(final List namespaceId, - final List datasourceId, - final List ownerId, - final List titleId, - final List tagId, - final List deNamespaceId, - final List deDatasourceId, - final List deOwnerId, - final List deTitleId, - final List deTagId, + public Mono> getDataQualityTestsRuns(final List namespaceIds, + final List datasourceIds, + final List ownerIds, + final List titleIds, + final List tagIds, + final List deNamespaceIds, + final List deDatasourceIds, + final List deOwnerIds, + final List deTitleIds, + final List deTagIds, final ServerWebExchange exchange) { - return service.getDataQualityTestsRuns(namespaceId, datasourceId, ownerId, titleId, tagId, - deNamespaceId, deDatasourceId, deOwnerId, deTitleId, deTagId) + return service.getDataQualityTestsRuns(namespaceIds, datasourceIds, ownerIds, titleIds, tagIds, + deNamespaceIds, deDatasourceIds, deOwnerIds, deTitleIds, deTagIds) .map(ResponseEntity::ok); } } diff --git a/odd-platform-api/src/main/java/org/opendatadiscovery/oddplatform/dto/DataQualityTestFiltersDto.java b/odd-platform-api/src/main/java/org/opendatadiscovery/oddplatform/dto/DataQualityTestFiltersDto.java index 1abecbac8..08545faff 100644 --- a/odd-platform-api/src/main/java/org/opendatadiscovery/oddplatform/dto/DataQualityTestFiltersDto.java +++ b/odd-platform-api/src/main/java/org/opendatadiscovery/oddplatform/dto/DataQualityTestFiltersDto.java @@ -9,9 +9,9 @@ public record DataQualityTestFiltersDto(List namespaceIds, List ownerIds, List titleIds, List tagIds, - List deNamespaceId, - List deDatasourceId, - List deOwnerId, - List deTitleId, - List deTagId) { + List deNamespaceIds, + List deDatasourceIds, + List deOwnerIds, + List deTitleIds, + List deTagIds) { } diff --git a/odd-platform-api/src/main/java/org/opendatadiscovery/oddplatform/mapper/DataQualityTestFiltersMapper.java b/odd-platform-api/src/main/java/org/opendatadiscovery/oddplatform/mapper/DataQualityTestFiltersMapper.java index 67ea18d49..0526fdbaf 100644 --- a/odd-platform-api/src/main/java/org/opendatadiscovery/oddplatform/mapper/DataQualityTestFiltersMapper.java +++ b/odd-platform-api/src/main/java/org/opendatadiscovery/oddplatform/mapper/DataQualityTestFiltersMapper.java @@ -8,20 +8,20 @@ public class DataQualityTestFiltersMapper { public DataQualityTestFiltersDto mapToDto(final List namespaceIds, final List datasourceIds, final List ownerIds, final List titleIds, - final List tagIds, final List deNamespaceId, - final List deDatasourceId, final List deOwnerId, - final List deTitleId, final List deTagId) { + final List tagIds, final List deNamespaceIds, + final List deDatasourceIds, final List deOwnerIds, + final List deTitleIds, final List deTagIds) { return DataQualityTestFiltersDto.builder() .namespaceIds(namespaceIds) .datasourceIds(datasourceIds) .ownerIds(ownerIds) .titleIds(titleIds) .tagIds(tagIds) - .deNamespaceId(deNamespaceId) - .deDatasourceId(deDatasourceId) - .deOwnerId(deOwnerId) - .deTitleId(deTitleId) - .deTagId(deTagId) + .deNamespaceIds(deNamespaceIds) + .deDatasourceIds(deDatasourceIds) + .deOwnerIds(deOwnerIds) + .deTitleIds(deTitleIds) + .deTagIds(deTagIds) .build(); } } diff --git a/odd-platform-api/src/main/java/org/opendatadiscovery/oddplatform/repository/reactive/ReactiveDataQualityRunsRepositoryImpl.java b/odd-platform-api/src/main/java/org/opendatadiscovery/oddplatform/repository/reactive/ReactiveDataQualityRunsRepositoryImpl.java index 7b490a6ae..5dc336b9b 100644 --- a/odd-platform-api/src/main/java/org/opendatadiscovery/oddplatform/repository/reactive/ReactiveDataQualityRunsRepositoryImpl.java +++ b/odd-platform-api/src/main/java/org/opendatadiscovery/oddplatform/repository/reactive/ReactiveDataQualityRunsRepositoryImpl.java @@ -260,8 +260,8 @@ private Table> generateDataEntityFiltersCte(final DataQual SelectJoinStep> table = DSL.select(DATA_ENTITY.ID, DATA_ENTITY.ODDRN) .from(DATA_ENTITY); - table = getConditionsForFilters(table, filtersDto.deDatasourceId(), filtersDto.deNamespaceId(), - filtersDto.deOwnerId(), filtersDto.deTitleId(), filtersDto.deTagId()); + table = getConditionsForFilters(table, filtersDto.deDatasourceIds(), filtersDto.deNamespaceIds(), + filtersDto.deOwnerIds(), filtersDto.deTitleIds(), filtersDto.deTagIds()); table.where(DATA_ENTITY.TYPE_ID.notIn(DataEntityTypeDto.JOB.getId(), DataEntityTypeDto.JOB_RUN.getId())); @@ -329,10 +329,10 @@ private boolean shouldAddFiltersForTest(final DataQualityTestFiltersDto filtersD } private boolean shouldAddFiltersForDataEntity(final DataQualityTestFiltersDto filtersDto) { - return CollectionUtils.isNotEmpty(filtersDto.deDatasourceId()) - || CollectionUtils.isNotEmpty(filtersDto.deNamespaceId()) - || CollectionUtils.isNotEmpty(filtersDto.deOwnerId()) - || CollectionUtils.isNotEmpty(filtersDto.deTitleId()) - || CollectionUtils.isNotEmpty(filtersDto.deTagId()); + return CollectionUtils.isNotEmpty(filtersDto.deDatasourceIds()) + || CollectionUtils.isNotEmpty(filtersDto.deNamespaceIds()) + || CollectionUtils.isNotEmpty(filtersDto.deOwnerIds()) + || CollectionUtils.isNotEmpty(filtersDto.deTitleIds()) + || CollectionUtils.isNotEmpty(filtersDto.deTagIds()); } } diff --git a/odd-platform-api/src/main/java/org/opendatadiscovery/oddplatform/service/DataQualityRunsService.java b/odd-platform-api/src/main/java/org/opendatadiscovery/oddplatform/service/DataQualityRunsService.java index 6ceee9051..21357bc89 100644 --- a/odd-platform-api/src/main/java/org/opendatadiscovery/oddplatform/service/DataQualityRunsService.java +++ b/odd-platform-api/src/main/java/org/opendatadiscovery/oddplatform/service/DataQualityRunsService.java @@ -7,7 +7,7 @@ public interface DataQualityRunsService { Mono getDataQualityTestsRuns(final List namespaceIds, final List datasourceIds, final List ownerIds, final List titleIds, - final List tagIds, final List deNamespaceId, - final List deDatasourceId, final List deOwnerId, - final List deTitleId, final List deTagId); + final List tagIds, final List deNamespaceIds, + final List deDatasourceIds, final List deOwnerIds, + final List deTitleIds, final List deTagIds); } diff --git a/odd-platform-api/src/main/java/org/opendatadiscovery/oddplatform/service/DataQualityRunsServiceImpl.java b/odd-platform-api/src/main/java/org/opendatadiscovery/oddplatform/service/DataQualityRunsServiceImpl.java index ec443a888..51d565c16 100644 --- a/odd-platform-api/src/main/java/org/opendatadiscovery/oddplatform/service/DataQualityRunsServiceImpl.java +++ b/odd-platform-api/src/main/java/org/opendatadiscovery/oddplatform/service/DataQualityRunsServiceImpl.java @@ -25,14 +25,14 @@ public Mono getDataQualityTestsRuns(final List namespa final List ownerIds, final List titleIds, final List tagIds, - final List deNamespaceId, - final List deDatasourceId, - final List deOwnerId, - final List deTitleId, - final List deTagId) { + final List deNamespaceIds, + final List deDatasourceIds, + final List deOwnerIds, + final List deTitleIds, + final List deTagIds) { final DataQualityTestFiltersDto filtersDto = dataQualityTestFiltersMapper.mapToDto(namespaceIds, datasourceIds, ownerIds, titleIds, tagIds, - deNamespaceId, deDatasourceId, deOwnerId, deTitleId, deTagId); + deNamespaceIds, deDatasourceIds, deOwnerIds, deTitleIds, deTagIds); return dataQualityRunsRepository.getLatestDataQualityRunsResults(filtersDto) .collectList() .zipWith(dataQualityRunsRepository.getLatestTablesHealth(filtersDto).collectList() diff --git a/odd-platform-specification/openapi.yaml b/odd-platform-specification/openapi.yaml index 3d0b9a5e4..98d8ab009 100644 --- a/odd-platform-specification/openapi.yaml +++ b/odd-platform-specification/openapi.yaml @@ -1937,7 +1937,7 @@ paths: description: Get Data Quality tests runs operationId: getDataQualityTestsRuns parameters: - - name: namespaceId + - name: namespaceIds in: query required: false schema: @@ -1947,7 +1947,7 @@ paths: format: int64 style: form explode: true - - name: datasourceId + - name: datasourceIds in: query required: false schema: @@ -1957,7 +1957,7 @@ paths: format: int64 style: form explode: true - - name: ownerId + - name: ownerIds in: query required: false schema: @@ -1967,7 +1967,7 @@ paths: format: int64 style: form explode: true - - name: titleId + - name: titleIds in: query required: false schema: @@ -1977,7 +1977,7 @@ paths: format: int64 style: form explode: true - - name: tagId + - name: tagIds in: query required: false schema: @@ -1987,7 +1987,7 @@ paths: format: int64 style: form explode: true - - name: deNamespaceId + - name: deNamespaceIds in: query required: false schema: @@ -1997,7 +1997,7 @@ paths: format: int64 style: form explode: true - - name: deDatasourceId + - name: deDatasourceIds in: query required: false schema: @@ -2007,7 +2007,7 @@ paths: format: int64 style: form explode: true - - name: deOwnerId + - name: deOwnerIds in: query required: false schema: @@ -2017,7 +2017,7 @@ paths: format: int64 style: form explode: true - - name: deTitleId + - name: deTitleIds in: query required: false schema: @@ -2027,7 +2027,7 @@ paths: format: int64 style: form explode: true - - name: deTagId + - name: deTagIds in: query required: false schema: