diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/resource/PrimaryCollectionEntityResourceIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/resource/PrimaryCollectionEntityResourceIT.java index c2e0e2132b..ef84736801 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/resource/PrimaryCollectionEntityResourceIT.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/resource/PrimaryCollectionEntityResourceIT.java @@ -256,18 +256,18 @@ public void listChangeSuggestionTest() { Status status = Status.PENDING; Type type = Type.CREATE; Country country = Country.DENMARK; - String proposedBy = "aa@aa.com"; + String proposerEmail = "aa@aa.com"; UUID entityKey = UUID.randomUUID(); Pageable page = new PagingRequest(); - when(getMockChangeSuggestionService().list(status, type, country, proposedBy, entityKey, page)) + when(getMockChangeSuggestionService().list(status, type, country, proposerEmail, entityKey, page)) .thenReturn( new PagingResponse<>( new PagingRequest(), 1L, Collections.singletonList(changeSuggestion))); PagingResponse result = getPrimaryCollectionEntityClient() - .listChangeSuggestion(status, type, country, proposedBy, entityKey, page); + .listChangeSuggestion(status, type, country, proposerEmail, entityKey, page); assertEquals(1, result.getResults().size()); } diff --git a/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/collections/ChangeSuggestionMapper.java b/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/collections/ChangeSuggestionMapper.java index d0ee437735..da853b6c34 100644 --- a/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/collections/ChangeSuggestionMapper.java +++ b/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/collections/ChangeSuggestionMapper.java @@ -27,7 +27,7 @@ List list( @Param("type") Type type, @Param("collectionEntityType") CollectionEntityType collectionEntityType, @Param("country") Country country, - @Param("proposer") String proposer, + @Param("proposerEmail") String proposerEmail, @Param("entityKey") UUID entityKey, @Nullable @Param("page") Pageable page); @@ -36,7 +36,7 @@ long count( @Param("type") Type type, @Param("collectionEntityType") CollectionEntityType collectionEntityType, @Param("country") Country country, - @Param("proposer") String proposer, + @Param("proposerEmail") String proposerEmail, @Param("entityKey") UUID entityKey); void update(ChangeSuggestionDto suggestion); diff --git a/registry-persistence/src/main/resources/org/gbif/registry/persistence/mapper/collections/ChangeSuggestionMapper.xml b/registry-persistence/src/main/resources/org/gbif/registry/persistence/mapper/collections/ChangeSuggestionMapper.xml index a8a05009dd..e22ff3f2f4 100644 --- a/registry-persistence/src/main/resources/org/gbif/registry/persistence/mapper/collections/ChangeSuggestionMapper.xml +++ b/registry-persistence/src/main/resources/org/gbif/registry/persistence/mapper/collections/ChangeSuggestionMapper.xml @@ -84,8 +84,8 @@ AND cs.country = #{country,jdbcType=VARCHAR} - - AND cs.proposed_by = #{proposer,jdbcType=OTHER} + + AND cs.proposer_email = #{proposerEmail,jdbcType=OTHER} AND cs.entity_key = #{entityKey,jdbcType=OTHER} @@ -113,8 +113,8 @@ AND cs.country = #{country,jdbcType=VARCHAR} - - AND cs.proposed_by = #{proposer,jdbcType=OTHER} + + AND cs.proposer_email = #{proposerEmail,jdbcType=OTHER} AND cs.entity_key = #{entityKey,jdbcType=OTHER} diff --git a/registry-service/src/main/java/org/gbif/registry/service/collections/suggestions/BaseChangeSuggestionService.java b/registry-service/src/main/java/org/gbif/registry/service/collections/suggestions/BaseChangeSuggestionService.java index a4a64e8466..ddd1a844f6 100644 --- a/registry-service/src/main/java/org/gbif/registry/service/collections/suggestions/BaseChangeSuggestionService.java +++ b/registry-service/src/main/java/org/gbif/registry/service/collections/suggestions/BaseChangeSuggestionService.java @@ -300,7 +300,7 @@ public PagingResponse list( @Nullable Status status, @Nullable Type type, @Nullable Country country, - @Nullable String proposedBy, + @Nullable String proposerEmail, @Nullable UUID entityKey, @Nullable Pageable pageable) { Pageable page = pageable == null ? new PagingRequest() : pageable; @@ -311,7 +311,7 @@ public PagingResponse list( type, collectionEntityType, country, - newEmptyChangeSuggestion().getProposedBy(), + proposerEmail, entityKey, page); @@ -321,7 +321,7 @@ public PagingResponse list( type, collectionEntityType, country, - newEmptyChangeSuggestion().getProposedBy(), + proposerEmail, entityKey); List changeSuggestions = diff --git a/registry-ws-client/src/main/java/org/gbif/registry/ws/client/collections/PrimaryCollectionEntityClient.java b/registry-ws-client/src/main/java/org/gbif/registry/ws/client/collections/PrimaryCollectionEntityClient.java index 8a25f88789..97c163e049 100644 --- a/registry-ws-client/src/main/java/org/gbif/registry/ws/client/collections/PrimaryCollectionEntityClient.java +++ b/registry-ws-client/src/main/java/org/gbif/registry/ws/client/collections/PrimaryCollectionEntityClient.java @@ -128,7 +128,7 @@ PagingResponse listChangeSuggestion( @RequestParam(value = "status", required = false) Status status, @RequestParam(value = "type", required = false) Type type, @RequestParam(value = "country") Country country, - @RequestParam(value = "proposedBy", required = false) String proposedBy, + @RequestParam(value = "proposerEmail", required = false) String proposerEmail, @RequestParam(value = "entityKey", required = false) UUID entityKey, @SpringQueryMap Pageable page); diff --git a/registry-ws/src/main/java/org/gbif/registry/ws/resources/collections/PrimaryCollectionEntityResource.java b/registry-ws/src/main/java/org/gbif/registry/ws/resources/collections/PrimaryCollectionEntityResource.java index d23be2c5f7..b6023cf442 100644 --- a/registry-ws/src/main/java/org/gbif/registry/ws/resources/collections/PrimaryCollectionEntityResource.java +++ b/registry-ws/src/main/java/org/gbif/registry/ws/resources/collections/PrimaryCollectionEntityResource.java @@ -187,10 +187,10 @@ public PagingResponse listChangeSuggestion( @RequestParam(value = "status", required = false) Status status, @RequestParam(value = "type", required = false) Type type, Country country, - @RequestParam(value = "proposedBy", required = false) String proposedBy, + @RequestParam(value = "proposerEmail", required = false) String proposerEmail, @RequestParam(value = "entityKey", required = false) UUID entityKey, Pageable page) { - return changeSuggestionService.list(status, type, country, proposedBy, entityKey, page); + return changeSuggestionService.list(status, type, country, proposerEmail, entityKey, page); } @PutMapping(value = "changeSuggestion/{key}/discard")