From 8c7182075d8b44c22eb90ffc8299f600d0a8f4db Mon Sep 17 00:00:00 2001 From: Marcos Lopez Gonzalez Date: Wed, 31 Jul 2024 14:20:45 +0200 Subject: [PATCH] DescriptorSet renamed to DescriptorGroup --- .../database/TestCaseDatabaseInitializer.java | 2 +- .../resource/CollectionResourceIT.java | 66 ++++++------- .../service/CollectionsSearchIT.java | 10 +- .../descriptors/DescriptorsServiceIT.java | 18 ++-- .../mapper/CollectionsSearchMapperIT.java | 16 ++-- .../mapper/DescriptorsMapperIT.java | 50 +++++----- .../config/MyBatisConfiguration.java | 4 +- .../mapper/collections/DescriptorsMapper.java | 18 ++-- .../mapper/collections/dto/BaseSearchDto.java | 4 +- .../mapper/collections/dto/DescriptorDto.java | 2 +- .../mapper/collections/dto/SearchDto.java | 2 +- ...Params.java => DescriptorGroupParams.java} | 2 +- .../collections/params/DescriptorParams.java | 2 +- .../140-collection-descriptors-grscicoll.xml | 14 +-- .../collections/CollectionsSearchMapper.xml | 18 ++-- .../mapper/collections/DescriptorsMapper.xml | 60 ++++++------ .../collections/CollectionsSearchService.java | 6 +- .../descriptors/DefaultDescriptorService.java | 86 ++++++++--------- .../client/collections/CollectionClient.java | 34 +++---- .../collections/CollectionResource.java | 94 ++++++++++--------- 20 files changed, 255 insertions(+), 253 deletions(-) rename registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/collections/params/{DescriptorSetParams.java => DescriptorGroupParams.java} (91%) diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/database/TestCaseDatabaseInitializer.java b/registry-integration-tests/src/test/java/org/gbif/registry/database/TestCaseDatabaseInitializer.java index 8b8f26160..bc9fc4775 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/database/TestCaseDatabaseInitializer.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/database/TestCaseDatabaseInitializer.java @@ -104,7 +104,7 @@ public class TestCaseDatabaseInitializer implements BeforeEachCallback { "institution_collection_contact", "collection_collection_contact", "collections_batch", - "collection_descriptor_set", + "collection_descriptor_group", "collection_descriptor", "collection_descriptor_verbatim"); diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/resource/CollectionResourceIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/resource/CollectionResourceIT.java index e6fd87bdf..2f721b2ef 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/resource/CollectionResourceIT.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/resource/CollectionResourceIT.java @@ -30,11 +30,11 @@ import org.gbif.api.model.collections.Collection; import org.gbif.api.model.collections.CollectionImportParams; import org.gbif.api.model.collections.descriptors.Descriptor; -import org.gbif.api.model.collections.descriptors.DescriptorSet; +import org.gbif.api.model.collections.descriptors.DescriptorGroup; import org.gbif.api.model.collections.latimercore.ObjectGroup; import org.gbif.api.model.collections.request.CollectionSearchRequest; import org.gbif.api.model.collections.request.DescriptorSearchRequest; -import org.gbif.api.model.collections.request.DescriptorSetSearchRequest; +import org.gbif.api.model.collections.request.DescriptorGroupSearchRequest; import org.gbif.api.model.collections.suggestions.CollectionChangeSuggestion; import org.gbif.api.model.collections.suggestions.Type; import org.gbif.api.model.collections.view.CollectionView; @@ -238,8 +238,8 @@ public void createFromDatasetTest() { @SneakyThrows @Test - public void createDescriptorSetTest() { - when(descriptorsService.createDescriptorSet(any(), any(), any(), any(), any())).thenReturn(1L); + public void createDescriptorGroupTest() { + when(descriptorsService.createDescriptorGroup(any(), any(), any(), any(), any())).thenReturn(1L); Resource descriptorsResource = new ClassPathResource("collections/descriptors.csv"); MultipartFile descriptorsFile = @@ -248,22 +248,22 @@ public void createDescriptorSetTest() { assertEquals( 1L, getClient() - .createDescriptorSet( + .createDescriptorGroup( UUID.randomUUID(), ExportFormat.CSV, descriptorsFile, "title", "desc")); } @SneakyThrows @Test - public void updateDescriptorSetTest() { + public void updateDescriptorGroupTest() { UUID collectionKey = UUID.randomUUID(); - DescriptorSet descriptorSet = new DescriptorSet(); - descriptorSet.setCollectionKey(collectionKey); - descriptorSet.setTitle("title"); + DescriptorGroup descriptorGroup = new DescriptorGroup(); + descriptorGroup.setCollectionKey(collectionKey); + descriptorGroup.setTitle("title"); - when(descriptorsService.getDescriptorSet(anyLong())).thenReturn(descriptorSet); + when(descriptorsService.getDescriptorGroup(anyLong())).thenReturn(descriptorGroup); doNothing() .when(descriptorsService) - .updateDescriptorSet(anyLong(), any(), any(), anyString(), anyString()); + .updateDescriptorGroup(anyLong(), any(), any(), anyString(), anyString()); Resource descriptorsResource = new ClassPathResource("collections/descriptors.csv"); MultipartFile descriptorsFile = @@ -272,39 +272,39 @@ public void updateDescriptorSetTest() { assertDoesNotThrow( () -> getClient() - .updateDescriptorSet( + .updateDescriptorGroup( collectionKey, 1L, ExportFormat.CSV, descriptorsFile, "title", "desc")); } @Test - public void getDescriptorSetTest() { + public void getDescriptorGroupTest() { UUID collectionKey = UUID.randomUUID(); - DescriptorSet descriptorSet = new DescriptorSet(); - descriptorSet.setCollectionKey(collectionKey); - descriptorSet.setTitle("title"); + DescriptorGroup descriptorGroup = new DescriptorGroup(); + descriptorGroup.setCollectionKey(collectionKey); + descriptorGroup.setTitle("title"); when(resourceNotFoundService.entityExists(any(), any())).thenReturn(true); - when(descriptorsService.getDescriptorSet(1L)).thenReturn(descriptorSet); + when(descriptorsService.getDescriptorGroup(1L)).thenReturn(descriptorGroup); - assertEquals(descriptorSet, getClient().getCollectionDescriptorSet(collectionKey, 1L)); + assertEquals(descriptorGroup, getClient().getCollectionDescriptorGroup(collectionKey, 1L)); } @Test - public void listDescriptorSetTest() { - DescriptorSet descriptorSet = new DescriptorSet(); - descriptorSet.setCollectionKey(UUID.randomUUID()); - descriptorSet.setTitle("title"); + public void listDescriptorGroupTest() { + DescriptorGroup descriptorGroup = new DescriptorGroup(); + descriptorGroup.setCollectionKey(UUID.randomUUID()); + descriptorGroup.setTitle("title"); when(resourceNotFoundService.entityExists(any(), any())).thenReturn(true); - when(descriptorsService.listDescriptorSets( - any(UUID.class), any(DescriptorSetSearchRequest.class))) - .thenReturn(new PagingResponse<>(0, 10, 1L, Collections.singletonList(descriptorSet))); + when(descriptorsService.listDescriptorGroups( + any(UUID.class), any(DescriptorGroupSearchRequest.class))) + .thenReturn(new PagingResponse<>(0, 10, 1L, Collections.singletonList(descriptorGroup))); assertEquals( 1, getClient() - .listCollectionDescriptorSets( - UUID.randomUUID(), DescriptorSetSearchRequest.builder().query("foo").build()) + .listCollectionDescriptorGroups( + UUID.randomUUID(), DescriptorGroupSearchRequest.builder().query("foo").build()) .getResults() .size()); } @@ -312,7 +312,7 @@ public void listDescriptorSetTest() { @Test public void listDescriptorsTest() { Descriptor descriptor = new Descriptor(); - descriptor.setDescriptorSetKey(1L); + descriptor.setDescriptorGroupKey(1L); descriptor.setUsageRank(Rank.ABERRATION); descriptor.setCountry(Country.SPAIN); @@ -335,17 +335,17 @@ public void listDescriptorsTest() { public void getDescriptorTest() { UUID collectionKey = UUID.randomUUID(); Descriptor descriptor = new Descriptor(); - descriptor.setDescriptorSetKey(1L); + descriptor.setDescriptorGroupKey(1L); descriptor.setUsageRank(Rank.ABERRATION); descriptor.setCountry(Country.SPAIN); - DescriptorSet descriptorSet = new DescriptorSet(); - descriptorSet.setCollectionKey(collectionKey); - descriptorSet.setTitle("title"); + DescriptorGroup descriptorGroup = new DescriptorGroup(); + descriptorGroup.setCollectionKey(collectionKey); + descriptorGroup.setTitle("title"); when(resourceNotFoundService.entityExists(any(), any())).thenReturn(true); when(descriptorsService.getDescriptor(anyLong())).thenReturn(descriptor); - when(descriptorsService.getDescriptorSet(anyLong())).thenReturn(descriptorSet); + when(descriptorsService.getDescriptorGroup(anyLong())).thenReturn(descriptorGroup); assertEquals(descriptor, getClient().getCollectionDescriptor(collectionKey, 1L, 1L)); } diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/service/CollectionsSearchIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/service/CollectionsSearchIT.java index 7976ca703..8f05250da 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/service/CollectionsSearchIT.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/service/CollectionsSearchIT.java @@ -121,7 +121,7 @@ public void loadData() { c1.setDisplayOnNHCPortal(false); collectionService.create(c1); - descriptorsService.createDescriptorSet( + descriptorsService.createDescriptorGroup( StreamUtils.copyToByteArray( new ClassPathResource("collections/descriptors.csv").getInputStream()), ExportFormat.TSV, @@ -129,7 +129,7 @@ public void loadData() { "description", c1.getKey()); - descriptorsService.createDescriptorSet( + descriptorsService.createDescriptorGroup( StreamUtils.copyToByteArray( new ClassPathResource("collections/descriptors2.csv").getInputStream()), ExportFormat.TSV, @@ -145,7 +145,7 @@ public void loadData() { c2.getIdentifiers().add(new Identifier(IdentifierType.LSID, "lsid-coll")); collectionService.create(c2); - descriptorsService.createDescriptorSet( + descriptorsService.createDescriptorGroup( StreamUtils.copyToByteArray( new ClassPathResource("collections/descriptors3.csv").getInputStream()), ExportFormat.TSV, @@ -458,7 +458,7 @@ public void searchCollectionsTest() { assertEquals(1, result.getResults().size()); assertEquals(c1.getKey(), result.getResults().get(0).getKey()); assertEquals( - "descriptorSet.title", + "descriptorGroup.title", result.getResults().get(0).getHighlights().iterator().next().getField()); assertTrue(result.getResults().get(0).getDescriptorMatches().isEmpty()); @@ -468,7 +468,7 @@ public void searchCollectionsTest() { assertEquals(1, result.getResults().size()); assertEquals(c2.getKey(), result.getResults().get(0).getKey()); assertEquals( - "descriptorSet.description", + "descriptorGroup.description", result.getResults().get(0).getHighlights().iterator().next().getField()); assertTrue(result.getResults().get(0).getDescriptorMatches().isEmpty()); } diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/service/descriptors/DescriptorsServiceIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/service/descriptors/DescriptorsServiceIT.java index beb5465fd..33e6bb70d 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/service/descriptors/DescriptorsServiceIT.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/service/descriptors/DescriptorsServiceIT.java @@ -20,7 +20,7 @@ import org.gbif.api.model.collections.Collection; import org.gbif.api.model.collections.descriptors.Descriptor; import org.gbif.api.model.collections.request.DescriptorSearchRequest; -import org.gbif.api.model.collections.request.DescriptorSetSearchRequest; +import org.gbif.api.model.collections.request.DescriptorGroupSearchRequest; import org.gbif.api.model.common.export.ExportFormat; import org.gbif.api.model.common.paging.PagingResponse; import org.gbif.api.service.collections.CollectionService; @@ -64,19 +64,19 @@ public void descriptorsTest() { collectionService.create(collection); Resource descriptorsFile = new ClassPathResource("collections/descriptors.csv"); - long descriptorSetKey = - descriptorsService.createDescriptorSet( + long DescriptorGroupKey = + descriptorsService.createDescriptorGroup( StreamUtils.copyToByteArray(descriptorsFile.getInputStream()), ExportFormat.TSV, "My descriptor set", "description", collection.getKey()); - assertTrue(descriptorSetKey > 0); + assertTrue(DescriptorGroupKey > 0); assertEquals( 1, descriptorsService - .listDescriptorSets(collection.getKey(), DescriptorSetSearchRequest.builder().build()) + .listDescriptorGroups(collection.getKey(), DescriptorGroupSearchRequest.builder().build()) .getResults() .size()); @@ -119,8 +119,8 @@ public void descriptorsTest() { .size()); Resource descriptorsFile2 = new ClassPathResource("collections/descriptors2.csv"); - descriptorsService.updateDescriptorSet( - descriptorSetKey, + descriptorsService.updateDescriptorGroup( + DescriptorGroupKey, StreamUtils.copyToByteArray(descriptorsFile2.getInputStream()), ExportFormat.TSV, "My descriptor set", @@ -130,14 +130,14 @@ public void descriptorsTest() { assertEquals(4, descriptors.getResults().size()); assertTrue(descriptors.getResults().stream().allMatch(r -> r.getVerbatim().size() == 3)); - descriptorsService.deleteDescriptorSet(descriptorSetKey); + descriptorsService.deleteDescriptorGroup(DescriptorGroupKey); assertEquals( 0, descriptorsService.listDescriptors(DescriptorSearchRequest.builder().build()).getCount()); assertEquals( 0, descriptorsService - .listDescriptorSets(collection.getKey(), DescriptorSetSearchRequest.builder().build()) + .listDescriptorGroups(collection.getKey(), DescriptorGroupSearchRequest.builder().build()) .getCount()); } } diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/persistence/mapper/CollectionsSearchMapperIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/persistence/mapper/CollectionsSearchMapperIT.java index b784548aa..3f7e0c088 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/persistence/mapper/CollectionsSearchMapperIT.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/persistence/mapper/CollectionsSearchMapperIT.java @@ -26,7 +26,7 @@ import org.gbif.api.model.collections.Address; import org.gbif.api.model.collections.AlternativeCode; import org.gbif.api.model.collections.Collection; -import org.gbif.api.model.collections.descriptors.DescriptorSet; +import org.gbif.api.model.collections.descriptors.DescriptorGroup; import org.gbif.api.vocabulary.Country; import org.gbif.api.vocabulary.License; import org.gbif.registry.database.TestCaseDatabaseInitializer; @@ -123,15 +123,15 @@ public void searchTest() { collectionMapper.create(collection); - DescriptorSet descriptorSet = new DescriptorSet(); - descriptorSet.setCollectionKey(collectionKey); - descriptorSet.setTitle("title"); - descriptorSet.setCreatedBy("test"); - descriptorSet.setModifiedBy("test"); - descriptorsMapper.createDescriptorSet(descriptorSet); + DescriptorGroup DescriptorGroup = new DescriptorGroup(); + DescriptorGroup.setCollectionKey(collectionKey); + DescriptorGroup.setTitle("title"); + DescriptorGroup.setCreatedBy("test"); + DescriptorGroup.setModifiedBy("test"); + descriptorsMapper.createDescriptorGroup(DescriptorGroup); DescriptorDto descriptorDto = new DescriptorDto(); - descriptorDto.setDescriptorSetKey(descriptorSet.getKey()); + descriptorDto.setDescriptorGroupKey(DescriptorGroup.getKey()); descriptorDto.setUsageName("aves"); descriptorDto.setCountry(Country.SPAIN); descriptorsMapper.createDescriptor(descriptorDto); diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/persistence/mapper/DescriptorsMapperIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/persistence/mapper/DescriptorsMapperIT.java index d6cf7ee10..1b7b56fb1 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/persistence/mapper/DescriptorsMapperIT.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/persistence/mapper/DescriptorsMapperIT.java @@ -21,7 +21,7 @@ import java.util.Collections; import java.util.UUID; import org.gbif.api.model.collections.Collection; -import org.gbif.api.model.collections.descriptors.DescriptorSet; +import org.gbif.api.model.collections.descriptors.DescriptorGroup; import org.gbif.api.v2.RankedName; import org.gbif.api.vocabulary.Country; import org.gbif.api.vocabulary.Rank; @@ -30,8 +30,8 @@ import org.gbif.registry.persistence.mapper.collections.CollectionMapper; import org.gbif.registry.persistence.mapper.collections.DescriptorsMapper; import org.gbif.registry.persistence.mapper.collections.dto.DescriptorDto; +import org.gbif.registry.persistence.mapper.collections.params.DescriptorGroupParams; import org.gbif.registry.persistence.mapper.collections.params.DescriptorParams; -import org.gbif.registry.persistence.mapper.collections.params.DescriptorSetParams; import org.gbif.registry.search.test.EsManageServer; import org.gbif.registry.ws.it.BaseItTest; import org.gbif.ws.client.filter.SimplePrincipalProvider; @@ -45,7 +45,7 @@ public class DescriptorsMapperIT extends BaseItTest { protected TestCaseDatabaseInitializer databaseRule = new TestCaseDatabaseInitializer( "collection", - "collection_descriptor_set", + "collection_descriptor_group", "collection_descriptor", "collection_descriptor_verbatim"); @@ -74,33 +74,33 @@ public void crudTest() { collectionMapper.create(collection); assertNotNull(collection.getKey()); - DescriptorSet descriptorSet = new DescriptorSet(); - descriptorSet.setTitle("title"); - descriptorSet.setDescription("description"); - descriptorSet.setCreatedBy("user"); - descriptorSet.setModifiedBy("user"); - descriptorSet.setCollectionKey(collection.getKey()); - descriptorsMapper.createDescriptorSet(descriptorSet); - assertTrue(descriptorSet.getKey() > 0); + DescriptorGroup descriptorGroup = new DescriptorGroup(); + descriptorGroup.setTitle("title"); + descriptorGroup.setDescription("description"); + descriptorGroup.setCreatedBy("user"); + descriptorGroup.setModifiedBy("user"); + descriptorGroup.setCollectionKey(collection.getKey()); + descriptorsMapper.createDescriptorGroup(descriptorGroup); + assertTrue(descriptorGroup.getKey() > 0); - DescriptorSet created = descriptorsMapper.getDescriptorSet(descriptorSet.getKey()); - assertTrue(descriptorSet.lenientEquals(created)); + DescriptorGroup created = descriptorsMapper.getDescriptorGroup(descriptorGroup.getKey()); + assertTrue(descriptorGroup.lenientEquals(created)); created.setTitle("title2"); - descriptorsMapper.updateDescriptorSet(created); + descriptorsMapper.updateDescriptorGroup(created); - DescriptorSet updated = descriptorsMapper.getDescriptorSet(descriptorSet.getKey()); + DescriptorGroup updated = descriptorsMapper.getDescriptorGroup(descriptorGroup.getKey()); assertTrue(updated.lenientEquals(created)); assertEquals( 1, descriptorsMapper - .listDescriptorSets( - DescriptorSetParams.builder().collectionKey(collection.getKey()).build()) + .listDescriptorGroups( + DescriptorGroupParams.builder().collectionKey(collection.getKey()).build()) .size()); DescriptorDto descriptorDto = new DescriptorDto(); - descriptorDto.setDescriptorSetKey(descriptorSet.getKey()); + descriptorDto.setDescriptorGroupKey(descriptorGroup.getKey()); descriptorDto.setCountry(Country.DENMARK); descriptorDto.setDiscipline("discipline"); descriptorDto.setIssues(Arrays.asList("i1", "i2")); @@ -130,7 +130,7 @@ public void crudTest() { 1, descriptorsMapper .listDescriptors( - DescriptorParams.builder().descriptorSetKey(descriptorSet.getKey()).build()) + DescriptorParams.builder().descriptorGroupKey(descriptorGroup.getKey()).build()) .size()); assertEquals( @@ -149,26 +149,26 @@ public void crudTest() { .build()) .size()); - descriptorsMapper.deleteDescriptorSet(descriptorSet.getKey()); + descriptorsMapper.deleteDescriptorGroup(descriptorGroup.getKey()); assertTrue( descriptorsMapper - .listDescriptorSets( - DescriptorSetParams.builder().collectionKey(collection.getKey()).build()) + .listDescriptorGroups( + DescriptorGroupParams.builder().collectionKey(collection.getKey()).build()) .isEmpty()); assertEquals( 1, descriptorsMapper - .listDescriptorSets(DescriptorSetParams.builder().deleted(true).build()) + .listDescriptorGroups(DescriptorGroupParams.builder().deleted(true).build()) .size()); - descriptorsMapper.deleteDescriptors(descriptorSet.getKey()); + descriptorsMapper.deleteDescriptors(descriptorGroup.getKey()); assertEquals( 0, descriptorsMapper .listDescriptors( - DescriptorParams.builder().descriptorSetKey(descriptorSet.getKey()).build()) + DescriptorParams.builder().descriptorGroupKey(descriptorGroup.getKey()).build()) .size()); } } diff --git a/registry-persistence/src/main/java/org/gbif/registry/persistence/config/MyBatisConfiguration.java b/registry-persistence/src/main/java/org/gbif/registry/persistence/config/MyBatisConfiguration.java index 426c648f2..16cb0e00c 100644 --- a/registry-persistence/src/main/java/org/gbif/registry/persistence/config/MyBatisConfiguration.java +++ b/registry-persistence/src/main/java/org/gbif/registry/persistence/config/MyBatisConfiguration.java @@ -19,7 +19,7 @@ import org.gbif.api.model.collections.Collection; import org.gbif.api.model.collections.Institution; import org.gbif.api.model.collections.descriptors.Descriptor; -import org.gbif.api.model.collections.descriptors.DescriptorSet; +import org.gbif.api.model.collections.descriptors.DescriptorGroup; import org.gbif.api.model.common.DOI; import org.gbif.api.model.common.DoiData; import org.gbif.api.model.common.paging.Pageable; @@ -116,7 +116,7 @@ ConfigurationCustomizer mybatisConfigCustomizer() { configuration.getTypeAliasRegistry().registerAlias("Address", Address.class); configuration.getTypeAliasRegistry().registerAlias("CollectionDto", CollectionDto.class); configuration.getTypeAliasRegistry().registerAlias("DuplicateDto", DuplicateDto.class); - configuration.getTypeAliasRegistry().registerAlias("DescriptorSet", DescriptorSet.class); + configuration.getTypeAliasRegistry().registerAlias("DescriptorGroup", DescriptorGroup.class); configuration.getTypeAliasRegistry().registerAlias("Descriptor", Descriptor.class); configuration.getTypeAliasRegistry().registerAlias("DescriptorDto", DescriptorDto.class); configuration.getTypeAliasRegistry().registerAlias("VerbatimDto", VerbatimDto.class); diff --git a/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/collections/DescriptorsMapper.java b/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/collections/DescriptorsMapper.java index 6db1a866f..019e0630b 100644 --- a/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/collections/DescriptorsMapper.java +++ b/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/collections/DescriptorsMapper.java @@ -2,26 +2,26 @@ import java.util.List; import org.apache.ibatis.annotations.Param; -import org.gbif.api.model.collections.descriptors.DescriptorSet; +import org.gbif.api.model.collections.descriptors.DescriptorGroup; import org.gbif.registry.persistence.mapper.collections.dto.DescriptorDto; import org.gbif.registry.persistence.mapper.collections.params.DescriptorParams; -import org.gbif.registry.persistence.mapper.collections.params.DescriptorSetParams; +import org.gbif.registry.persistence.mapper.collections.params.DescriptorGroupParams; import org.springframework.stereotype.Repository; @Repository public interface DescriptorsMapper { - DescriptorSet getDescriptorSet(@Param("key") long key); + DescriptorGroup getDescriptorGroup(@Param("key") long key); - void createDescriptorSet(DescriptorSet entity); + void createDescriptorGroup(DescriptorGroup entity); - void deleteDescriptorSet(@Param("key") long key); + void deleteDescriptorGroup(@Param("key") long key); - void updateDescriptorSet(DescriptorSet entity); + void updateDescriptorGroup(DescriptorGroup entity); - List listDescriptorSets(@Param("params") DescriptorSetParams searchParams); + List listDescriptorGroups(@Param("params") DescriptorGroupParams searchParams); - long countDescriptorSets(@Param("params") DescriptorSetParams searchParams); + long countDescriptorGroups(@Param("params") DescriptorGroupParams searchParams); DescriptorDto getDescriptor(@Param("key") long key); @@ -33,7 +33,7 @@ public interface DescriptorsMapper { long countDescriptors(@Param("params") DescriptorParams searchParams); - void deleteDescriptors(@Param("descriptorSetKey") long descriptorSetKey); + void deleteDescriptors(@Param("DescriptorGroupKey") long DescriptorGroupKey); void createVerbatim( @Param("descriptorKey") long descriptorKey, diff --git a/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/collections/dto/BaseSearchDto.java b/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/collections/dto/BaseSearchDto.java index 8c39c5c87..aa8664e8f 100644 --- a/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/collections/dto/BaseSearchDto.java +++ b/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/collections/dto/BaseSearchDto.java @@ -49,7 +49,7 @@ public abstract class BaseSearchDto { private String descriptorDisciplineHighlight; private String descriptorObjectClassificationHighlight; private String descriptorIssuesHighlight; - private String descriptorSetTitleHighlight; - private String descriptorSetDescriptionHighlight; + private String descriptorGroupTitleHighlight; + private String descriptorGroupDescriptionHighlight; private boolean similarityMatch; } diff --git a/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/collections/dto/DescriptorDto.java b/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/collections/dto/DescriptorDto.java index b3f210fb3..e1d4dacf4 100644 --- a/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/collections/dto/DescriptorDto.java +++ b/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/collections/dto/DescriptorDto.java @@ -12,7 +12,7 @@ public class DescriptorDto { private long key; - private Long descriptorSetKey; + private Long descriptorGroupKey; private Country country; private Integer individualCount; private List identifiedBy; diff --git a/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/collections/dto/SearchDto.java b/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/collections/dto/SearchDto.java index 454347e74..fb5265313 100644 --- a/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/collections/dto/SearchDto.java +++ b/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/collections/dto/SearchDto.java @@ -33,7 +33,7 @@ public class SearchDto extends BaseSearchDto { // descriptors fields private Long descriptorKey; - private Long descriptorSetKey; + private Long descriptorGroupKey; private Long descriptorUsageKey; private String descriptorUsageName; private Rank descriptorUsageRank; diff --git a/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/collections/params/DescriptorSetParams.java b/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/collections/params/DescriptorGroupParams.java similarity index 91% rename from registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/collections/params/DescriptorSetParams.java rename to registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/collections/params/DescriptorGroupParams.java index 2daf5106d..1b0065b27 100644 --- a/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/collections/params/DescriptorSetParams.java +++ b/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/collections/params/DescriptorGroupParams.java @@ -8,7 +8,7 @@ @Getter @Builder -public class DescriptorSetParams { +public class DescriptorGroupParams { UUID collectionKey; @Nullable String query; diff --git a/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/collections/params/DescriptorParams.java b/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/collections/params/DescriptorParams.java index 4aa07e956..8aa433450 100644 --- a/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/collections/params/DescriptorParams.java +++ b/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/collections/params/DescriptorParams.java @@ -14,7 +14,7 @@ public class DescriptorParams { @Nullable String query; - @Nullable Long descriptorSetKey; + @Nullable Long descriptorGroupKey; @Nullable List usageKey; @Nullable List usageName; @Nullable List usageRank; diff --git a/registry-persistence/src/main/resources/liquibase/140-collection-descriptors-grscicoll.xml b/registry-persistence/src/main/resources/liquibase/140-collection-descriptors-grscicoll.xml index 98fc55db2..5e0c2bf6f 100644 --- a/registry-persistence/src/main/resources/liquibase/140-collection-descriptors-grscicoll.xml +++ b/registry-persistence/src/main/resources/liquibase/140-collection-descriptors-grscicoll.xml @@ -6,7 +6,7 @@ SELECT c.* - ,d.key AS descriptorKey, d.collection_descriptor_set_key AS descriptorSetKey, d.usage_key AS descriptorUsageKey, + ,d.key AS descriptorKey, d.collection_descriptor_group_key AS descriptorGroupKey, d.usage_key AS descriptorUsageKey, d.usage_name AS descriptorUsageName, d.usage_rank AS descriptorUsageRank, d.country AS descriptorCountry, d.individual_count AS descriptorIndividualCount, d.identified_by AS descriptorIdentifiedBy, d.date_identified as descriptorDateIdentified, d.type_status AS descriptorTypeStatus, @@ -275,8 +275,8 @@ ts_headline(d.discipline, c.query) descriptor_discipline_highlight, ts_headline(d.object_classification_name, c.query) descriptor_object_classification_highlight, ts_headline(array_to_string(d.issues, ' '), c.query) descriptor_issues_highlight, - ts_headline(ds.title, c.query) descriptor_set_title_highlight, - ts_headline(ds.description, c.query) descriptor_set_description_highlight + ts_headline(ds.title, c.query) descriptor_group_title_highlight, + ts_headline(ds.description, c.query) descriptor_group_description_highlight @@ -304,8 +304,8 @@ , query FROM collection c - LEFT JOIN collection_descriptor_set ds ON ds.collection_key = c.key AND ds.deleted IS NULL - LEFT JOIN collection_descriptor d ON d.collection_descriptor_set_key = ds.key + LEFT JOIN collection_descriptor_group ds ON ds.collection_key = c.key AND ds.deleted IS NULL + LEFT JOIN collection_descriptor d ON d.collection_descriptor_group_key = ds.key @@ -324,8 +324,8 @@ ) AS c - LEFT JOIN collection_descriptor_set ds ON ds.collection_key = c.key AND ds.deleted IS NULL - LEFT JOIN collection_descriptor d ON d.collection_descriptor_set_key = ds.key + LEFT JOIN collection_descriptor_group ds ON ds.collection_key = c.key AND ds.deleted IS NULL + LEFT JOIN collection_descriptor d ON d.collection_descriptor_group_key = ds.key @@ -336,8 +336,8 @@ SELECT count(DISTINCT c.key) FROM collection c - LEFT JOIN collection_descriptor_set ds ON ds.collection_key = c.key AND ds.deleted IS NULL - LEFT JOIN collection_descriptor d ON d.collection_descriptor_set_key = ds.key + LEFT JOIN collection_descriptor_group ds ON ds.collection_key = c.key AND ds.deleted IS NULL + LEFT JOIN collection_descriptor d ON d.collection_descriptor_group_key = ds.key diff --git a/registry-persistence/src/main/resources/org/gbif/registry/persistence/mapper/collections/DescriptorsMapper.xml b/registry-persistence/src/main/resources/org/gbif/registry/persistence/mapper/collections/DescriptorsMapper.xml index c9398a3ae..3c4f7bc36 100644 --- a/registry-persistence/src/main/resources/org/gbif/registry/persistence/mapper/collections/DescriptorsMapper.xml +++ b/registry-persistence/src/main/resources/org/gbif/registry/persistence/mapper/collections/DescriptorsMapper.xml @@ -2,20 +2,20 @@ - + - + title, description, collection_key, created, created_by, modified, modified_by - + ds.key, ds.title, ds.description, ds.collection_key, ds.created, ds.created_by, ds.modified, ds.modified_by, ds.deleted - + #{title,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, #{collectionKey,jdbcType=OTHER}, @@ -25,7 +25,7 @@ #{modifiedBy,jdbcType=VARCHAR} - + title = #{title,jdbcType=VARCHAR}, description = #{description,jdbcType=VARCHAR}, modified_by = #{modifiedBy,jdbcType=VARCHAR}, @@ -39,50 +39,50 @@ AS query ON query @@ fulltext_search - - INSERT INTO collection_descriptor_set() - VALUES() + + INSERT INTO collection_descriptor_group() + VALUES() - - UPDATE collection_descriptor_set + + UPDATE collection_descriptor_group SET - + WHERE key = #{key,jdbcType=OTHER} - - UPDATE collection_descriptor_set + + UPDATE collection_descriptor_group SET deleted = now() WHERE key = #{key,jdbcType=OTHER} AND deleted IS NULL - SELECT - - FROM collection_descriptor_set ds + + FROM collection_descriptor_group ds WHERE ds.key = #{key,jdbcType=OTHER} - SELECT DISTINCT ON( ts_rank_cd(ds.fulltext_search, query), ds.created, ds.key) - , ds.fulltext_search - + , ds.fulltext_search + ORDER BY ts_rank_cd(ds.fulltext_search, query) DESC,ds.created DESC, ds.key LIMIT #{params.page.limit} OFFSET #{params.page.offset} - SELECT COUNT(DISTINCT ds.key) - + - - FROM collection_descriptor_set ds + + FROM collection_descriptor_group ds @@ -120,19 +120,19 @@ - collection_descriptor_set_key, usage_key, usage_name, usage_rank, taxon_classification, taxon_keys, country, + collection_descriptor_group_key, usage_key, usage_name, usage_rank, taxon_classification, taxon_keys, country, individual_count, identified_by, date_identified, type_status, recorded_by, discipline, object_classification_name, issues - d.key, d.collection_descriptor_set_key, d.usage_key, d.usage_name, d.usage_rank, d.taxon_classification, d.country, + d.key, d.collection_descriptor_group_key, d.usage_key, d.usage_name, d.usage_rank, d.taxon_classification, d.country, d.individual_count, d.identified_by, d.date_identified, d.type_status, d.recorded_by, d.discipline, d.object_classification_name, d.issues - #{descriptorSetKey,jdbcType=INTEGER}, + #{descriptorGroupKey,jdbcType=INTEGER}, #{usageKey,jdbcType=INTEGER}, #{usageName,jdbcType=VARCHAR}, #{usageRank,jdbcType=VARCHAR}, @@ -156,7 +156,7 @@ DELETE FROM collection_descriptor - WHERE collection_descriptor_set_key = #{descriptorSetKey,jdbcType=INTEGER} + WHERE collection_descriptor_group_key = #{descriptorGroupKey,jdbcType=INTEGER}