changed country search grscicoll to use fallback and align it with fa…

…cets
gbif · Oct 30, 2024 · 7d80199 · 7d80199
1 parent b881b1b
commit 7d80199
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/...on-tests/src/test/java/org/gbif/registry/ws/it/persistence/mapper/CollectionMapperIT.java b/...on-tests/src/test/java/org/gbif/registry/ws/it/persistence/mapper/CollectionMapperIT.java
@@ -306,7 +306,7 @@ public void listTest() {
             .page(page)
             .build(),
         0);
-    assertSearch(CollectionListParams.builder().city(asList("Odense")).page(page).build(), 1);
+    assertSearch(CollectionListParams.builder().city(asList("Odense")).page(page).build(), 0);
     assertSearch(
         CollectionListParams.builder()
             .city(asList("Copenhagen"))

diff --git a/...n-tests/src/test/java/org/gbif/registry/ws/it/persistence/mapper/InstitutionMapperIT.java b/...n-tests/src/test/java/org/gbif/registry/ws/it/persistence/mapper/InstitutionMapperIT.java
@@ -263,7 +263,7 @@ public void listTest() {
             .page(page)
             .build(),
         0);
-    assertSearch(InstitutionListParams.builder().city(asList("Odense")).page(page).build(), 1);
+    assertSearch(InstitutionListParams.builder().city(asList("Odense")).page(page).build(), 0);
     assertSearch(
         InstitutionListParams.builder()
             .city(asList("Copenhagen"))

diff --git a/...ersistence/src/main/resources/org/gbif/registry/persistence/mapper/collections/Common.xml b/...ersistence/src/main/resources/org/gbif/registry/persistence/mapper/collections/Common.xml
@@ -143,29 +143,29 @@
       <foreach item="item" collection="params.countries" open="(" separator="," close=")">
         #{item,jdbcType=VARCHAR}
       </foreach>
-      OR mail_addr.country IN
+      OR (addr.country IS NULL AND mail_addr.country IN
       <foreach item="item" collection="params.countries" open="(" separator="," close=")">
         #{item,jdbcType=VARCHAR}
-      </foreach>
+      </foreach>)
       )
     </if>
     <if test="params.regionCountries != null and params.regionCountries.size > 0">
       AND (addr.country IN
       <foreach item="item" collection="params.regionCountries" open="(" separator="," close=")">
         #{item,jdbcType=VARCHAR}
       </foreach>
-      OR mail_addr.country IN
+      OR (addr.country IS NULL AND mail_addr.country IN
       <foreach item="item" collection="params.regionCountries" open="(" separator="," close=")">
         #{item,jdbcType=VARCHAR}
-      </foreach>
+      </foreach>)
       )
     </if>
     <if test="params.city != null and params.city.size > 0" >
       AND (
       <trim suffixOverrides="OR">
         <foreach item="item" collection="params.city">
           normalize_name(addr.city) = normalize_name(#{item,jdbcType=VARCHAR}) OR
-          normalize_name(mail_addr.city) = normalize_name(#{item,jdbcType=VARCHAR}) OR
+          (addr.city IS NULL AND normalize_name(mail_addr.city) = normalize_name(#{item,jdbcType=VARCHAR})) OR
         </foreach>
       </trim>
       )