Prevent duplicate organization creation via website check

Author: skwowet

backend/src/services/organizationService.ts

@@ -329,8 +329,14 @@ export default class OrganizationService extends LoggerBase {
       }
 
       let record
+      let existing
 
-      const existing = await OrganizationRepository.findByIdentity(primaryIdentity, this.options)
+      // check if organization already exists using website or primary identity 
+      if (data.website) {
+        existing = await OrganizationRepository.findByDomain(data.website, this.options)
+      } else {
+        existing = await OrganizationRepository.findByIdentity(primaryIdentity, this.options)
+      }
 
       if (existing) {
         await OrganizationRepository.checkIdentities(data, this.options, existing.id)

services/apps/data_sink_worker/src/service/organization.service.ts

@@ -115,8 +115,14 @@ export class OrganizationService extends LoggerBase {
           }
         }
 
-        // now check if exists in this tenant using the primary identity
-        const existing = await txRepo.findByIdentity(tenantId, primaryIdentity)
+        let existing
+
+        // now check if exists in this tenant using the website or primary identity
+        if (data.website) {
+          existing = await txRepo.findByDomain(tenantId, segmentId, data.website)
+        } else {
+          existing = await txRepo.findByIdentity(tenantId, primaryIdentity)
+        }
 
         let attributes = existing?.attributes