fix(server): penalize null geodata fields when searching places (immi…

…ch-app#8408)
Tronix117 · Mar 31, 2024 · 5bc9158 · 5bc9158
1 parent 6a4bc77
commit 5bc9158
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/server/src/queries/search.repository.sql b/server/src/queries/search.repository.sql
@@ -254,15 +254,15 @@ WHERE
   OR f_unaccent ("admin1Name") %>> f_unaccent ($1)
   OR f_unaccent ("alternateNames") %>> f_unaccent ($1)
 ORDER BY
-  COALESCE(f_unaccent (name) <->>> f_unaccent ($1), 0) + COALESCE(
+  COALESCE(f_unaccent (name) <->>> f_unaccent ($1), 0.1) + COALESCE(
     f_unaccent ("admin2Name") <->>> f_unaccent ($1),
-    0
+    0.1
   ) + COALESCE(
     f_unaccent ("admin1Name") <->>> f_unaccent ($1),
-    0
+    0.1
   ) + COALESCE(
     f_unaccent ("alternateNames") <->>> f_unaccent ($1),
-    0
+    0.1
   ) ASC
 LIMIT
   20

diff --git a/server/src/repositories/search.repository.ts b/server/src/repositories/search.repository.ts
@@ -214,10 +214,10 @@ export class SearchRepository implements ISearchRepository {
       .orWhere(`f_unaccent("alternateNames") %>> f_unaccent(:placeName)`)
       .orderBy(
         `
-        COALESCE(f_unaccent(name) <->>> f_unaccent(:placeName), 0) +
-        COALESCE(f_unaccent("admin2Name") <->>> f_unaccent(:placeName), 0) +
-        COALESCE(f_unaccent("admin1Name") <->>> f_unaccent(:placeName), 0) +
-        COALESCE(f_unaccent("alternateNames") <->>> f_unaccent(:placeName), 0)
+        COALESCE(f_unaccent(name) <->>> f_unaccent(:placeName), 0.1) +
+        COALESCE(f_unaccent("admin2Name") <->>> f_unaccent(:placeName), 0.1) +
+        COALESCE(f_unaccent("admin1Name") <->>> f_unaccent(:placeName), 0.1) +
+        COALESCE(f_unaccent("alternateNames") <->>> f_unaccent(:placeName), 0.1)
         `,
       )
       .setParameters({ placeName })