@cocreate/crud-server 1.9.0 → 1.10.0

package/CHANGELOG.md

@@ -1,3 +1,25 @@
+# [1.10.0](https://github.com/CoCreate-app/CoCreate-crud-server/compare/v1.9.2...v1.10.0) (2022-08-31)
+
+
+### Features
+
+* filter, query and sort collections ([6399e8c](https://github.com/CoCreate-app/CoCreate-crud-server/commit/6399e8ccae1a1ff713335d47b1bb73c7af154e85))
+* rename and delete keys from db ([03d5387](https://github.com/CoCreate-app/CoCreate-crud-server/commit/03d5387c30512b4723a60a7439b71b86c7a6834d))
+
+## [1.9.2](https://github.com/CoCreate-app/CoCreate-crud-server/compare/v1.9.1...v1.9.2) (2022-07-29)
+
+
+### Bug Fixes
+
+* set collection as collections for function readCollections ([73341cf](https://github.com/CoCreate-app/CoCreate-crud-server/commit/73341cfc11cab2c10f5f21ac791806f099fcdea0))
+
+## [1.9.1](https://github.com/CoCreate-app/CoCreate-crud-server/compare/v1.9.0...v1.9.1) (2022-07-27)
+
+
+### Bug Fixes
+
+* typo with broadcasting collection messageName ([a3a9bea](https://github.com/CoCreate-app/CoCreate-crud-server/commit/a3a9beab885014fd0f90ce1c2b7e3c73014aa221))
+
 # [1.9.0](https://github.com/CoCreate-app/CoCreate-crud-server/compare/v1.8.0...v1.9.0) (2022-07-25)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/crud-server",
-  "version": "1.9.0",
+  "version": "1.10.0",
   "description": "CoCreate-crud-server",
   "keywords": [
     "cocreate-crud",

package/src/crud.js

@@ -107,24 +107,17 @@ class CoCreateCrud {
 				console.log(err);
 			}
 
-			// let requestData = req_data
-			if (req_data['data']['_id'])
-			delete req_data['data']['_id']
+			if (req_data['data'] && req_data['data']['_id'])
+				delete req_data['data']['_id']
 			
-			if(typeof req_data['data'] === 'object')
-				req_data['set'] = req_data['data']
-			
-			if(Array.isArray(req_data['delete_fields'])) 
-				req_data['unset'] = req_data['delete_fields'];
-
 
 			const query = {"_id": objId };
-			const update = {"$set": {}};
-				
-			if( req_data['set'] )	{
-				let insertData = replaceArray(req_data['set']);
+			let update = {}, projection = {};
 
-				for (const [key, value] of Object.entries(insertData)) {
+
+			if( typeof req_data['data'] === 'object' )	{
+				update['$set'] = {}
+				for (const [key, value] of Object.entries(replaceArray(req_data['data']))) {
 					let val;
 					let valueType = typeof value;
 					switch(valueType) {
@@ -143,35 +136,43 @@ class CoCreateCrud {
 						default:
 							val = value
 					  }
-					update.$set[key] = val
-				}				
+					update['$set'][key] = val
+				}	
+
+				update['$set']['organization_id'] = req_data['organization_id'];
+
+				Object.keys(update['$set']).forEach(x => {
+					projection[x] = 1
+				})
+				
 			}
-			if( req_data['unset'] ) {
-				let unsetData = replaceArray(req_data['unset']);
-			
-				update['$unset'] = unsetData.reduce((r, d) => {r[d] = ""; return r}, {});
+
+			if( req_data['deleteName'] ) {
+				update['$unset'] = replaceArray(req_data['deleteName']);
 			}
-			update['$set']['organization_id'] = req_data['organization_id'];
 
-			let projection = {}
-			Object.keys(update['$set']).forEach(x => {
-				projection[x] = 1
-			})
+			if( req_data['updateName'] ) {
+				update['$rename'] = replaceArray(req_data['updateName'])
+				for (const [key, value] of Object.entries(update['$rename'])) {
+					let newValue = replaceArray({[value]: value})
+					let oldkey = key;
+					for (const [key] of Object.entries(newValue)) {
+						update['$rename'][oldkey] = key
+					}
+				}
+			}
 
-			collection.findOneAndUpdate( query, update, {
-					returnOriginal : false,
+			collection.updateOne( query, update, {
 					upsert: req_data.upsert || false,
 					projection: projection,
 				}
-			).then((result) => {
-				let response_data = result.value || {};
-				
-				let response = { ...req_data, document_id: response_data._id, data: req_data['set'] };
-
-				if(req_data['unset']) 
-					response['delete_fields'] = req_data['unset'];
-				
-				self.broadcast(socket, 'updateDocument', response, socketInfo)
+			).then((error, result) => {
+				if (!error) {				
+					let response = { ...req_data, data: update['$set'] };
+					self.broadcast(socket, 'updateDocument', response, socketInfo)
+				} else {
+					self.wsManager.send(socket, 'ServerError', error, socketInfo);
+				}
 			}).catch((error) => {
 				console.log('error', error)
 				self.wsManager.send(socket, 'ServerError', error, socketInfo);
@@ -217,7 +218,7 @@ class CoCreateCrud {
 			db.createCollection(req_data.collection, function(error, result) {
 				if (!error) {
 					let response = { ...req_data }
-					self.broadcast(socket, 'deleteDocument', response, socketInfo)
+					self.broadcast(socket, 'createCollection', response, socketInfo)
 				} else {
 					self.wsManager.send(socket, 'ServerError', error, socketInfo);
 				}
@@ -238,7 +239,7 @@ class CoCreateCrud {
 			collection.rename(req_data.target, function(error, result) {
 				if (!error) {
 					let response = { ...req_data }
-					self.broadcast(socket, 'deleteDocument', response, socketInfo)
+					self.broadcast(socket, 'updateCollection', response, socketInfo)
 				} else {
 					self.wsManager.send(socket, 'ServerError', error, socketInfo);
 				}
@@ -259,7 +260,7 @@ class CoCreateCrud {
 			collection.drop( function(error, result) {
 				if (!error) {
 					let response = { ...req_data }
-					self.broadcast(socket, 'deleteDocument', response, socketInfo)
+					self.broadcast(socket, 'deleteCollection', response, socketInfo)
 				} else {
 					self.wsManager.send(socket, 'ServerError', error, socketInfo);
 				}

package/src/list.js

@@ -46,7 +46,7 @@ class CoCreateList {
 			data: [] // array
 	 }
 	 **/
-	async readDocuments(socket, req_data, socketInfo) {		
+	async readDocuments(socket, data, socketInfo) {		
 		function sleep(ms) {
 			return new Promise((resolve) => {
 				setTimeout(resolve, ms);
@@ -55,65 +55,14 @@ class CoCreateList {
 
 		const self = this;
 		
-		if (req_data['is_collection']) {
-			var result = await this.readCollections(socket, req_data, socketInfo);
-			return;
-		}
-		
 		try {
-			const db = this.dbClient.db(req_data['organization_id']);
-			const collection = db.collection(req_data["collection"]);
-			const operator = {
-				filters: [],
-				orders: [],
-				search: {
-					value: [],
-					type: "or"
-				},
-				startIndex: 0,
-				...req_data.operator
-			};
-			
-			var query = {};
-			query = this.readQuery(operator);
-
-			var sort = {};
-			operator.orders.forEach((order) => {
-				sort[order.name] = order.type
-			});
+			const db = this.dbClient.db(data['organization_id']);
+			const collection = db.collection(data["collection"]);
+			let {operator, query, sort} = this.getFilters(data);
 			collection.find(query).sort(sort).toArray(function(error, result) {
 				if (result) {
-				
-				if (operator['search']['type'] == 'and') {
-						result = self.readAndSearch(result, operator['search']['value']);
-					} else {
-						result = self.readOrSearch(result, operator['search']['value']);
-					}
-					
-					const total = result.length;
-					const startIndex = operator.startIndex;
-					const count = operator.count;
-					let result_data = [];
-					
-					if (req_data.created_ids && req_data.created_ids.length > 0) {
-						let _nn = (count) ? startIndex : result.length;
-						
-						for (let ii = 0; ii < _nn; ii++) {
-							
-							const selected_item = result[ii];
-							req_data.created_ids.forEach((fetch_id, index) => {
-								if (fetch_id == selected_item['_id']) {
-									result_data.push({ item: selected_item, position: ii })
-								}
-							})
-						}
-					} else {
-						if (startIndex) result = result.slice(startIndex, total);
-						if (count) result = result.slice(0, count)
-						
-						result_data = result;
-					}
-					self.wsManager.send(socket, 'readDocuments', { ...req_data, data: result_data, operator: {...operator, total: total}}, socketInfo);
+					let result_data = self.filterResponse(result, data, operator)
+					self.wsManager.send(socket, 'readDocuments', { ...data, data: result_data, operator, socketInfo });
 				} else {
 					console.log(error)
 					self.wsManager.send(socket, 'ServerError', error, socketInfo);
@@ -128,9 +77,40 @@ class CoCreateList {
 	async readCollections(socket, data, socketInfo) {
 		try {
 			const self = this;
+			data['collection'] = 'collections'
+			
+			let {operator, query, sort} = this.getFilters(data);
 			const db = this.dbClient.db(data['organization_id']);
-			db.listCollections().toArray(function(error, result) {
+			db.listCollections(query).toArray(function(error, result) {
 				if (!error && result && result.length > 0) {
+					let orderField = Object.keys(sort)[0]
+					if (orderField) {
+						let orderType = sort[orderField];
+						let orderValueType = "";
+						let sortData;
+						if (orderType == '-1') {
+							if (orderValueType == 'number')
+								sortData = result.sort((a, b) => 
+									b[orderField] - a[orderField]
+								);
+							else
+								sortData = result.sort((a, b) => 
+									b[orderField].localeCompare(a[orderField])
+								);
+						} else {
+							if (orderValueType == 'number')
+								sortData = result.sort((a, b) => 
+									a[orderField] - b[orderField]
+								);
+							else
+								sortData = result.sort((a, b) => 
+									a[orderField].localeCompare(b[orderField])
+								);
+							
+						}
+						result = sortData
+					}
+
 					self.wsManager.send(socket, 'readCollections', {...data, data: result }, socketInfo);
 				}
 			})			
@@ -144,7 +124,64 @@ class CoCreateList {
 	 * function that make query from data
 	 * 
 	 */
-	readQuery(data) {
+	filterResponse(result, data, operator) {
+		if (operator['search']['type'] == 'and') {
+			result = this.readAndSearch(result, operator['search']['value']);
+		} else {
+			result = this.readOrSearch(result, operator['search']['value']);
+		}
+		
+		const total = result.length;
+		const startIndex = operator.startIndex;
+		const count = operator.count;
+		let result_data = [];
+		
+		if (data.created_ids && data.created_ids.length > 0) {
+			let _nn = (count) ? startIndex : result.length;
+			
+			for (let ii = 0; ii < _nn; ii++) {
+				
+				const selected_item = result[ii];
+				data.created_ids.forEach((fetch_id, index) => {
+					if (fetch_id == selected_item['_id']) {
+						result_data.push({ item: selected_item, position: ii })
+					}
+				})
+			}
+		} else {
+			if (startIndex) result = result.slice(startIndex, total);
+			if (count) result = result.slice(0, count)
+			
+			result_data = result;
+		}
+		operator.startIndex = startIndex
+		operator.count = count
+		operator.total = total
+		return result_data
+	}
+
+	getFilters(data) {
+		let operator = {
+			filters: [],
+			orders: [],
+			search: {
+				value: [],
+				type: "or"
+			},
+			startIndex: 0,
+			...data.operator
+		};
+
+		let query = this.createQuery(operator);
+		let sort = {}
+		operator.orders.forEach((order) => {
+			sort[order.name] = order.type
+		});
+
+		return {operator, query, sort}
+	}
+
+	createQuery(data) {
 		var query = new Object();
 	
 		var filters = data['filters'];

package/src/utils.crud.js

@@ -15,20 +15,6 @@ function replaceArray(data) {
   });
   
   return objectData;
-
-  // let keys = Object.keys(data)
-
-  // keys.forEach((k) => {
-  //   let reg = /\[(\d+)\]/gm.exec(k)
-  //   let newKey = null;
-  //   if (reg && reg.length == 2) {
-  //     newKey = k.replace(reg[0], "." + reg[1]);
-  //     let newData = data[k];
-  //     delete data[k];
-  //     data[newKey] = newData
-  //   }
-  // })
-  // return data;
 }
 
 module.exports = {