@cocreate/crud-server 1.19.0 → 1.20.0

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [1.20.0](https://github.com/CoCreate-app/CoCreate-crud-server/compare/v1.19.1...v1.20.0) (2023-04-11)
+
+
+### Features
+
+* use platform database to get databases from organization ([8b2f9b3](https://github.com/CoCreate-app/CoCreate-crud-server/commit/8b2f9b39538448ff1d9a718b580d81cbcbaf52d5))
+
+## [1.19.1](https://github.com/CoCreate-app/CoCreate-crud-server/compare/v1.19.0...v1.19.1) (2023-04-11)
+
+
+### Bug Fixes
+
+* pass dbUrl to constructor ([7900c05](https://github.com/CoCreate-app/CoCreate-crud-server/commit/7900c0539998cb5f42cd27aed3844d0d43f5370b))
+
 # [1.19.0](https://github.com/CoCreate-app/CoCreate-crud-server/compare/v1.18.0...v1.19.0) (2023-04-11)
 
 

package/package.json

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

package/src/index.js

@@ -3,9 +3,10 @@
 const {ObjectId, searchData, sortData} = require("@cocreate/utils");
 
 class CoCreateCrudServer {
-	constructor(wsManager, databases) {
+	constructor(wsManager, databases, database) {
 		this.wsManager = wsManager
 		this.databases = databases
+		this.database = database
 		this.ObjectId = ObjectId
 		this.databaseUrls = new Map();
 		this.init();
@@ -100,32 +101,26 @@ class CoCreateCrudServer {
 					resolve()
 
 				let dbUrl = this.databaseUrls.get(data.organization_id)
-				if (dbUrl == 'false')
+				if (dbUrl === 'false' || dbUrl === false)
 					resolve()
 
 				if (!dbUrl) {
-					if (data.organization_id === process.env.organization_id) {
-						dbUrl = {mongodb: [process.env.MONGO_URL]}
-						console.log('platform dbUrl crud', dbUrl)
+					let organization = await this.databases[this.database.name]['readDocument']({
+						dbUrl: this.database.url[0],
+						database: process.env.organization_id,
+						collection: 'organizations',
+						document: [{_id: data.organization_id}],
+						organization_id: process.env.organization_id
+					})
+					if (organization && organization.document && organization.document[0])
+						organization = organization.document[0]
+					if (organization && organization.databases) {
+						dbUrl = organization.databases
 						this.databaseUrls.set(data.organization_id, dbUrl)
 					} else {
-						let organization = await this.databases['mongodb']['readDocument']({
-							database: process.env.organization_id,
-							collection: 'organizations',
-							document: [{_id: data.organization_id}],
-							organization_id: process.env.organization_id
-						})
-						if (organization && organization.document && organization.document[0])
-							organization = organization.document[0]
-						if (organization && organization.databases) {
-							dbUrl = organization.databases
-							this.databaseUrls.set(data.organization_id, dbUrl)
-							console.log('organization dbUrl queried from platform')
-						} else {
-							this.databaseUrls.set(data.organization_id, 'false')
-							console.log('organization or dbUrl urls could not be found')
-							resolve()
-						}
+						this.databaseUrls.set(data.organization_id, 'false')
+						console.log('organization or dbUrl urls could not be found')
+						resolve()
 					}
 				}
 		
@@ -136,64 +131,68 @@ class CoCreateCrudServer {
                     data.upsert = true
 				
 				// ToDo: support stats from multiple dbs 
-                if (data.collection || action == 'databaseStats') {
+                if (data.collection || action === 'databaseStats') {
                     if (!data.database)
                         data['database'] = data.organization_id
+					
+					if (action === 'updateDocument' && data.organization_id !== process.env.organization_id) {
+						let syncKeys
+						if (data.collection === 'organizations')
+							syncKeys = ['name', 'logo', 'databases', 'hosts', 'apis']
+						else if (data.collection === 'users')
+							syncKeys = ['name', 'email', 'password', 'avatar']
+
+						if (syncKeys && syncKeys.length) {
+							let platformUpdate = {
+								dbUrl: this.database.url,
+								database: process.env.organization_id,
+								collection: data.collection,
+								document: [{}],
+								organization_id: process.env.organization_id
+							}
+
+							let document = data.document[0] || data.document
+							if (document) {
+								for (let key of syncKeys) {
+									if (document[key])
+										platformUpdate.document[0][key] = document[key]
+								}
+							}
+
+							this.databases[this.database.name][action](platformUpdate)
+						}
+
+					}
+					
                 }
 
 				if (!data.db || !data.db.length)
 					data.db = ['mongodb']
-				let dbsLength = data.db.length
+
 				for (let i = 0; i < data.db.length; i++) {
-					dbsLength -= 1
-					if (this.databases[data.db[i]]) {
-						// ToDo: for loop on each dbUrl					
-						if (dbUrl && dbUrl[data.db[i]]) {
-							data['dbUrl'] = dbUrl[data.db[i]][0]
-							data = await this.databases[data.db[i]][action](data)
-
-							// ToDo: sync orgdb and platformdb specified keys from collections organizations and users
-							if (data.collection === 'organization' || data.collection === 'user') {
-								let syncKeys
-								if (data.collection === 'organizations')
-									syncKeys = ['name', 'logo', 'databases', 'hosts', 'apis']
-								else if (data.collection === 'users')
-									syncKeys = ['name', 'email', 'password', 'avatar']
-
-								if (syncKeys && syncKeys.length) {
-									let platformUpdate = {
-										dbUrl: process.env.MONGO_URL,
-										database: process.env.organization_id,
-										collection: data.collection,
-										document: [{}],
-										organization_id: process.env.organization_id
-									}
-
-									let document = data.document[0] || data.document
-									if (document) {
-										for (let key of syncKeys) {
-											if (document[key])
-												platformUpdate.document[0][key] = document[key]
-										}
-									}
-								}
+					if (dbUrl && dbUrl[data.db[i]]) {
+						let db = dbUrl[data.db[i]]
 
-								this.databases['mongodb'][action]()
-							}
+						if (db.name && this.databases[db.name]) {
+
+							for (let i = 0; i < db.urls.length; i++) {
+								data['dbUrl'] = db.urls[i]
+								data = await this.databases[db.name][action](data)
+							}				
+	
 							//ToDo: sorting should take place here in order to return sorted values from multiple dbs
 						}
-					} 
-					
-					if (!dbsLength) {
-						if (socket) {
-							this.wsManager.broadcast(socket, action, data);
-							process.emit('changed-document', data)
-							resolve()
-						} else {
-							resolve(data)
-						}
 					}
 				}
+					
+				delete data.dbUrl
+				if (socket) {
+					this.wsManager.broadcast(socket, action, data);
+					process.emit('changed-document', data)
+					resolve()
+				} else {
+					resolve(data)
+				}
 			} catch(error) {
 				if (socket) {
 					errorHandler(data, error)