@cocreate/crud-server 1.3.4 → 1.4.0

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [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/package.json

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

package/src/list.js

@@ -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
 	 *