@cocreate/crud-server 1.14.5 → 1.15.0

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [1.15.0](https://github.com/CoCreate-app/CoCreate-crud-server/compare/v1.14.5...v1.15.0) (2022-12-02)
+
+
+### Bug Fixes
+
+* bump dependencies ([e9921ac](https://github.com/CoCreate-app/CoCreate-crud-server/commit/e9921acc5404d9bc7b04718e1cd6520949ceccd9))
+* data.user to data.user_id ([645493a](https://github.com/CoCreate-app/CoCreate-crud-server/commit/645493ab7795559ddaa7e04b040777b6288ead37))
+* renamed $contain to $include ([42d351e](https://github.com/CoCreate-app/CoCreate-crud-server/commit/42d351e435ebe5f2328682c8c836092f41eea2b7))
+
+
+### Features
+
+* supports index and limit. improved search ([2ce163a](https://github.com/CoCreate-app/CoCreate-crud-server/commit/2ce163a60a9503f276ffb3ac1ffedf6016ba4d92))
+
 ## [1.14.5](https://github.com/CoCreate-app/CoCreate-crud-server/compare/v1.14.4...v1.14.5) (2022-11-28)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/crud-server",
-  "version": "1.14.5",
+  "version": "1.15.0",
   "description": "CoCreate-crud-server",
   "keywords": [
     "cocreate-crud",
@@ -40,8 +40,8 @@
   },
   "homepage": "https://cocreate.app/docs/CoCreate-crud-server",
   "dependencies": {
-    "@cocreate/docs": "^1.4.8",
-    "@cocreate/utils": "^1.12.6",
+    "@cocreate/docs": "^1.4.10",
+    "@cocreate/utils": "^1.13.0",
     "csvtojson": "^2.0.10",
     "json-2-csv": "^3.10.3",
     "mongodb": "^4.4.0"

package/src/mongodb/mongodb.js

@@ -322,7 +322,7 @@ function document(action, data){
 									data[type][i]._id = ObjectId()
 								else 
 									data[type][i]._id = ObjectId(data[type][i]._id)
-								data[type][i]['created'] = {on: data.timeStamp, by: data.user || data.clientId}
+								data[type][i]['created'] = {on: data.timeStamp, by: data.user_id || data.clientId}
 							}
 							if (action == 'readDocument') {
 								if (data[type][i]._id)
@@ -335,7 +335,7 @@ function document(action, data){
 								if (!data[type][i]._id)
 									updateData = createUpdate({document: [data[type][i]]}, type)
 
-								data[type][i]['modified'] = {on: data.timeStamp, by: data.user || data.clientId}
+								data[type][i]['modified'] = {on: data.timeStamp, by: data.user_id || data.clientId}
 
 							}
 							if (action =='deleteDocument') {
@@ -375,8 +375,20 @@ function document(action, data){
 					}
 
 					if (action == 'readDocument') {
-
-						collectionObj.find(query).sort(sort).toArray(function(error, result) {
+						let index = 0, limit = 0
+						if (data.filter) {
+							const count = await collectionObj.estimatedDocumentCount()
+							data.filter.count = count
+	
+							if (data.filter.startIndex)
+								index = data.filter.startIndex
+							if (data.filter.limit)
+								limit = data.filter.limit
+							if (limit)
+								limit = index + limit;
+						}
+				
+						collectionObj.find(query).limit(limit).sort(sort).toArray(function(error, result) {
 							if (error) {
 								error.database = database
 								error.collection = collection 
@@ -386,10 +398,10 @@ function document(action, data){
 							if (result) {
 								// ToDo: forEach at cursor
 								for (let doc of result) {
-									let isFilter = true
+									let isMatch = true
 									if (data.filter && data.filter['search'])
-										isFilter = searchData(doc, data.filter['search'])
-									if (isFilter) {
+										isMatch = searchData(doc, data.filter['search'])
+									if (isMatch) {
 										doc.db = 'mongodb'
 										doc.database = database
 										doc.collection = collection
@@ -397,6 +409,10 @@ function document(action, data){
 									}
 								}
 
+								if (index && limit) {
+									documents = documents.slice(index, limit)
+								}
+
 								if (data.returnDocument == false) {
 									
 									for (let item of data['data'])  {
@@ -431,9 +447,17 @@ function document(action, data){
 										error.collection = collection 
 										errorHandler(error)
 									}
-					
-									let searchResult = searchData(result, data.filter)
-									resolve(searchResult)
+									if (data.filter && data.filter.search) {
+										let searchResult = []
+
+										for (let doc of result) {
+											let isMatch = searchData(doc, data.filter.search)
+											if (isMatch)
+												searchResult.push(doc)
+										}
+										result = searchResult
+									}
+									resolve(result)
 								})
 							}, (err) => {
 								console.log(err);
@@ -451,7 +475,7 @@ function document(action, data){
 								if (action == 'deleteDocument')
 									documents.push({_id: doc._id, db: 'mongodb', database, collection})
 								else
-									doc['modified'] = {on: data.timeStamp, by: data.user || data.clientId}
+									doc['modified'] = {on: data.timeStamp, by: data.user_id || data.clientId}
 								
 								_ids.push(doc._id)
 							}
@@ -630,9 +654,8 @@ function getFilters(data) {
 
 
 	if (filter.sort)
-		filter.sort.forEach((order) => {
-			sort[order.name] = order.type
-		});
+		for (let i = 0; i < filter.sort.length; i++)
+			sort[filter.sort[i].name] = filter.sort[i].direction
 	
 	return {query, sort}
 }
@@ -654,7 +677,7 @@ function createQuery(filters) {
 			item.value = ObjectId(item.value)
 		
 		switch (item.operator) {
-			case '$contain':
+			case '$includes':
 				query[key]['$regex'] = item.value;
 				break;