@cocreate/crud-server 1.8.0 → 1.9.2

package/CHANGELOG.md

@@ -1,3 +1,25 @@
+## [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)
+
+
+### Features
+
+* crud support on collection names ([c569657](https://github.com/CoCreate-app/CoCreate-crud-server/commit/c569657f0ab339952c4aa72bbab2a7667c0f9986))
+* update arrayValues to mongoDb dotNotation, removed isFlat ([ab2fb60](https://github.com/CoCreate-app/CoCreate-crud-server/commit/ab2fb601f660b3b96f7584ca66be1cb3902095eb))
+
 # [1.8.0](https://github.com/CoCreate-app/CoCreate-crud-server/compare/v1.7.0...v1.8.0) (2022-05-29)
 
 

package/docs/index.html

@@ -79,7 +79,7 @@
         					<a target="modal" href="module_activity_datatable.html"
         				  	     pass-collection="modules"
         				  	     pass-document_id=""
-        				  	     pass-fetch_value=""
+        				  	     pass-filter-value=""
         				  	     pass-prefix=""
         				  	     pass-to="render"
         				  	     modal-width="600px"

package/package.json

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

package/src/crud.js

@@ -1,5 +1,5 @@
 const {ObjectId} = require("mongodb");
-const {encodeObject, replaceArray} = require("./utils.crud.js")
+const {replaceArray} = require("./utils.crud.js")
 
 
 class CoCreateCrud {
@@ -15,6 +15,9 @@ class CoCreateCrud {
 			this.wsManager.on('readDocument',	(socket, data, socketInfo) => this.readDocument(socket, data, socketInfo))
 			this.wsManager.on('updateDocument', (socket, data, socketInfo) => this.updateDocument(socket, data, socketInfo))
 			this.wsManager.on('deleteDocument', (socket, data, socketInfo) => this.deleteDocument(socket, data, socketInfo))
+			this.wsManager.on('createCollection', (socket, data, socketInfo) => this.createCollection(socket, data, socketInfo));
+			this.wsManager.on('updateCollection', (socket, data, socketInfo) => this.updateCollection(socket, data, socketInfo))
+			this.wsManager.on('deleteCollection', (socket, data, socketInfo) => this.deleteCollection(socket, data, socketInfo))
 		}
 	}
 
@@ -32,9 +35,6 @@ class CoCreateCrud {
 			collection.insertOne(insertData, function(error, result) {
 				if(!error && result){
 					const response  = {...req_data, document_id: `${result.insertedId}`, data: insertData } 
-					// let isFlat = req_data.isFlat == false ? false : true;
-					// const response_data = isFlat ? encodeObject(response) : response;
-					// const response_data = response;
 					self.broadcast(socket, 'createDocument', response, socketInfo)	
 				} else {
 					self.wsManager.send(socket, 'ServerError', error, socketInfo);
@@ -81,8 +81,7 @@ class CoCreateCrud {
 						tmp = resp;
 					}
 					
-					let isFlat = req_data.isFlat == true ? true : false;
-					self.wsManager.send(socket, 'readDocument', { ...req_data, data: isFlat ? encodeObject(tmp) : tmp }, socketInfo);
+					self.wsManager.send(socket, 'readDocument', { ...req_data, data: tmp }, socketInfo);
 				} else {
 					self.wsManager.send(socket, 'readDocument error', req_data, socketInfo);
 				}
@@ -107,12 +106,25 @@ class CoCreateCrud {
 			} catch (err) {
 				console.log(err);
 			}
-			const query = {"_id": objId };
-			const update = {"$set": {}};
+
+			// let requestData = req_data
+			if (req_data['data']['_id'])
+			delete req_data['data']['_id']
 			
+			if(typeof req_data['data'] === 'object')
+				req_data['set'] = req_data['data']
 			
-			if( req_data['set'] )
-				for (const [key, value] of Object.entries(req_data['set'])) {
+			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']);
+
+				for (const [key, value] of Object.entries(insertData)) {
 					let val;
 					let valueType = typeof value;
 					switch(valueType) {
@@ -133,9 +145,12 @@ class CoCreateCrud {
 					  }
 					update.$set[key] = val
 				}				
-
-			if( req_data['unset'] ) 
-				update['$unset'] = req_data['unset'].reduce((r, d) => {r[d] = ""; return r}, {});
+			}
+			if( req_data['unset'] ) {
+				let unsetData = replaceArray(req_data['unset']);
+			
+				update['$unset'] = unsetData.reduce((r, d) => {r[d] = ""; return r}, {});
+			}
 			update['$set']['organization_id'] = req_data['organization_id'];
 
 			let projection = {}
@@ -149,10 +164,9 @@ class CoCreateCrud {
 					projection: projection,
 				}
 			).then((result) => {
-				let isFlat = req_data.isFlat == true ? true : false;
 				let response_data = result.value || {};
 				
-				let response = { ...req_data, document_id: response_data._id, data: isFlat ? encodeObject(req_data['set']) : req_data['set'] };
+				let response = { ...req_data, document_id: response_data._id, data: req_data['set'] };
 
 				if(req_data['unset']) 
 					response['delete_fields'] = req_data['unset'];
@@ -193,6 +207,68 @@ class CoCreateCrud {
 			self.wsManager.send(socket, 'ServerError', 'error', socketInfo);
 		}
 	}
+
+	/** Create Collection **/
+	async createCollection(socket, req_data, socketInfo) {
+		const self = this;
+
+		try {
+			const db = this.dbClient.db(req_data['organization_id']);
+			db.createCollection(req_data.collection, function(error, result) {
+				if (!error) {
+					let response = { ...req_data }
+					self.broadcast(socket, 'createCollection', response, socketInfo)
+				} else {
+					self.wsManager.send(socket, 'ServerError', error, socketInfo);
+				}
+			})
+		} catch (error) {
+			console.log(error);
+			self.wsManager.send(socket, 'ServerError', 'error', socketInfo);
+		}
+	}
+
+	/** Update Collection **/
+	async updateCollection(socket, req_data, socketInfo) {
+		const self = this;
+
+		try {
+			const db = this.dbClient.db(req_data['organization_id']);
+			const collection = db.collection(req_data["collection"]);
+			collection.rename(req_data.target, function(error, result) {
+				if (!error) {
+					let response = { ...req_data }
+					self.broadcast(socket, 'updateCollection', response, socketInfo)
+				} else {
+					self.wsManager.send(socket, 'ServerError', error, socketInfo);
+				}
+			})
+		} catch (error) {
+			console.log(error);
+			self.wsManager.send(socket, 'ServerError', 'error', socketInfo);
+		}
+	}
+
+	/** Delete Collection **/
+	async deleteCollection(socket, req_data, socketInfo) {
+		const self = this;
+
+		try {
+			const db = this.dbClient.db(req_data['organization_id']);
+			const collection = db.collection(req_data["collection"]);
+			collection.drop( function(error, result) {
+				if (!error) {
+					let response = { ...req_data }
+					self.broadcast(socket, 'deleteCollection', response, socketInfo)
+				} else {
+					self.wsManager.send(socket, 'ServerError', error, socketInfo);
+				}
+			})
+		} catch (error) {
+			console.log(error);
+			self.wsManager.send(socket, 'ServerError', 'error', socketInfo);
+		}
+	}
 	
 	broadcast(socket, component, response, socketInfo) {
 		this.wsManager.broadcast(socket, response.namespace || response['organization_id'], response.room, component, response, socketInfo);

package/src/database.js

@@ -1,7 +1,3 @@
-const {ObjectId} = require("mongodb");
-const {encodeObject, replaceArray} = require("./utils.crud.js")
-
-
 class CoCreateDatabases {
 	constructor(wsManager, dbClient) {
 		this.wsManager = wsManager

package/src/list.js

@@ -128,6 +128,7 @@ class CoCreateList {
 	async readCollections(socket, data, socketInfo) {
 		try {
 			const self = this;
+			data['collection'] = 'collections'
 			const db = this.dbClient.db(data['organization_id']);
 			db.listCollections().toArray(function(error, result) {
 				if (!error && result && result.length > 0) {

package/src/utils.crud.js

@@ -1,126 +1,36 @@
-function 	__mergeObject(target, source) 
-{
-	target = target || {};
-	for (let key of Object.keys(source)) {
-		if (source[key] instanceof Object) {
-			Object.assign(source[key], __mergeObject(target[key], source[key]))
-		}
-	}
-	
-	Object.assign(target || {}, source)
-	return target
-}
-
-function __createObject(data, path) 
-{
-	if (!path) return data;
-	
-	let keys = path.split('.')
-	let newObject = data;
-
-	for (var  i = keys.length - 1; i >= 0; i--) {
-		newObject = {[keys[i]]: newObject}				
-	}
-	return newObject;
-}
-
-function __createArray(key, data)
-{
-  try {
-    let item = /([\w\W]+)\[(\d+)\]/gm.exec(key)
-    if (item && item.length == 3) {
-      let arrayKey = item[1];
-      let index = parseInt(item[2]);
-      
-      if (!data[arrayKey] || !Array.isArray(data[arrayKey])) {
-        data[arrayKey] = [];
-      } 
-      data[arrayKey][index] = data[key];
-      delete data[key];
-      key = arrayKey;
-    }
-  } catch {
-    console.log('create array error');
-  }
-  return key;
-}
-
-
-
-function isObject(item) {
-  return (!!item) && (item.constructor === Object);
-}
-function isArray(item) {
-  return (!!item) && (item.constructor === Array);
-}
-
-function replaceArray(data)
-{
-  let keys = Object.keys(data)
+function replaceArray(data) {
+  let keys = Object.keys(data);
+  let objectData = {};
 
   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
+    let nk = k
+    if (/\[([0-9]*)\]/g.test(k)) {
+      nk = nk.replace(/\[/g, '.');
+      if (nk.endsWith(']'))
+        nk = nk.slice(0, -1)
+      nk = nk.replace(/\]./g, '.');
+      nk = nk.replace(/\]/g, '.');
     }
-  })
-  return data;
-}
-
-function decodeObject(data) {
-  let keys = Object.keys(data)
-  let objectData = {};
+    objectData[nk] = data[k];
+  });
   
-  keys.forEach((k) => {
-    k = __createArray(k, data);
-    if (k.split('.').length > 1) {
-      let newData = __createObject(data[k], k);
-      delete data[k];
-      
-      objectData = __mergeObject(objectData, newData);
-    } else {
-      objectData[k] = data[k];
-    }
-  })
   return objectData;
-}
 
-function encodeObject(data) {
-  let keys = Object.keys(data);
-  let newData = {};
-  keys.forEach((k) => {
-    let data_value = data[k];
-    if (isObject(data[k])) {
-      let new_obj = encodeObject(data[k]);
-      let newKeys = Object.keys(new_obj);
-      newKeys.forEach((newKey) => {
-        let value = new_obj[newKey];
-        if (isNaN(parseInt(newKey))) {
-          newKey = `${k}.${newKey}`;
-        } else {
-          newKey = `${k}[${newKey}]`;
-        }
-        
-        newData[newKey] = value;
-      })
+  // let keys = Object.keys(data)
 
-    } else if (isArray(data_value)){
-      data_value.forEach((v, index) => {
-        newData[`${k}[${index}]`] = v;
-      })
-    } else {
-      newData[k] = data[k];
-    }
-  })
-  return newData;
+  // 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 = {
-  decodeObject,
-  encodeObject,
   replaceArray
 };