Normalize existing website column of organization

backend/src/database/migrations/U1694533080__normalizeOrgWebsiteColumn.sql

@@ -0,0 +1 @@
+-- it's a destructive operation in up migration, so we can't really undo it

backend/src/database/migrations/V1694533080__normalizeOrgWebsiteColumn.sql

@@ -0,0 +1,23 @@
+DO
+$$
+    DECLARE
+        org_record  organizations%ROWTYPE;
+        correct_url text;
+    BEGIN
+        FOR org_record IN (SELECT *
+                           FROM organizations
+                           WHERE website LIKE 'http://%'
+                              OR website LIKE 'https://%'
+                              OR website LIKE 'www.%')
+            LOOP
+                correct_url := (SELECT CASE
+                                           WHEN position('www.' in org_record.website) > 0 THEN
+                                               split_part(split_part(org_record.website, 'www.', 2), '/', 1)
+                                           ELSE
+                                               split_part(split_part(org_record.website, '//', 2), '/', 1)
+                                           END);
+                RAISE NOTICE 'org id: %, fixed url: %', org_record.id, correct_url;
+                UPDATE organizations SET website = correct_url WHERE id = org_record.id;
+            END LOOP;
+    END;
+$$;

backend/src/database/repositories/organizationRepository.ts

@@ -1279,16 +1279,7 @@ class OrganizationRepository {
     // Check if organization exists
     const organization = await options.database.organization.findOne({
       where: {
-        website: {
-          [Sequelize.Op.or]: [
-            // Matches URLs having 'http://' or 'https://'
-            { [Sequelize.Op.iLike]: `%://${domain}` },
-            // Matches URLs having 'www'
-            { [Sequelize.Op.iLike]: `%://www.${domain}` },
-            // Matches URLs that doesn't have 'http://' or 'https://' and 'www'
-            { [Sequelize.Op.iLike]: `${domain}` },
-          ],
-        },
+        website: domain,
         tenantId: currentTenant.id,
       },
       transaction,

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

@@ -323,11 +323,7 @@ export class OrganizationRepository extends RepositoryBase<OrganizationRepositor
         organizations o
       WHERE
         o."tenantId" = $(tenantId) AND 
-        (
-          o.website ILIKE $(protocolDomain) OR
-          o.website ILIKE $(domainWithWww) OR
-          o.website ILIKE $(domain)
-        ) AND
+        o.website = $(domain) AND
         o.id IN (
           SELECT os."organizationId"
           FROM "organizationSegments" os
@@ -336,8 +332,6 @@ export class OrganizationRepository extends RepositoryBase<OrganizationRepositor
       `,
       {
         tenantId,
-        protocolDomain: `%://${domain}`,
-        domainWithWww: `%://www.${domain}`,
         domain,
         segmentId,
       },