@cocreate/crud-server 1.3.4 → 1.4.2

package/CHANGELOG.md

@@ -1,3 +1,25 @@
+## [1.4.2](https://github.com/CoCreate-app/CoCreate-crud-server/compare/v1.4.1...v1.4.2) (2022-05-12)
+
+
+### Bug Fixes
+
+* createDocument requires organization_id to be stored ([259f56d](https://github.com/CoCreate-app/CoCreate-crud-server/commit/259f56daadc6b9e148f054c0ba2cf04443122a6a))
+
+## [1.4.1](https://github.com/CoCreate-app/CoCreate-crud-server/compare/v1.4.0...v1.4.1) (2022-05-06)
+
+
+### Bug Fixes
+
+* replace ObjectID with ObjectId due to mongodb depreciation ([93e4294](https://github.com/CoCreate-app/CoCreate-crud-server/commit/93e42944447357ec6a244b72ce968bbd8ff5c93d))
+* update config organization_Id to organization_id ([996611b](https://github.com/CoCreate-app/CoCreate-crud-server/commit/996611baf2b2d3afbf895ef193ae15ba7226e77a))
+
+# [1.4.0](https://github.com/CoCreate-app/CoCreate-crud-server/compare/v1.3.4...v1.4.0) (2022-04-01)
+
+
+### Features
+
+* readCollections to return a list of collections ([2ad15d4](https://github.com/CoCreate-app/CoCreate-crud-server/commit/2ad15d43baf22c6dabbf56582cac182dec8876ad))
+
 ## [1.3.4](https://github.com/CoCreate-app/CoCreate-crud-server/compare/v1.3.3...v1.3.4) (2022-03-06)
 
 

package/CoCreate.config.js

@@ -1,7 +1,7 @@
 module.exports = {
     config: {
         "apiKey": "2061acef-0451-4545-f754-60cf8160",
-        "organization_Id": "5ff747727005da1c272740ab",
+        "organization_id": "5ff747727005da1c272740ab",
         "host": "general.cocreate.app"
     },
     "sources": [

package/docs/index.html

@@ -124,7 +124,7 @@
             var config = {
                 apiKey: 'c2b08663-06e3-440c-ef6f-13978b42883a',
                 securityKey: 'f26baf68-e3a9-45fc-effe-502e47116265',
-                organization_Id: '5de0387b12e200ea63204d6c'
+                organization_id: '5de0387b12e200ea63204d6c'
             }
         </script>
     

package/package.json

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

package/src/crud.js

@@ -1,4 +1,4 @@
-const {ObjectID} = require("mongodb");
+const {ObjectId} = require("mongodb");
 const {encodeObject, replaceArray} = require("./utils.crud.js")
 
 
@@ -22,15 +22,16 @@ class CoCreateCrud {
 	async createDocument(socket, req_data, socketInfo){
 		const self = this;
 		if(!req_data.data) return;
-		
+
 		try{
 			const db = this.dbClient.db(req_data['organization_id']);
 			const collection = db.collection(req_data["collection"]);
 			let insertData = replaceArray(req_data.data);
+			insertData['organization_id'] = req_data['organization_id'];
 
 			collection.insertOne(insertData, function(error, result) {
 				if(!error && result){
-					const response  = {...req_data, document_id: result.ops[0]._id, data:result.ops[0] } 
+					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;
@@ -58,13 +59,18 @@ class CoCreateCrud {
 			const collection = db.collection(req_data["collection"]);
 			
 			const query = {
-				"_id": new ObjectID(req_data["document_id"])
+				"_id": new ObjectId(req_data["document_id"])
 			};
 			if (req_data['organization_id']) {
 				query['organization_id'] = req_data['organization_id'];
 			}
 			
 			collection.find(query).toArray(function(error, result) {
+				if (req_data["collection"] == 'test') {
+					console.log('query', query)
+					console.log('readDocument request', req_data)
+					console.log('readDocument result', result)
+				}
 				if (!error && result && result.length > 0) {
 					let tmp = result[0];
 					if (req_data['exclude_fields']) {
@@ -83,6 +89,7 @@ class CoCreateCrud {
 					let isFlat = req_data.isFlat == true ? true : false;
 					self.wsManager.send(socket, 'readDocument', { ...req_data, data: isFlat ? encodeObject(tmp) : tmp }, req_data['organization_id'], socketInfo);
 				} else {
+					console.log('readDocument error', error)
 					self.wsManager.send(socket, 'ServerError', error, null, socketInfo);
 				}
 			});
@@ -98,10 +105,10 @@ class CoCreateCrud {
 		try {
 			const db = this.dbClient.db(req_data['organization_id']);
 			const collection = db.collection(req_data["collection"]);
-			let objId = new ObjectID();
+			let objId = new ObjectId();
 			try {
 				if (req_data["document_id"]) {
-					objId = new ObjectID(req_data["document_id"]);
+					objId = new ObjectId(req_data["document_id"]);
 				}
 			} catch (err) {
 				console.log(err);
@@ -152,7 +159,7 @@ class CoCreateCrud {
 			const db = this.dbClient.db(req_data['organization_id']);
 			const collection = db.collection(req_data["collection"]);
 			const query = {
-				"_id": new ObjectID(req_data["document_id"])
+				"_id": new ObjectId(req_data["document_id"])
 			};
 
 			collection.deleteOne(query, function(error, result) {

package/src/list.js

@@ -1,4 +1,4 @@
-const {ObjectID} = require("mongodb");
+const {ObjectId} = require("mongodb");
 
 class CoCreateList {
 	constructor(wsManager, dbClient) {
@@ -9,7 +9,7 @@ class CoCreateList {
 	
 	init() {
 		this.wsManager.on('readDocumentList', (socket, data, socketInfo) => this.readDocumentList(socket, data, socketInfo));
-		this.wsManager.on('readCollectionList', (socket, data, socketInfo) => this.readCollectionList(socket, data, socketInfo));
+		this.wsManager.on('readCollections', (socket, data, socketInfo) => this.readCollections(socket, data, socketInfo));
 	}
 	
 	/**
@@ -40,7 +40,6 @@ class CoCreateList {
 				count: 0 (integer)
 			},
 			
-			is_collection: true | false,
 			//. case fetch document case
 			export: true | false
 			-------- additional response data -----------
@@ -53,13 +52,11 @@ class CoCreateList {
 				setTimeout(resolve, ms);
 			});
 		}
-		
-		// await sleep(3000)
 
 		const self = this;
 		
 		if (req_data['is_collection']) {
-			var result = await this.readCollectionList(socket, req_data, socketInfo);
+			var result = await this.readCollections(socket, req_data, socketInfo);
 			return;
 		}
 		
@@ -128,30 +125,21 @@ class CoCreateList {
 		}
 	}
 	
-	async readCollectionList(socket, data, socketInfo) {
+	async readCollections(socket, data, socketInfo) {
 		try {
-			var collections = [];
-			const db = this.dbClient.db(req_data['organization_id']);
-			collections = await db.listCollections().toArray().then(infos => {
-				var result = [];
-				infos.forEach(function(item) {
-					let __uuid = item.info.uuid.toString('hex')
-					result.push({
-						name: item.name,
-						_id: __uuid,
-						id: __uuid,
-					});
-				})
-				return result;
-			})
-			
-			this.wsManager.send(socket, 'readCollectionList', {...data, data: collections }, data['organization_id'], socketInfo);
+			const self = this;
+			const db = this.dbClient.db(data['organization_id']);
+			db.listCollections().toArray(function(error, result) {
+				if (!error && result && result.length > 0) {
+					self.wsManager.send(socket, 'readCollections', {...data, data: result }, data['organization_id'], socketInfo);
+				}
+			})			
 		} catch(error) {
+			console.log('readCollections error', error); 
 			this.wsManager.send(socket, 'ServerError', 'error', null, socketInfo);
 		}
 	}
 	
-	
 	/**
 	 * function that make query from data
 	 * 
@@ -170,7 +158,7 @@ class CoCreateList {
 				query[key] = {};
 			}
 			
-			if (item.name == "_id") item.value = item.value.map(v => new ObjectID(v))
+			if (item.name == "_id") item.value = item.value.map(v => new ObjectId(v))
 			
 			switch (item.operator) {
 				case '$contain':