Merge pull request #5056 from Countly/feedback-email

kanwarujjaval · web-flow · commit 09ba36ee0b16 · 2024-04-05T11:28:14.000+05:30
[SER-1144] [star-rating] Enable email search for feedback
diff --git a/plugins/star-rating/api/api.js b/plugins/star-rating/api/api.js
@@ -1041,7 +1041,10 @@ function uploadFile(myfile, id, callback) {
             query.device_id = params.qstring.device_id;
         }
         if (params.qstring.sSearch && params.qstring.sSearch !== "") {
-            query.comment = {"$regex": new RegExp(".*" + params.qstring.sSearch + ".*", 'i')};
+            query.$or = [
+                { comment: {$regex: new RegExp(`.*${params.qstring.sSearch}.*`, 'i')} },
+                { email: {$regex: new RegExp(`.*${params.qstring.sSearch}.*`, 'i')} },
+            ];
         }
         if (params.qstring.iSortCol_0) {
             try {

Original file line number	Diff line number	Diff line change
`@@ -1041,7 +1041,10 @@ function uploadFile(myfile, id, callback) {`
`1041`	`1041`	`query.device_id = params.qstring.device_id;`
`1042`	`1042`	`}`
`1043`	`1043`	`if (params.qstring.sSearch && params.qstring.sSearch !== "") {`
`1044`		`- query.comment = {"$regex": new RegExp("." + params.qstring.sSearch + ".", 'i')};`
	`1044`	`+ query.$or = [`
	`1045`	+ { comment: {$regex: new RegExp(`.${params.qstring.sSearch}.`, 'i')} },
	`1046`	+ { email: {$regex: new RegExp(`.${params.qstring.sSearch}.`, 'i')} },
	`1047`	`+ ];`
`1045`	`1048`	`}`
`1046`	`1049`	`if (params.qstring.iSortCol_0) {`
`1047`	`1050`	`try {`