update query builder search function

Mehedihasan444 · Sep 10, 2024 · 0a3f676 · 0a3f676
1 parent 433a9bd
commit 0a3f676
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 1 deletion.
diff --git a/dist/app/builder/QueryBuilder.js b/dist/app/builder/QueryBuilder.js
@@ -5,15 +5,37 @@ class QueryBuilder {
         this.modelQuery = modelQuery;
         this.query = query;
     }
+    // search(searchableFields: string[]) {
+    //   const searchTerm = [this?.query?.searchTerm];
+    //   console.log(searchTerm)
+    //   if (searchTerm) {
+    //     this.modelQuery = this.modelQuery.find({
+    //       $or: searchableFields.map(
+    //         (field) =>
+    //           ({
+    //             [field]: { $regex: searchTerm, $options: "i" },
+    //           } as FilterQuery<T>)
+    //       ),
+    //     });
+    //   }
+    //   return this;
+    // }
     search(searchableFields) {
         var _a;
         const searchTerm = (_a = this === null || this === void 0 ? void 0 : this.query) === null || _a === void 0 ? void 0 : _a.searchTerm;
         if (searchTerm) {
+            // Split the comma-separated string into an array of features
+            const featureArray = typeof searchTerm === 'string' ? searchTerm.split(',').map(f => f.trim()) : [];
             this.modelQuery = this.modelQuery.find({
                 $or: searchableFields.map((field) => ({
                     [field]: { $regex: searchTerm, $options: "i" },
                 })),
             });
+            if (featureArray && featureArray.length > 0) {
+                this.modelQuery = this.modelQuery.find({
+                    features: { $in: featureArray }, // Matches cars with any of the selected features
+                });
+            }
         }
         return this;
     }

diff --git a/src/app/builder/QueryBuilder.ts b/src/app/builder/QueryBuilder.ts
@@ -9,9 +9,29 @@ class QueryBuilder<T> {
     this.query = query;
   }
 
+  // search(searchableFields: string[]) {
+  //   const searchTerm = [this?.query?.searchTerm];
+  //   console.log(searchTerm)
+  //   if (searchTerm) {
+  //     this.modelQuery = this.modelQuery.find({
+  //       $or: searchableFields.map(
+  //         (field) =>
+  //           ({
+  //             [field]: { $regex: searchTerm, $options: "i" },
+  //           } as FilterQuery<T>)
+  //       ),
+  //     });
+  //   }
+
+  //   return this;
+  // }
   search(searchableFields: string[]) {
     const searchTerm = this?.query?.searchTerm;
+
+
     if (searchTerm) {
+      // Split the comma-separated string into an array of features
+      const featureArray = typeof searchTerm === 'string' ? searchTerm.split(',').map(f => f.trim()) : [];
       this.modelQuery = this.modelQuery.find({
         $or: searchableFields.map(
           (field) =>
@@ -20,10 +40,18 @@ class QueryBuilder<T> {
             } as FilterQuery<T>)
         ),
       });
+      if (featureArray && featureArray.length > 0) {
+        this.modelQuery = this.modelQuery.find({
+          features: { $in: featureArray }, // Matches cars with any of the selected features
+        });
+      }
     }
-
+
+
     return this;
   }
+
+
 
   filter() {
     const queryObj = { ...this.query };