@cocreate/crud-server 1.20.1 → 1.20.3

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [1.20.3](https://github.com/CoCreate-app/CoCreate-crud-server/compare/v1.20.2...v1.20.3) (2023-05-10)
+
+
+### Bug Fixes
+
+* return resolve ([eafc5e5](https://github.com/CoCreate-app/CoCreate-crud-server/commit/eafc5e59c59e3a3835a85b6e46a164f11fc6a80b))
+
+## [1.20.2](https://github.com/CoCreate-app/CoCreate-crud-server/compare/v1.20.1...v1.20.2) (2023-05-07)
+
+
+### Bug Fixes
+
+* if platform org set dbUrl ([0dbafc9](https://github.com/CoCreate-app/CoCreate-crud-server/commit/0dbafc9b5ba77f3d16a5e14105a67e358ad697b8))
+
 ## [1.20.1](https://github.com/CoCreate-app/CoCreate-crud-server/compare/v1.20.0...v1.20.1) (2023-04-11)
 
 

package/package.json

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

package/src/index.js

@@ -98,29 +98,36 @@ class CoCreateCrudServer {
 		return new Promise(async (resolve) => {
 			try {
 				if (!data.organization_id)
-					resolve()
+					return resolve()
 
 				let dbUrl = this.databaseUrls.get(data.organization_id)
-				if (dbUrl === 'false' || dbUrl === false)
-					resolve()
+				if (dbUrl === false)
+					return resolve({dbUrl: false, error: 'database url could not be found'})
 
 				if (!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
+					if (data.organization_id === process.env.organization_id) {
+						dbUrl = { [this.database.name]: this.database}
 						this.databaseUrls.set(data.organization_id, dbUrl)
 					} else {
-						this.databaseUrls.set(data.organization_id, 'false')
-						console.log('organization or dbUrl urls could not be found')
-						resolve()
+						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 {
+							this.databaseUrls.set(data.organization_id, false)
+							if (organization)
+								return resolve({dbUrl: false, error: 'database url could not be found'})
+							else
+								return resolve({organization: false, error: 'organization could not be found'})
+						}
 					}
 				}