@cocreate/crud-server 1.11.0 → 1.12.0

package/CHANGELOG.md

@@ -1,3 +1,22 @@
+# [1.12.0](https://github.com/CoCreate-app/CoCreate-crud-server/compare/v1.11.1...v1.12.0) (2022-10-02)
+
+
+### Bug Fixes
+
+* bump dependencies ([702bf69](https://github.com/CoCreate-app/CoCreate-crud-server/commit/702bf6960c6efc9563e923325cc03ba2f1e842df))
+
+
+### Features
+
+* support for operator $contain and $regex ([fb7d4a5](https://github.com/CoCreate-app/CoCreate-crud-server/commit/fb7d4a5508c0ca75100ba40305196ed2b7ea7d6b))
+
+## [1.11.1](https://github.com/CoCreate-app/CoCreate-crud-server/compare/v1.11.0...v1.11.1) (2022-10-01)
+
+
+### Bug Fixes
+
+* bump [@cocreate](https://github.com/cocreate) dependencies ([12a2ae4](https://github.com/CoCreate-app/CoCreate-crud-server/commit/12a2ae454f0b12424f4c072b9dd2b31e02c20ade))
+
 # [1.11.0](https://github.com/CoCreate-app/CoCreate-crud-server/compare/v1.10.1...v1.11.0) (2022-10-01)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/crud-server",
-  "version": "1.11.0",
+  "version": "1.12.0",
   "description": "CoCreate-crud-server",
   "keywords": [
     "cocreate-crud",
@@ -40,7 +40,7 @@
   },
   "homepage": "https://cocreate.app/docs/CoCreate-crud-server",
   "dependencies": {
-    "@cocreate/docs": "^1.3.14",
+    "@cocreate/docs": "^1.3.18",
     "csvtojson": "^2.0.10",
     "json-2-csv": "^3.10.3",
     "mongodb": "^4.4.0"

package/src/crud.js

@@ -195,6 +195,7 @@ class CoCreateCrud {
 			const db = this.dbClient.db(data['organization_id']);
 			const collection = db.collection(data["collection"]);
 			let {query, sort} = this.getFilters(data);
+
 			collection.find(query).sort(sort).toArray(function(error, result) {
 				if (result) {
 					data['data'] = searchData(result, data.filter)
@@ -314,6 +315,7 @@ class CoCreateCrud {
 		return {query, sort}
 	}
 
+	// ToDo: create impved mongodb query to cover many cases
 	createQuery(filters, data) {
 		let query = new Object();
 
@@ -331,12 +333,7 @@ class CoCreateCrud {
 			
 			switch (item.operator) {
 				case '$contain':
-					var in_values = [];
-					item.value.forEach(function(v) {
-						in_values.push(new RegExp(".*" + v + ".*", "i"));
-					});
-					
-					query[key] = {$in : in_values }
+					query[key]['$regex'] = item.value;
 					break;
 					
 				case '$range':
@@ -355,9 +352,17 @@ class CoCreateCrud {
 				case '$lte':
 				case '$gt':
 				case '$gte':
-					query[key][item.operator] = item.value[0] || item.value;
+				case '$regex':
+					query[key][item.operator] = item.value;
 					break;
 				case '$in':
+					var in_values = [];
+					item.value.forEach(function(v) {
+						in_values.push(new RegExp(".*" + v + ".*", "i"));
+					});
+					
+					query[key] = {$in : in_values }
+					break;
 				case '$nin':
 					query[key][item.operator] = item.value;
 					break;