using proposerEmail in the list method

gbif · May 20, 2021 · d3e63ab · d3e63ab
1 parent f502292
commit d3e63ab
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/.../java/org/gbif/registry/ws/it/collections/resource/PrimaryCollectionEntityResourceIT.java b/.../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<R> result =
         getPrimaryCollectionEntityClient()
-            .listChangeSuggestion(status, type, country, proposedBy, entityKey, page);
+            .listChangeSuggestion(status, type, country, proposerEmail, entityKey, page);
     assertEquals(1, result.getResults().size());
   }
 

diff --git a/...rc/main/java/org/gbif/registry/persistence/mapper/collections/ChangeSuggestionMapper.java b/...rc/main/java/org/gbif/registry/persistence/mapper/collections/ChangeSuggestionMapper.java
@@ -27,7 +27,7 @@ List<ChangeSuggestionDto> 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/...ain/resources/org/gbif/registry/persistence/mapper/collections/ChangeSuggestionMapper.xml b/...ain/resources/org/gbif/registry/persistence/mapper/collections/ChangeSuggestionMapper.xml
@@ -84,8 +84,8 @@
       <if test="country != null">
         AND cs.country = #{country,jdbcType=VARCHAR}
       </if>
-      <if test="proposer != null">
-        AND cs.proposed_by = #{proposer,jdbcType=OTHER}
+      <if test="proposerEmail != null">
+        AND cs.proposer_email = #{proposerEmail,jdbcType=OTHER}
       </if>
       <if test="entityKey != null">
         AND cs.entity_key = #{entityKey,jdbcType=OTHER}
@@ -113,8 +113,8 @@
       <if test="country != null">
         AND cs.country = #{country,jdbcType=VARCHAR}
       </if>
-      <if test="proposer != null">
-        AND cs.proposed_by = #{proposer,jdbcType=OTHER}
+      <if test="proposerEmail != null">
+        AND cs.proposer_email = #{proposerEmail,jdbcType=OTHER}
       </if>
       <if test="entityKey != null">
         AND cs.entity_key = #{entityKey,jdbcType=OTHER}

diff --git a/...n/java/org/gbif/registry/service/collections/suggestions/BaseChangeSuggestionService.java b/...n/java/org/gbif/registry/service/collections/suggestions/BaseChangeSuggestionService.java
@@ -300,7 +300,7 @@ public PagingResponse<R> 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<R> list(
             type,
             collectionEntityType,
             country,
-            newEmptyChangeSuggestion().getProposedBy(),
+            proposerEmail,
             entityKey,
             page);
 
@@ -321,7 +321,7 @@ public PagingResponse<R> list(
             type,
             collectionEntityType,
             country,
-            newEmptyChangeSuggestion().getProposedBy(),
+            proposerEmail,
             entityKey);
 
     List<R> changeSuggestions =

diff --git a/.../src/main/java/org/gbif/registry/ws/client/collections/PrimaryCollectionEntityClient.java b/.../src/main/java/org/gbif/registry/ws/client/collections/PrimaryCollectionEntityClient.java
@@ -128,7 +128,7 @@ PagingResponse<R> 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/...main/java/org/gbif/registry/ws/resources/collections/PrimaryCollectionEntityResource.java b/...main/java/org/gbif/registry/ws/resources/collections/PrimaryCollectionEntityResource.java
@@ -187,10 +187,10 @@ public PagingResponse<R> 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")