feat(search): make searchTerm in various places diacritic insensitive

kfc35 · kfc35 · commit 87320e711cc3 · 2026-04-08T10:31:20.000-04:00
diff --git a/server/graphql/v2/interface/Account.ts b/server/graphql/v2/interface/Account.ts
@@ -627,7 +627,7 @@ const accountFieldsDefinition = () => ({
       const searchTermConditions = buildSearchConditions(searchTerm, {
         idFields: ['id'],
         slugFields: ['$fromCollective.slug$'],
-        textFields: ['$fromCollective.name$', 'title', 'html'],
+        textFields: ['$fromCollective.name$', 'Update.title', 'Update.html'],
         publicIdFields: [
           { field: 'publicId', prefix: EntityShortIdPrefix.Update },
           { field: '$fromCollective.publicId$', prefix: EntityShortIdPrefix.Collective },
diff --git a/server/graphql/v2/interface/IsMemberOf.js b/server/graphql/v2/interface/IsMemberOf.js
@@ -147,7 +147,7 @@ export const IsMemberOfFields = {
       const searchTermConditions = buildSearchConditions(args.searchTerm, {
         idFields: ['id', '$collective.id$'],
         slugFields: ['$collective.slug$'],
-        textFields: ['$collective.name$', '$collective.description$', 'description', 'role'],
+        textFields: ['$collective.name$', '$collective.description$', 'Member.description', 'Member.role'],
         stringArrayFields: ['$collective.tags$'],
         stringArrayTransformFn: str => str.toLowerCase(), // collective tags are stored lowercase
         castStringArraysToVarchar: true,
diff --git a/server/graphql/v2/object/Host.ts b/server/graphql/v2/object/Host.ts
@@ -33,6 +33,7 @@ import { getPolicy } from '../../../lib/policies';
 import SQLQueries from '../../../lib/queries';
 import sequelize from '../../../lib/sequelize';
 import { buildKyselySearchConditions, buildSearchConditions } from '../../../lib/sql-search';
+import { removeDiacritics } from '../../../lib/string-utils';
 import { getHostReportNodesFromQueryResult } from '../../../lib/transaction-reports';
 import { ifStr, parseToBoolean } from '../../../lib/utils';
 import models, { Collective, ConnectedAccount, Op, TransactionsImportRow } from '../../../models';
@@ -1005,7 +1006,10 @@ export const GraphQLHost = new GraphQLObjectType({
           const hasExpenseToDate = !isNil(args.withExpensesDateTo);
           const hasExpensePeriodFilter = hasExpenseFromDate || hasExpenseToDate;
           const hasSearchTerm = !isNil(args.searchTerm) && args.searchTerm.length !== 0;
-          const searchTerm = `%${args.searchTerm}%`;
+          const searchTerm =
+            hasSearchTerm && typeof args.searchTerm === 'string'
+              ? `%${removeDiacritics(args.searchTerm)}%`
+              : `%${args.searchTerm}%`;
 
           const baseQuery = `
             SELECT
@@ -1079,8 +1083,8 @@ export const GraphQLHost = new GraphQLObjectType({
               ${ifStr(
                 hasSearchTerm,
                 `AND (
-                vc.name ILIKE :searchTerm
-                OR vc.data#>>'{last4}' ILIKE :searchTerm
+                unaccent(vc.name) ILIKE :searchTerm
+                OR unaccent(vc.data#>>'{last4}') ILIKE :searchTerm
               )`,
               )}
           `;
@@ -2338,7 +2342,7 @@ export const GraphQLHost = new GraphQLObjectType({
           if (args.searchTerm) {
             where.push({
               [Op.or]: buildSearchConditions(args.searchTerm, {
-                textFields: ['description', 'sourceId'],
+                textFields: ['TransactionsImportRow.description', 'TransactionsImportRow.sourceId'],
                 publicIdFields: [{ field: 'publicId', prefix: EntityShortIdPrefix.TransactionsImportRow }],
               }),
             });
diff --git a/server/graphql/v2/query/collection/CommunityQuery.ts b/server/graphql/v2/query/collection/CommunityQuery.ts
@@ -6,6 +6,7 @@ import { isNil } from 'lodash';
 import { QueryTypes, Sequelize } from 'sequelize';
 
 import { parseSearchTerm, sanitizeSearchTermForILike } from '../../../../lib/sql-search';
+import { removeDiacritics } from '../../../../lib/string-utils';
 import { ifStr } from '../../../../lib/utils';
 import { Collective, sequelize } from '../../../../models';
 import { allowContextPermission, PERMISSION_TYPE } from '../../../common/context-permissions';
@@ -59,10 +60,10 @@ const buildSearchConditions = (
       replacements: { searchTerm: parsed.term },
     };
   } else {
-    const sanitizedTerm = sanitizeSearchTermForILike(parsed.term);
+    const sanitizedTerm = sanitizeSearchTermForILike(removeDiacritics(parsed.term));
     return {
       joinClause: `LEFT JOIN "Users" u ON u."CollectiveId" = fc.id AND u."deletedAt" IS NULL`,
-      whereClause: `AND (fc."name" ILIKE :searchTermPattern OR fc.slug ILIKE :searchTermPattern OR u."email" ILIKE :searchTermPattern)`,
+      whereClause: `AND (unaccent(fc."name") ILIKE :searchTermPattern OR unaccent(fc.slug) ILIKE :searchTermPattern OR unaccent(u."email") ILIKE :searchTermPattern)`,
       replacements: { searchTermPattern: `%${sanitizedTerm}%` },
     };
   }
diff --git a/server/graphql/v2/query/collection/ExpensesCollectionQuery.ts b/server/graphql/v2/query/collection/ExpensesCollectionQuery.ts
@@ -482,7 +482,7 @@ export const ExpensesCollectionQueryResolver = async (
     idFields: ['id'],
     dataFields: ['data.transactionId', 'data.transfer.id', 'data.transaction_id', 'data.batchGroup.id', 'reference'],
     slugFields: ['$fromCollective.slug$', '$collective.slug$', '$User.collective.slug$'],
-    textFields: ['$fromCollective.name$', '$collective.name$', '$User.collective.name$', 'description'],
+    textFields: ['$fromCollective.name$', '$collective.name$', '$User.collective.name$', 'Expense.description'],
     emailFields: isHostAdmin ? ['$User.email$'] : [],
     amountFields: ['amount'],
     stringArrayFields: ['tags'],
diff --git a/server/graphql/v2/query/collection/OrdersCollectionQuery.ts b/server/graphql/v2/query/collection/OrdersCollectionQuery.ts
@@ -17,6 +17,7 @@ import { TransactionKind } from '../../../../constants/transaction-kind';
 import { DatabaseWithViews, getKysely, kyselyToSequelizeModels } from '../../../../lib/kysely';
 import { EntityShortIdPrefix, isEntityPublicId } from '../../../../lib/permalink/entity-map';
 import { buildSearchConditions } from '../../../../lib/sql-search';
+import { removeDiacritics } from '../../../../lib/string-utils';
 import models, { Collective, ManualPaymentProvider, Op, PaymentMethod, Tier, User } from '../../../../models';
 import { checkScope } from '../../../common/scope-check';
 import { Forbidden, NotFound, Unauthorized } from '../../../errors';
@@ -521,7 +522,7 @@ export const OrdersCollectionResolver = async (args: OrdersCollectionArgsType, r
           .select('Orders.id')
           .where('Orders.deletedAt', 'is', null)
           .$if(!!args.searchTerm, qb => {
-            return qb.where(({ or, eb }) => {
+            return qb.where(({ fn, or, eb }) => {
               if (isFinite(Number(args.searchTerm)) && isInteger(Number(args.searchTerm))) {
                 ors.push(eb('Orders.id', '=', Number(args.searchTerm)));
               }
@@ -535,9 +536,17 @@ export const OrdersCollectionResolver = async (args: OrdersCollectionArgsType, r
                 ors.push(eb('Orders.FromCollectiveId', '=', collectiveBySearchTerm.id));
               }
 
-              ors.push(eb('Orders.description', 'ilike', `%${args.searchTerm}%`));
+              const searchTermNoDiacrits =
+                typeof args.searchTerm === 'string' ? removeDiacritics(args.searchTerm) : args.searchTerm;
+              ors.push(eb(fn<string>('unaccent', ['Orders.description']), 'ilike', `%${searchTermNoDiacrits}%`));
               ors.push(eb(sql`"Orders".data->>'ponumber'`, 'ilike', `%${args.searchTerm}%`));
-              ors.push(eb(sql`"Orders".data#>>'{fromAccountInfo,name}'`, 'ilike', `%${args.searchTerm}%`));
+              ors.push(
+                eb(
+                  fn<string>('unaccent', [sql`"Orders".data#>>'{fromAccountInfo,name}'`]),
+                  'ilike',
+                  `%${searchTermNoDiacrits}%`,
+                ),
+              );
               ors.push(eb(sql`"Orders".data#>>'{fromAccountInfo,email}'`, 'ilike', `%${args.searchTerm}%`));
               ors.push(
                 eb('Orders.tags', '&&', sql<string[]>`ARRAY[${args.searchTerm.toLocaleLowerCase()}]::varchar[]`),
@@ -915,8 +924,8 @@ export const OrdersCollectionResolver = async (args: OrdersCollectionArgsType, r
       const { limit = 10, offset = 0, searchTerm } = subArgs;
 
       const searchConditions = buildSearchConditions(searchTerm, {
-        slugFields: ['slug'],
-        textFields: ['name'],
+        slugFields: ['Collective.slug'],
+        textFields: ['Collective.name'],
         publicIdFields: [{ field: 'publicId', prefix: EntityShortIdPrefix.Collective }],
       });
 
diff --git a/server/graphql/v2/query/collection/TransactionsCollectionQuery.ts b/server/graphql/v2/query/collection/TransactionsCollectionQuery.ts
@@ -423,7 +423,7 @@ export const TransactionsCollectionResolver = async (
   const searchTermConditions = buildSearchConditions(args.searchTerm, {
     idFields: ['id', 'ExpenseId', 'OrderId'],
     slugFields: ['$fromCollective.slug$', '$collective.slug$'],
-    textFields: ['$fromCollective.name$', '$collective.name$', 'description'],
+    textFields: ['$fromCollective.name$', '$collective.name$', 'Transaction.description'],
     amountFields: ['amount'],
     publicIdFields: [
       { field: 'publicId', prefix: EntityShortIdPrefix.Transaction },
diff --git a/server/lib/sql-search.ts b/server/lib/sql-search.ts
@@ -629,9 +629,21 @@ export const buildSearchConditions = (
   }
   // Conditions for text fields
   const strTerm = parsedTerm.term.toString(); // Some terms are returned as numbers
-  const iLikeQuery = `%${sanitizeSearchTermForILike(strTerm)}%`;
+  const iLikeQuery = `%${sanitizeSearchTermForILike(removeDiacritics(strTerm))}%`;
   const allTextFields = [...(slugFields || []), ...(textFields || [])];
-  allTextFields.forEach(field => conditions.push({ [field]: { [Op.iLike]: iLikeQuery } }));
+  allTextFields.forEach(field => {
+    let fieldToQuery = field;
+    // For slug fields that may be defined for an associated table,
+    // strip the $ so that the field name can work with sequelize.col
+    if (fieldToQuery.startsWith('$') && fieldToQuery.endsWith('$')) {
+      fieldToQuery = fieldToQuery.slice(1, fieldToQuery.length - 1);
+    }
+    conditions.push(
+      sequelize.where(sequelize.fn('unaccent', sequelize.col(fieldToQuery)), {
+        [Op.iLike]: iLikeQuery,
+      }),
+    );
+  });
 
   // Conditions for string array (usually tags lists)
   if (stringArrayFields?.length) {
@@ -719,10 +731,12 @@ export const buildKyselySearchConditions =
 
     // Conditions for text fields
     const strTerm = parsedTerm.term.toString(); // Some terms are returned as numbers
-    const iLikeQuery = `%${sanitizeSearchTermForILike(strTerm)}%`;
+    const iLikeQuery = `%${sanitizeSearchTermForILike(removeDiacritics(strTerm))}%`;
     const allTextFields = [...(slugFields || []), ...(textFields || [])];
 
-    q = q.where(({ eb, or }) => or(allTextFields.map(field => eb(field, 'ilike', iLikeQuery))));
+    q = q.where(({ fn, eb, or }) =>
+      or(allTextFields.map(field => eb(fn<string>('unaccent', [field]), 'ilike', iLikeQuery))),
+    );
     return q;
   };
 
diff --git a/test/server/graphql/v2/collection/OrdersCollectionQuery.test.ts b/test/server/graphql/v2/collection/OrdersCollectionQuery.test.ts
@@ -937,7 +937,7 @@ describe('server/graphql/v2/collection/OrdersCollectionQuery', () => {
       collective = await fakeCollective();
 
       // Create users with specific names for search testing
-      user1 = await fakeUser(null, { name: 'Alice Anderson' });
+      user1 = await fakeUser(null, { name: 'Alicé Anderson' });
       user2 = await fakeUser(null, { name: 'Bob Builder' });
 
       // Create orders by different users
@@ -960,7 +960,7 @@ describe('server/graphql/v2/collection/OrdersCollectionQuery', () => {
       const result = await graphqlQueryV2(ordersQuery, {
         account: { legacyId: collective.id },
         filter: 'INCOMING',
-        searchTerm: 'Alice',
+        searchTerm: 'Alice', // should be diacritic insensitive
       });
 
       expect(result.errors).to.not.exist;
diff --git a/test/server/lib/search.test.js b/test/server/lib/search.test.js
