@cocreate/organizations 1.2.3 → 1.2.4

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [1.2.4](https://github.com/CoCreate-app/CoCreate-organizations/compare/v1.2.3...v1.2.4) (2022-05-09)
+
+
+### Bug Fixes
+
+* insert returns insertedId instead of [0]._id ([3a604ed](https://github.com/CoCreate-app/CoCreate-organizations/commit/3a604ed3759f3d607243b29b9ee568bb459ab40f))
+
 ## [1.2.3](https://github.com/CoCreate-app/CoCreate-organizations/compare/v1.2.2...v1.2.3) (2022-05-06)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/organizations",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "description": "A simple organizations component in vanilla javascript. Easily configured using HTML5 attributes and/or JavaScript API.",
   "keywords": [
     "organizations",

package/src/client.js

@@ -56,8 +56,6 @@ const CoCreateOrganization = {
 		crud.send('createOrg', {
 			apiKey: config.apiKey,
 			organization_id: config.organization_id,
-			// orgDb: newOrg,
-			mdb: '5ae0cfac6fb8c4e656fdaf92',
 			collection: 'organizations',
 			data: data
 		}, room);

package/src/server.js

@@ -33,7 +33,7 @@ class CoCreateOrganization {
 						// Create new user in config db users collection
 						newOrgDb.insertOne({...result.ops[0], organization_id : newOrg_id}, function(error, result) {
 							if(!error && result){
-								const response  = { ...data, document_id: result.ops[0]._id, data: result.ops[0]}
+								const response  = { ...data, document_id: `${result.insertedId}`, data: result.ops[0]}
 								self.wsManager.send(socket, 'createOrgNew', response, data['organization_id']);
 							}
 						});
@@ -54,20 +54,23 @@ class CoCreateOrganization {
 			// create new org in config db organization collection
 			collection.insertOne({ ...data.data, organization_id: data.organization_id }, function(error, result) {
 				if(!error && result){
-					const orgId = result.ops[0]._id + "";
+					const orgId = `${result.insertedId}`
+					data.data['_id'] = result.insertedId
 					const anotherCollection = self.dbClient.db(orgId).collection(data['collection']);
 					// Create new org db and insert organization
-					anotherCollection.insertOne({...result.ops[0], organization_id : orgId});
+					anotherCollection.insertOne({...data.data, organization_id : orgId});
 					
-					const response  = { ...data, document_id: result.ops[0]._id, data: result.ops[0] }
+					const response  = { ...data, document_id: orgId }
 
 					self.wsManager.send(socket, 'createOrg', response );
 					self.wsManager.broadcast(socket, data.namespace || data['organization_id'] , data.room, 'createDocument', response);
-				}
-					// add new org to masterDb
-					const masterOrgDb = self.dbClient.db(data.mdb).collection(data['collection']);
-					masterOrgDb.insertOne({...result.ops[0], organization_id : data['mdb']});
 
+					// add new org to platformDB
+					if (data.organization_id != process.env.organization_id) {	
+						const platformDB = self.dbClient.db(process.env.organization_id).collection(data['collection']);
+						platformDB.insertOne({...data.data, organization_id: process.env.organization_id});
+					}	
+				}
 			});
 		}catch(error){
 			console.log('createDocument error', error);