@cocreate/crud-server 1.5.0 → 1.5.1

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [1.5.1](https://github.com/CoCreate-app/CoCreate-crud-server/compare/v1.5.0...v1.5.1) (2022-05-17)
+
+
+### Bug Fixes
+
+* get orgId from socketInfo ([da03da3](https://github.com/CoCreate-app/CoCreate-crud-server/commit/da03da39aa383c71a802bbbfa9ecea5b637c5262))
+* reorder broadcast params ([96deccb](https://github.com/CoCreate-app/CoCreate-crud-server/commit/96deccb415e47dbfbfad4311985b3a7082cb57ff))
+
 # [1.5.0](https://github.com/CoCreate-app/CoCreate-crud-server/compare/v1.4.4...v1.5.0) (2022-05-14)
 
 

package/package.json

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

package/src/crud.js

@@ -35,21 +35,21 @@ class CoCreateCrud {
 					// let isFlat = req_data.isFlat == false ? false : true;
 					// const response_data = isFlat ? encodeObject(response) : response;
 					// const response_data = response;
-					self.broadcast('createDocument', socket, response, socketInfo)	
+					self.broadcast(socket, 'createDocument', response, socketInfo)	
 				} else {
-					self.wsManager.send(socket, 'ServerError', error, null, socketInfo);
+					self.wsManager.send(socket, 'ServerError', error, socketInfo);
 				}
 			});
 		}catch(error){
 			console.log('createDocument error', error);
-			self.wsManager.send(socket, 'ServerError', 'error', null, socketInfo);
+			self.wsManager.send(socket, 'ServerError', 'error', socketInfo);
 		}
 	}
 	
 	/** Read Document **/
 	async readDocument(socket, req_data, socketInfo) {
 		if (!req_data['collection'] || req_data['collection'] == 'null' || typeof req_data['collection'] !== 'string') {
-			this.wsManager.send(socket, 'ServerError', 'error', null, socketInfo);
+			this.wsManager.send(socket, 'ServerError', 'error', socketInfo);
 			return;
 		} 
 		const self = this;
@@ -82,14 +82,14 @@ 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);
+					self.wsManager.send(socket, 'readDocument', { ...req_data, data: isFlat ? encodeObject(tmp) : tmp }, socketInfo);
 				} else {
-					self.wsManager.send(socket, 'ServerError', error, null, socketInfo);
+					self.wsManager.send(socket, 'readDocument error', req_data, socketInfo);
 				}
 			});
 		} catch (error) {
 			console.log('readDocument error', error, req_data); 
-			self.wsManager.send(socket, 'ServerError', 'error', null, socketInfo);
+			self.wsManager.send(socket, 'ServerError', 'error', socketInfo);
 		}
 	}
 
@@ -136,15 +136,15 @@ class CoCreateCrud {
 				if(req_data['unset']) 
 					response['delete_fields'] = req_data['unset'];
 				
-				self.broadcast('updateDocument', socket, response, socketInfo)
+				self.broadcast(socket, 'updateDocument', response, socketInfo)
 			}).catch((error) => {
 				console.log('error', error)
-				self.wsManager.send(socket, 'ServerError', error, null, socketInfo);
+				self.wsManager.send(socket, 'ServerError', error, socketInfo);
 			});
 			
 		} catch (error) {
 			console.log(error)
-			self.wsManager.send(socket, 'updateDocumentError', error, req_data['organization_id']);
+			self.wsManager.send(socket, 'updateDocumentError', error, socketInfo);
 		}
 	}
 	
@@ -162,18 +162,18 @@ class CoCreateCrud {
 			collection.deleteOne(query, function(error, result) {
 				if (!error) {
 					let response = { ...req_data }
-					self.broadcast('deleteDocument', socket, response, socketInfo)
+					self.broadcast(socket, 'deleteDocument', response, socketInfo)
 				} else {
-					self.wsManager.send(socket, 'ServerError', error, null, socketInfo);
+					self.wsManager.send(socket, 'ServerError', error, socketInfo);
 				}
 			})
 		} catch (error) {
 			console.log(error);
-			self.wsManager.send(socket, 'ServerError', 'error', null, socketInfo);
+			self.wsManager.send(socket, 'ServerError', 'error', socketInfo);
 		}
 	}
 	
-	broadcast(component, socket, response, socketInfo) {
+	broadcast(socket, component, response, socketInfo) {
 		this.wsManager.broadcast(socket, response.namespace || response['organization_id'], response.room, component, response, socketInfo);
 		process.emit('changed-document', response)
 	}

package/src/list.js

@@ -113,15 +113,15 @@ class CoCreateList {
 						
 						result_data = result;
 					}
-					self.wsManager.send(socket, 'readDocuments', { ...req_data, data: result_data, operator: {...operator, total: total}}, req_data['organization_id'], socketInfo);
+					self.wsManager.send(socket, 'readDocuments', { ...req_data, data: result_data, operator: {...operator, total: total}}, socketInfo);
 				} else {
 					console.log(error)
-					self.wsManager.send(socket, 'ServerError', error, null, socketInfo);
+					self.wsManager.send(socket, 'ServerError', error, socketInfo);
 				}
 			})
 		} catch (error) {
 			console.log('readDocuments error', error);
-			this.wsManager.send(socket, 'ServerError', 'error', null, socketInfo);
+			this.wsManager.send(socket, 'ServerError', 'error', socketInfo);
 		}
 	}
 	
@@ -131,12 +131,12 @@ class CoCreateList {
 			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);
+					self.wsManager.send(socket, 'readCollections', {...data, data: result }, socketInfo);
 				}
 			})			
 		} catch(error) {
 			console.log('readCollections error', error); 
-			this.wsManager.send(socket, 'ServerError', 'error', null, socketInfo);
+			this.wsManager.send(socket, 'ServerError', 'error', socketInfo);
 		}
 	}