products filter departments and search

Andrei Alexandru · Andrei Alexandru · commit bd3a7c65b6f1 · 2018-08-28T10:46:07.000+03:00
diff --git a/nodejs-restful-api/controllers/ProductController.js b/nodejs-restful-api/controllers/ProductController.js
@@ -22,11 +22,11 @@ router.get('/', (req, res) => {
     let departments = req.query.departments;
 
     if(departments && departments.length > 0){
-      condition={ $and: [ condition, {departments: {$in: departments}}]};
+      condition={$and: [condition, {departments: {$in: departments}}]};
     }
 
     if(search) {
-      condition = { name: { $regex: search, $options: 'i' } }
+      condition = {$and: [condition, {name: { $regex: search, $options: 'i' }}]};
     }
 
   Product.find(condition, (err, products) => {

Original file line number	Diff line number	Diff line change
`@@ -22,11 +22,11 @@ router.get('/', (req, res) => {`
`22`	`22`	`let departments = req.query.departments;`
`23`	`23`
`24`	`24`	`if(departments && departments.length > 0){`
`25`		`- condition={ $and: [ condition, {departments: {$in: departments}}]};`
	`25`	`+ condition={$and: [condition, {departments: {$in: departments}}]};`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`if(search) {`
`29`		`- condition = { name: { $regex: search, $options: 'i' } }`
	`29`	`+ condition = {$and: [condition, {name: { $regex: search, $options: 'i' }}]};`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`Product.find(condition, (err, products) => {`