#523 fixed OR queries in collections searches

gbif · Sep 18, 2023 · 82883e5 · 82883e5
1 parent 1a06e90
commit 82883e5
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 20 deletions.
diff --git a/...-tests/src/test/java/org/gbif/registry/ws/it/collections/service/CollectionServiceIT.java b/...-tests/src/test/java/org/gbif/registry/ws/it/collections/service/CollectionServiceIT.java
@@ -270,26 +270,14 @@ public void listTest() {
             .getResults()
             .size());
     assertEquals(
-        1,
+        2,
         collectionService
             .list(
                 CollectionSearchRequest.builder()
                     .contentTypes(
                         Arrays.asList(
                             CollectionContentType.RECORDS_ASSOCIATED_DATA,
-                            CollectionContentType.ARCHAEOLOGICAL_C14))
-                    .page(DEFAULT_PAGE)
-                    .build())
-            .getResults()
-            .size());
-    assertEquals(
-        1,
-        collectionService
-            .list(
-                CollectionSearchRequest.builder()
-                    .preservationTypes(
-                        Arrays.asList(
-                            PreservationType.SAMPLE_DRIED, PreservationType.SAMPLE_CRYOPRESERVED))
+                            CollectionContentType.RECORDS_SEISMOGRAMS))
                     .page(DEFAULT_PAGE)
                     .build())
             .getResults()

diff --git a/...tests/src/test/java/org/gbif/registry/ws/it/collections/service/InstitutionServiceIT.java b/...tests/src/test/java/org/gbif/registry/ws/it/collections/service/InstitutionServiceIT.java
@@ -240,17 +240,17 @@ public void listTest() {
             .getResults()
             .size());
     assertEquals(
-        2,
+        1,
         institutionService
             .list(
                 InstitutionSearchRequest.builder()
-                    .disciplines(Collections.singletonList(Discipline.OCEAN))
+                    .disciplines(Collections.singletonList(Discipline.AGRICULTURAL))
                     .page(DEFAULT_PAGE)
                     .build())
             .getResults()
             .size());
     assertEquals(
-        1,
+        2,
         institutionService
             .list(
                 InstitutionSearchRequest.builder()

diff --git a/.../src/main/resources/org/gbif/registry/persistence/mapper/collections/CollectionMapper.xml b/.../src/main/resources/org/gbif/registry/persistence/mapper/collections/CollectionMapper.xml
@@ -313,13 +313,13 @@
         AND similar_name(c.name, #{params.fuzzyName,jdbcType=VARCHAR})
       </if>
       <if test="params.contentTypes != null and params.contentTypes.size > 0" >
-        AND c.content_type @> ARRAY
+        AND c.content_type &amp;&amp; ARRAY
         <foreach item="item" collection="params.contentTypes" open="[" separator="," close="]">
           #{item,jdbcType=VARCHAR}
         </foreach>
       </if>
       <if test="params.preservationTypes != null and params.preservationTypes.size > 0" >
-        AND c.preservation_type @> ARRAY
+        AND c.preservation_type &amp;&amp; ARRAY
         <foreach item="item" collection="params.preservationTypes" open="[" separator="," close="]">
           #{item,jdbcType=VARCHAR}
         </foreach>

diff --git a/...src/main/resources/org/gbif/registry/persistence/mapper/collections/InstitutionMapper.xml b/...src/main/resources/org/gbif/registry/persistence/mapper/collections/InstitutionMapper.xml
@@ -337,7 +337,7 @@
         AND i.institutional_governance = #{params.institutionalGovernance,jdbcType=OTHER}
       </if>
       <if test="params.disciplines != null and params.disciplines.size > 0" >
-        AND i.discipline @> ARRAY
+        AND i.discipline &amp;&amp; ARRAY
         <foreach item="item" collection="params.disciplines" open="[" separator="," close="]">
           #{item,jdbcType=VARCHAR}
         </foreach>