@cocreate/crud-server 1.34.1 → 1.34.3

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [1.34.3](https://github.com/CoCreate-app/CoCreate-crud-server/compare/v1.34.2...v1.34.3) (2024-01-30)
+
+
+### Bug Fixes
+
+* removed getHostOld() and getOrganizationOld() ([956c472](https://github.com/CoCreate-app/CoCreate-crud-server/commit/956c472c4ebbc8eeb36f4d612f19ec70ffba241c))
+
+## [1.34.2](https://github.com/CoCreate-app/CoCreate-crud-server/compare/v1.34.1...v1.34.2) (2024-01-18)
+
+
+### Bug Fixes
+
+* improved handling of organization object ([7798bf7](https://github.com/CoCreate-app/CoCreate-crud-server/commit/7798bf7b4feba9b0bcc226c37d890b3c6b9b5e99))
+
 ## [1.34.1](https://github.com/CoCreate-app/CoCreate-crud-server/compare/v1.34.0...v1.34.1) (2024-01-17)
 
 

package/package.json

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

package/src/index.js

@@ -63,7 +63,8 @@ class CoCreateCrudServer {
                 if (!data.organization_id || !this.config)
                     return resolve()
 
-                let organization = await this.getOrganization(data.organization_id)
+                let organization = await this.getOrganization(data)
+
                 if (organization.error)
                     return resolve(organization)
 
@@ -105,7 +106,7 @@ class CoCreateCrudServer {
                                 }
                             }
 
-                            this.send(platformUpdate)
+                            // this.send(platformUpdate)
                         }
                     }
                 }
@@ -192,64 +193,79 @@ class CoCreateCrudServer {
         });
     }
 
-    async getHost(host) {
-        if (this.hosts[host]) {
-            return await this.hosts[host]
-        } else {
-            this.hosts[host] = this.getOrg(null, host)
-            this.hosts[host] = await this.hosts[host]
-            return this.hosts[host]
-        }
-
-    }
 
-    async getOrganization(organization_id, platform) {
-        if (this.organizations[organization_id]) {
-            return await this.organizations[organization_id]
+    async getOrganization(data) {
+        if (this.hosts[data.host]) {
+            return await this.hosts[data.host]
+        } else if (this.organizations[data.organization_id]) {
+            return await this.organizations[data.organization_id]
         } else {
-            this.organizations[organization_id] = this.getOrg(organization_id, null, platform)
-            this.organizations[organization_id] = await this.organizations[organization_id]
-            return this.organizations[organization_id]
+            if (data.organization_id) {
+                this.organizations[data.organization_id] = this.getOrg(data)
+                this.organizations[data.organization_id] = await this.organizations[data.organization_id]
+                return this.organizations[data.organization_id]
+            } else if (data.host) {
+                // this.hosts[data.host] = this.getOrg(data)
+                this.hosts[data.host] = await this.getOrg(data)
+                return this.hosts[data.host]
+            }
         }
     }
 
-    async getOrg(organization_id, host, platform = true) {
-        let data = {
+    async getOrg(data) {
+        let query = {
             method: 'object.read',
-            host,
+            host: data.host,
             database: this.config.organization_id,
             array: 'organizations',
             organization_id: this.config.organization_id
         }
 
-        if (!platform)
-            data.database = data.organization_id = organization_id
+        if (this.organizations[data.organization_id])
+            data.database = data.organization_id = data.organization_id
 
-        if (organization_id)
-            data.object = [{ _id: organization_id }]
-        else if (host)
-            data.$filter = {
-                query: { host: { $elemMatch: { name: { $in: [host] } } } }
+        if (data.organization_id)
+            query.object = [{ _id: data.organization_id }]
+        else if (data.host)
+            query.$filter = {
+                query: { host: { $elemMatch: { name: { $in: [data.host] } } } },
+                limit: 1
             }
         else
             return { serverOrganization: false, error: 'An organization could not be found' }
 
-        if (data.organization_id === this.config.organization_id)
-            this.organizations[organization_id] = this.config
+        if (!this.organizations[query.organization_id] && query.organization_id === this.config.organization_id)
+            this.organizations[query.organization_id] = { ...this.config, isConfig: true }
 
-        let organization = await this.send(data)
+        let organization = await this.send(query)
 
         if (organization
             && organization.object
             && organization.object[0]) {
-            return organization.object[0]
-        } else {
-            return { serverOrganization: false, error: 'An organization could not be found' }
+            if (!this.organizations[organization.object[0]._id] || this.organizations[query.organization_id].isConfig) {
+                this.organizations[organization.object[0]._id] = organization.object[0]
+
+                delete query.$filter
+                query.database = query.organization_id = organization.object[0]._id
+                let org = await this.send(query)
+                if (org
+                    && org.object
+                    && org.object[0]) {
+                    if (data.host)
+                        this.hosts[data.host] = org.object[0]
+                    return org.object[0]
+                } else {
+                    return { serverOrganization: false, error: 'An organization could not be found in the specified dbUrl' }
+                }
+            } else {
+                if (data.host)
+                    this.hosts[data.host] = organization.object[0]
+                return organization.object[0]
+            }
         }
-
+        return { serverOrganization: false, error: 'An organization could not be found' }
     }
 
-
     errorHandler(data, error, database, array) {
         if (typeof error == 'object')
             error['storage'] = 'mongodb'