feat: added text index to text_message (searches both subject and err…

…or message now)
forwardemail · Jul 17, 2023 · ee1e4f9 · ee1e4f9
1 parent fa8b697
commit ee1e4f9
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 11 deletions.
diff --git a/app/controllers/web/my-account/list-logs.js b/app/controllers/web/my-account/list-logs.js
@@ -252,9 +252,18 @@ async function listLogs(ctx) {
             }
           },
           {
-            subject: {
-              $regex: new RegExp(regexParser(_.escapeRegExp(subject)), 'i')
-            }
+            $or: [
+              {
+                subject: {
+                  $regex: new RegExp(regexParser(_.escapeRegExp(subject)), 'i')
+                }
+              },
+              {
+                text_message: {
+                  $regex: new RegExp(regexParser(_.escapeRegExp(subject)), 'i')
+                }
+              }
+            ]
           }
         ]
       };
@@ -266,9 +275,18 @@ async function listLogs(ctx) {
           }
         },
         {
-          subject: {
-            $regex: new RegExp(regexParser(_.escapeRegExp(subject)), 'i')
-          }
+          $or: [
+            {
+              subject: {
+                $regex: new RegExp(regexParser(_.escapeRegExp(subject)), 'i')
+              }
+            },
+            {
+              text_message: {
+                $regex: new RegExp(regexParser(_.escapeRegExp(subject)), 'i')
+              }
+            }
+          ]
         }
       );
     } else {
@@ -281,9 +299,18 @@ async function listLogs(ctx) {
             }
           },
           {
-            subject: {
-              $regex: new RegExp(regexParser(_.escapeRegExp(subject)), 'i')
-            }
+            $or: [
+              {
+                subject: {
+                  $regex: new RegExp(regexParser(_.escapeRegExp(subject)), 'i')
+                }
+              },
+              {
+                text_message: {
+                  $regex: new RegExp(regexParser(_.escapeRegExp(subject)), 'i')
+                }
+              }
+            ]
           }
         ]
       };

diff --git a/app/models/logs.js b/app/models/logs.js
@@ -234,8 +234,11 @@ Logs.index({ keywords: 1 });
 //       (note that we'd have to feed the search query the search parsed tokens from ctx.query)
 //       (but at that point we might want to simply do another hash query lookup by tokens parsed)
 //
-// subject is a text index combined with regex query for accuracy in my account > logs
-Logs.index({ subject: 'text' }, { default_language: 'english' });
+// multiple text index combined with regex query for accuracy in my account > logs
+Logs.index(
+  { subject: 'text', text_message: 'text' },
+  { default_language: 'english' }
+);
 
 //
 // create sparse (now known as "partial" indices) on common log queries