From e89646ee7c49eff4fac0bc2662f0ed3133543b71 Mon Sep 17 00:00:00 2001
From: perfectra1n <jonfuller2012@gmail.com>
Date: Wed, 12 Nov 2025 16:49:43 -0800
Subject: [PATCH] fix(quick_search): centralize the repeated exactWordMatch
 function, per Gemini's suggestion

---
 .../expressions/note_content_fulltext.ts      | 26 ++++++++++++-------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/apps/server/src/services/search/expressions/note_content_fulltext.ts b/apps/server/src/services/search/expressions/note_content_fulltext.ts
index 76ea032b5..8a513d99b 100644
--- a/apps/server/src/services/search/expressions/note_content_fulltext.ts
+++ b/apps/server/src/services/search/expressions/note_content_fulltext.ts
@@ -118,10 +118,7 @@ class NoteContentFulltextExp extends Expression {
                     // Single word: look for =word with word boundaries
                     // Split by = to get attribute values, then check each value for exact word match
                     const parts = normalizedFlatText.split('=');
-                    matches = parts.slice(1).some(part => {
-                        const words = part.split(/\s+/);
-                        return words.some(word => word === normalizedPhrase);
-                    });
+                    matches = parts.slice(1).some(part => this.exactWordMatch(normalizedPhrase, part));
                 } else {
                     // Multi-word phrase: check for substring match
                     matches = normalizedFlatText.includes(`=${normalizedPhrase}`);
@@ -136,6 +133,17 @@ class NoteContentFulltextExp extends Expression {
         return resultNoteSet;
     }
 
+    /**
+     * Helper method to check if a single word appears as an exact match in text
+     * @param wordToFind - The word to search for (should be normalized)
+     * @param text - The text to search in (should be normalized)
+     * @returns true if the word is found as an exact match (not substring)
+     */
+    private exactWordMatch(wordToFind: string, text: string): boolean {
+        const words = text.split(/\s+/);
+        return words.some(word => word === wordToFind);
+    }
+
     /**
      * Checks if content contains the exact word (with word boundaries) or exact phrase
      * This is case-insensitive since content and token are already normalized
@@ -151,9 +159,8 @@ class NoteContentFulltextExp extends Expression {
             return normalizedContent.includes(normalizedToken);
         }
 
-        // For single words, split content into words and check for exact match
-        const words = normalizedContent.split(/\s+/);
-        return words.some(word => word === normalizedToken);
+        // For single words, use exact word matching to avoid substring matches
+        return this.exactWordMatch(normalizedToken, normalizedContent);
     }
 
     /**
@@ -170,9 +177,8 @@ class NoteContentFulltextExp extends Expression {
         // For single-word phrases, use word-boundary matching to avoid substring matches
         // e.g., "asd" should not match "asdfasdf"
         if (!phrase.includes(' ')) {
-            // Single word: split into words and check for exact match
-            const words = normalizedContent.split(/\s+/);
-            return words.some(word => word === phrase);
+            // Single word: use exact word matching to avoid substring matches
+            return this.exactWordMatch(phrase, normalizedContent);
         }
 
         // For multi-word phrases, check if the phrase appears as consecutive words