Merge pull request #561 from NteinPrecious/feat/upgrade-asset-search-to-use-postgresql-full-text-search

feat: upgrade asset search to use multi-column ILIKE with relevance o…

Author: yusuftomilola

backend/src/assets/assets.service.ts

@@ -61,8 +61,20 @@ export class AssetsService {
       .leftJoinAndSelect('asset.updatedBy', 'updatedBy');
 
     if (search) {
+      // Multi-column ILIKE search — covers name, assetId, serialNumber, location, notes,
+      // category.name, department.name (case-insensitive, partial match).
+      //
+      // GIN index recommendations for production (run in a migration):
+      //   CREATE INDEX CONCURRENTLY idx_assets_name_gin ON assets USING gin(to_tsvector('english', name));
+      //   CREATE INDEX CONCURRENTLY idx_assets_serial_gin ON assets USING gin(to_tsvector('english', coalesce("serialNumber", '')));
       qb.andWhere(
-        '(asset.name ILIKE :search OR asset.assetId ILIKE :search OR asset.serialNumber ILIKE :search OR asset.manufacturer ILIKE :search OR asset.model ILIKE :search)',
+        `(asset.name ILIKE :search
+         OR asset.assetId ILIKE :search
+         OR asset.serialNumber ILIKE :search
+         OR asset.location ILIKE :search
+         OR asset.notes ILIKE :search
+         OR category.name ILIKE :search
+         OR department.name ILIKE :search)`,
         { search: `%${search}%` },
       );
     }
@@ -71,7 +83,14 @@ export class AssetsService {
     if (categoryId) qb.andWhere('category.id = :categoryId', { categoryId });
     if (departmentId) qb.andWhere('department.id = :departmentId', { departmentId });
 
-    qb.orderBy('asset.createdAt', 'DESC')
+    // Order by relevance (exact name match first) when searching; otherwise by creation date
+    if (search) {
+      qb.orderBy(`CASE WHEN asset.name ILIKE :exactSearch THEN 0 ELSE 1 END`, 'ASC', 'NULLS LAST')
+        .addOrderBy('asset.createdAt', 'DESC');
+      qb.setParameter('exactSearch', search);
+    } else {
+      qb.orderBy('asset.createdAt', 'DESC');
+    }
       .skip((page - 1) * limit)
       .take(limit);