Merge branch 'main' of github.com:peoray/crowd.dev into organization-filters

Author: peoray

backend/src/bin/scripts/merge-duplicated-organizations.ts

@@ -0,0 +1,75 @@
+import { QueryTypes } from 'sequelize'
+import { getServiceLogger } from '@crowd/logging'
+import SequelizeRepository from '../../database/repositories/sequelizeRepository'
+import OrganizationService from '../../services/organizationService'
+import SegmentRepository from '@/database/repositories/segmentRepository'
+
+/* eslint-disable no-continue */
+/* eslint-disable @typescript-eslint/no-loop-func */
+
+const log = getServiceLogger()
+
+async function mergeOrganizationsWithSameWebsite(): Promise<void> {
+  const dbOptions = await SequelizeRepository.getDefaultIRepositoryOptions()
+
+  const BATCH_SIZE = 500
+
+  let offset
+  let mergeableOrganizations
+
+  const seq = SequelizeRepository.getSequelize(dbOptions)
+
+  log.info('Querying database for organizations with same website in a tenant..')
+
+  do {
+    offset = mergeableOrganizations ? offset + BATCH_SIZE : 0
+    mergeableOrganizations = await seq.query(
+      `
+        select 
+          array_agg(o.id order by o."createdAt" asc) as "organizationIds", 
+          o.website, 
+          o."tenantId" 
+        from organizations o
+        where o.website is not null and o."deletedAt" is null
+        group by o."tenantId", o.website
+        having count(o.id) > 1
+        limit ${BATCH_SIZE}
+        offset ${offset};`,
+      {
+        type: QueryTypes.SELECT,
+      },
+    )
+
+    log.info(`Found ${mergeableOrganizations.length} mergeable organizations.`)
+
+    for (const orgInfo of mergeableOrganizations) {
+      const segmentRepository = new SegmentRepository({
+        ...dbOptions,
+        currentTenant: {
+          id: orgInfo.tenantId,
+        },
+      })
+
+      const segments = (await segmentRepository.querySubprojects({ limit: null, offset: 0 })).rows
+
+      const service = new OrganizationService({
+        ...dbOptions,
+        currentTenant: {
+          id: orgInfo.tenantId,
+        },
+        currentSegments: segments,
+      })
+
+      const primaryOrganizationId = orgInfo.organizationIds.shift()
+      for (const orgId of orgInfo.organizationIds) {
+        log.info(`Merging organization ${orgId} into ${primaryOrganizationId}!`)
+        await service.merge(primaryOrganizationId, orgId)
+      }
+    }
+  } while (mergeableOrganizations.length > 0)
+}
+
+setImmediate(async () => {
+  log.info('Starting merging organizations with same website!')
+  await mergeOrganizationsWithSameWebsite()
+})

backend/src/database/migrations/U1695669657__organizationsAddWebsiteUniqueIdx.sql

@@ -0,0 +1 @@
+CREATE UNIQUE INDEX "ix_organizations_tenantId_website_not_null" ON organizations (website, "tenantId") WHERE website IS NOT NULL;

backend/src/database/migrations/V1695669657__organizationsAddWebsiteUniqueIdx.sql

@@ -1069,7 +1069,10 @@ class OrganizationRepository {
     }
 
     const identityParams = identities
-      .map((identity) => `('${identity.platform}', '${identity.name}')`)
+      .map(
+        (identity) =>
+          `('${identity.platform.replace(/'/g, "''")}', '${identity.name.replace(/'/g, "''")}')`,
+      )
       .join(', ')
 
     const results = (await sequelize.query(

backend/src/database/repositories/organizationRepository.ts

@@ -127,7 +127,7 @@ export default class OrganizationService extends LoggerBase {
         currentSegments: secondMemberSegments,
       })
 
-      // Delete toMerge member
+      // Delete toMerge organization
       await OrganizationRepository.destroy(toMergeId, repoOptions, true)
 
       await SequelizeRepository.commitTransaction(tx)
@@ -422,25 +422,28 @@ export default class OrganizationService extends LoggerBase {
         data.website = websiteNormalizer(data.website)
       }
 
-      const originalIdentities = data.identities
+      if (data.identities) {
+        const originalIdentities = data.identities
 
-      // check identities
-      await OrganizationRepository.checkIdentities(data, { ...this.options, transaction }, id)
+        // check identities
+        await OrganizationRepository.checkIdentities(data, { ...this.options, transaction }, id)
 
-      // if we found any strong identities sent already existing in another organization
-      // instead of making it a weak identity we throw an error here, because this function
-      // is mainly used for doing manual updates through UI and possibly
-      // we don't wanna do an auto-merge here or make strong identities sent by user as weak
-      if (originalIdentities.length !== data.identities.length) {
-        const alreadyExistingStrongIdentities = originalIdentities.filter(
-          (oi) => !data.identities.some((di) => di.platform === oi.platform && di.name === oi.name),
-        )
+        // if we found any strong identities sent already existing in another organization
+        // instead of making it a weak identity we throw an error here, because this function
+        // is mainly used for doing manual updates through UI and possibly
+        // we don't wanna do an auto-merge here or make strong identities sent by user as weak
+        if (originalIdentities.length !== data.identities.length) {
+          const alreadyExistingStrongIdentities = originalIdentities.filter(
+            (oi) =>
+              !data.identities.some((di) => di.platform === oi.platform && di.name === oi.name),
+          )
 
-        throw new Error(
-          `Organization identities ${JSON.stringify(
-            alreadyExistingStrongIdentities,
-          )} already exist in another organization!`,
-        )
+          throw new Error(
+            `Organization identities ${JSON.stringify(
+              alreadyExistingStrongIdentities,
+            )} already exist in another organization!`,
+          )
+        }
       }
 
       const record = await OrganizationRepository.update(id, data, {

backend/src/services/organizationService.ts

@@ -2,4 +2,7 @@ export default {
   image: '/images/integrations/crunchbase.png',
   name: 'Crunchbase',
   hideAsIntegration: true,
+  organization: {
+    handle: (identity) => (identity.url ? identity.url.split('/').at(-1) : identity.name),
+  },
 };

frontend/src/integrations/crunchbase/config.js

@@ -23,4 +23,7 @@ export default {
       number: conversation.activityCount - 1,
     }),
   },
+  organization: {
+    handle: (identity) => (identity.url ? identity.url.split('/').at(-1) : identity.name),
+  },
 };

frontend/src/integrations/devto/config.js

@@ -23,4 +23,7 @@ export default {
       number: conversation.activityCount - 1,
     }),
   },
+  organization: {
+    handle: (identity) => (identity.url ? identity.url.split('/').at(-1) : identity.name),
+  },
 };

frontend/src/integrations/discord/config.js

@@ -14,4 +14,7 @@ export default {
     showLinkToUrl: true,
   },
   url: ({ attributes }) => attributes?.url?.discourse,
+  organization: {
+    handle: (identity) => (identity.url ? identity.url.split('/').at(-1) : identity.name),
+  },
 };

frontend/src/integrations/discourse/config.js

@@ -1,4 +1,7 @@
 export default {
   image: '/images/integrations/facebook.png',
   hideAsIntegration: true,
+  organization: {
+    handle: (identity) => (identity.url ? identity.url.split('/').at(-1) : identity.name),
+  },
 };