This is an automated email from the ASF dual-hosted git repository. machristie pushed a commit to branch custos-integration in repository https://gitbox.apache.org/repos/asf/airavata-data-catalog.git
commit c769547a23f7fa9de0e976e5f391a4df11ed3f66 Author: Marcus Christie <[email protected]> AuthorDate: Fri Feb 17 09:53:16 2023 -0500 Fixing query method name --- .../datacatalog/api/repository/MetadataSchemaFieldRepository.java | 2 +- .../airavata/datacatalog/api/service/DataCatalogAPIService.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/data-catalog-api/server/src/main/java/org/apache/airavata/datacatalog/api/repository/MetadataSchemaFieldRepository.java b/data-catalog-api/server/src/main/java/org/apache/airavata/datacatalog/api/repository/MetadataSchemaFieldRepository.java index c8503db..7350e21 100644 --- a/data-catalog-api/server/src/main/java/org/apache/airavata/datacatalog/api/repository/MetadataSchemaFieldRepository.java +++ b/data-catalog-api/server/src/main/java/org/apache/airavata/datacatalog/api/repository/MetadataSchemaFieldRepository.java @@ -9,5 +9,5 @@ public interface MetadataSchemaFieldRepository extends JpaRepository<MetadataSch List<MetadataSchemaFieldEntity> findByMetadataSchema_SchemaName(String schemaName); - MetadataSchemaFieldEntity findByFieldNameAndSchema_SchemaName(String fieldName, String schemaName); + MetadataSchemaFieldEntity findByFieldNameAndMetadataSchema_SchemaName(String fieldName, String schemaName); } diff --git a/data-catalog-api/server/src/main/java/org/apache/airavata/datacatalog/api/service/DataCatalogAPIService.java b/data-catalog-api/server/src/main/java/org/apache/airavata/datacatalog/api/service/DataCatalogAPIService.java index 9076ce6..f7a7904 100644 --- a/data-catalog-api/server/src/main/java/org/apache/airavata/datacatalog/api/service/DataCatalogAPIService.java +++ b/data-catalog-api/server/src/main/java/org/apache/airavata/datacatalog/api/service/DataCatalogAPIService.java @@ -217,7 +217,7 @@ public class DataCatalogAPIService extends DataCatalogAPIServiceGrpc.DataCatalog // TODO: check that user has write access on metadata schema field // TODO: handle metadata schema field not found MetadataSchemaFieldEntity metadataSchemaFieldEntity = metadataSchemaFieldRepository - .findByFieldNameAndSchema_SchemaName(request.getMetadataSchemaField().getFieldName(), + .findByFieldNameAndMetadataSchema_SchemaName(request.getMetadataSchemaField().getFieldName(), request.getMetadataSchemaField().getSchemaName()); metadataSchemaFieldRepository.delete(metadataSchemaFieldEntity); MetadataSchemaFieldDeleteResponse.Builder responseBuilder = MetadataSchemaFieldDeleteResponse.newBuilder(); @@ -268,7 +268,7 @@ public class DataCatalogAPIService extends DataCatalogAPIServiceGrpc.DataCatalog // TODO: check that user has write access on metadata schema field // TODO: handle metadata schema field not found MetadataSchemaFieldEntity metadataSchemaFieldEntity = metadataSchemaFieldRepository - .findByFieldNameAndSchema_SchemaName(request.getMetadataSchemaField().getFieldName(), + .findByFieldNameAndMetadataSchema_SchemaName(request.getMetadataSchemaField().getFieldName(), request.getMetadataSchemaField().getSchemaName()); metadataSchemaFieldMapper.mapModelToEntity(request.getMetadataSchemaField(), metadataSchemaFieldEntity); metadataSchemaFieldRepository.save(metadataSchemaFieldEntity);
