chore: more fuzzy search improvements (#1312)

* chore: more fuzzy search improvements

* test: update backend test

Author: Marcel Mueller

public/backend/src/recreation-resource/utils/buildSearchFilterQuery.spec.ts

@@ -18,7 +18,7 @@ describe('buildSearchFilterQuery', () => {
     const result = buildSearchFilterQuery({ searchText: 'site' });
     const queryString = getQueryString(result);
     expect(queryString).toBe(
-      'where display_on_public_site is true and ( name ilike ? or closest_community ilike ? or similarity(name, ?) > 0.3 or similarity(closest_community, ?) > 0.3 or name % ? or closest_community % ? )',
+      'where display_on_public_site is true and ( name ilike ? or closest_community ilike ? or similarity(name, ?) > 0.3 or similarity(closest_community, ?) > 0.3 or name % ? or closest_community % ? or (length(?) >= 4 and similarity(name, ?) > 0.2) or (length(?) >= 4 and similarity(closest_community, ?) > 0.2) )',
     );
     expect(result.values).toEqual([
       '%site%',
@@ -27,6 +27,10 @@ describe('buildSearchFilterQuery', () => {
       'site',
       'site',
       'site',
+      'site',
+      'site',
+      'site',
+      'site',
     ]);
   });
 
@@ -97,7 +101,7 @@ describe('buildSearchFilterQuery', () => {
 
     const queryString = getQueryString(result);
     expect(queryString).toContain(
-      'where display_on_public_site is true and ( name ilike ? or closest_community ilike ? or similarity(name, ?) > 0.3 or similarity(closest_community, ?) > 0.3 or name % ? or closest_community % ? )',
+      'where display_on_public_site is true and ( name ilike ? or closest_community ilike ? or similarity(name, ?) > 0.3 or similarity(closest_community, ?) > 0.3 or name % ? or closest_community % ? or (length(?) >= 4 and similarity(name, ?) > 0.2) or (length(?) >= 4 and similarity(closest_community, ?) > 0.2) )',
     );
     expect(queryString).toContain('and access_code in');
     expect(queryString).toContain('and district_code in');
@@ -117,6 +121,10 @@ describe('buildSearchFilterQuery', () => {
       'site',
       'site',
       'site',
+      'site',
+      'site',
+      'site',
+      'site',
       'A1',
       'A2',
       'D1',

public/backend/src/recreation-resource/utils/fuzzySearchUtils.ts

@@ -16,6 +16,8 @@ export const buildFuzzySearchConditions = (searchText: string): Prisma.Sql => {
     or similarity(closest_community, ${searchText}) > 0.3
     or name % ${searchText}
     or closest_community % ${searchText}
+    or (length(${searchText}) >= 4 and similarity(name, ${searchText}) > 0.2)
+    or (length(${searchText}) >= 4 and similarity(closest_community, ${searchText}) > 0.2)
   )`;
 };
 
@@ -31,7 +33,9 @@ export const buildFuzzySearchScore = (searchText: string): Prisma.Sql => {
     similarity(name, ${searchText}),
     similarity(closest_community, ${searchText}),
     CASE WHEN name % ${searchText} THEN 0.8 ELSE 0 END,
-    CASE WHEN closest_community % ${searchText} THEN 0.7 ELSE 0 END
+    CASE WHEN closest_community % ${searchText} THEN 0.7 ELSE 0 END,
+    CASE WHEN length(${searchText}) >= 4 AND similarity(name, ${searchText}) > 0.2 THEN similarity(name, ${searchText}) ELSE 0 END,
+    CASE WHEN length(${searchText}) >= 4 AND similarity(closest_community, ${searchText}) > 0.2 THEN similarity(closest_community, ${searchText}) ELSE 0 END
   ) as fuzzy_score`;
 };
 

public/frontend/src/components/recreation-suggestion-form/utils/fuzzySearch.test.ts

@@ -101,6 +101,14 @@ describe('fuzzySearch', () => {
       rank: 12,
       option_type: OPTION_TYPE.CITY,
     },
+    {
+      id: 13,
+      name: 'Duncan',
+      latitude: 48.7781,
+      longitude: -123.7073,
+      rank: 13,
+      option_type: OPTION_TYPE.CITY,
+    },
   ];
 
   describe('fuzzySearchCities', () => {
@@ -173,7 +181,10 @@ describe('fuzzySearch', () => {
       expect(result?.name).toBe(expected);
     });
 
-    it.each([{ query: 'beach', description: 'does not match "Peachland"' }])(
+    it.each([
+      { query: 'beach', description: 'does not match "Peachland"' },
+      { query: 'cabn', description: 'partial single-word query "Duncan"' },
+    ])(
       'should NOT match partial single-word names with $description',
       ({ query }) => {
         const result = fuzzySearchBestCity(mockCities, query);

public/frontend/src/components/recreation-suggestion-form/utils/fuzzySearch.ts

@@ -11,7 +11,7 @@ const CITY_SUGGESTIONS_OPTIONS: IFuseOptions<City> = {
 };
 
 export const BEST_MATCH_CITY_OPTIONS: IFuseOptions<City> = {
-  threshold: 0.3,
+  threshold: 0.25,
   keys: ['name'],
   minMatchCharLength: 3,
   includeScore: true,