From 82883e5d3317fd0d3c4309d52d3c5a21dd3206b5 Mon Sep 17 00:00:00 2001
From: Marcos Lopez Gonzalez <marcoslg@gmail.com>
Date: Mon, 18 Sep 2023 15:56:05 +0200
Subject: [PATCH] #523 fixed OR queries in collections searches

---
 .../collections/service/CollectionServiceIT.java | 16 ++--------------
 .../service/InstitutionServiceIT.java            |  6 +++---
 .../mapper/collections/CollectionMapper.xml      |  4 ++--
 .../mapper/collections/InstitutionMapper.xml     |  2 +-
 4 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/service/CollectionServiceIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/service/CollectionServiceIT.java
index 321fff7f6..1a5fe417f 100644
--- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/service/CollectionServiceIT.java
+++ b/registry-integration-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/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/service/InstitutionServiceIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/service/InstitutionServiceIT.java
index 6dbbee467..14eea7996 100644
--- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/service/InstitutionServiceIT.java
+++ b/registry-integration-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/registry-persistence/src/main/resources/org/gbif/registry/persistence/mapper/collections/CollectionMapper.xml b/registry-persistence/src/main/resources/org/gbif/registry/persistence/mapper/collections/CollectionMapper.xml
index 1d9964d74..4addff30d 100644
--- a/registry-persistence/src/main/resources/org/gbif/registry/persistence/mapper/collections/CollectionMapper.xml
+++ b/registry-persistence/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/registry-persistence/src/main/resources/org/gbif/registry/persistence/mapper/collections/InstitutionMapper.xml b/registry-persistence/src/main/resources/org/gbif/registry/persistence/mapper/collections/InstitutionMapper.xml
index 479ed786e..b46534e94 100644
--- a/registry-persistence/src/main/resources/org/gbif/registry/persistence/mapper/collections/InstitutionMapper.xml
+++ b/registry-persistence/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>