Revert "chore: backfill email-domain member organization dates (CM-1107)" (#4063)

Author: skwowet

backend/package.json

@@ -32,8 +32,7 @@
     "script:refreshGithubRepoSettings": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true tsx src/bin/scripts/refresh-github-repo-settings.ts",
     "script:fix-duplicate-members": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true tsx src/bin/scripts/fix-duplicate-members.ts",
     "script:fix-members-activities-after-unaffilation": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true tsx src/bin/scripts/fix-members-activities-after-unaffilation.ts",
-    "script:process-bot-members": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true tsx src/bin/scripts/process-bot-members.ts",
-    "script:backfill-email-domain-member-organization-dates": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true tsx src/bin/scripts/backfill-email-domain-member-organization-dates.ts"
+    "script:process-bot-members": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true tsx src/bin/scripts/process-bot-members.ts"
   },
   "lint-staged": {
     "**/*.ts": [

backend/src/bin/scripts/backfill-email-domain-member-organization-dates.ts

@@ -58,7 +58,7 @@ export async function blockMemberOrganizationAffiliation(
 
 export async function markMemberForAffiliationRecalc(memberIds: string[]): Promise<void> {
   try {
-    await svc.redis.sAdd('recalculate-member-affiliations', memberIds)
+    await svc.redis.sAdd('queue:recalculate:members:affiliation', memberIds)
   } catch (error) {
     svc.log.error(error, 'Error marking member for affiliation recalc!')
     throw error
@@ -67,7 +67,7 @@ export async function markMemberForAffiliationRecalc(memberIds: string[]): Promi
 
 export async function getMembersForAffiliationRecalc(batchSize: number): Promise<string[]> {
   try {
-    return svc.redis.sPop('recalculate-member-affiliations', batchSize)
+    return svc.redis.sPop('queue:recalculate:members:affiliation', batchSize)
   } catch (error) {
     svc.log.error(error, 'Error getting members for affiliation recalc!')
     throw error

services/apps/script_executor_worker/src/activities/block-project-organization-affiliations.ts

@@ -14,8 +14,6 @@ import {
 import { EntityType } from '../old/apps/script_executor_worker/types'
 import { QueryExecutor } from '../queryExecutor'
 
-import { EmailDomainMemberOrganizationActivityDate } from './types'
-
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
 export async function fetchMemberOrganizations(
@@ -61,71 +59,6 @@ export async function fetchMemberOrganizationsBySource(
   )
 }
 
-export async function fetchEmailDomainMemberOrganizationsWithoutDates(
-  qx: QueryExecutor,
-  limit: number,
-  afterMemberId?: string,
-): Promise<string[]> {
-  const rows = await qx.select(
-    `
-      SELECT DISTINCT "memberId"
-      FROM "memberOrganizations"
-      WHERE "source" = 'email-domain'
-        AND "dateStart" IS NULL
-        AND "dateEnd" IS NULL
-        AND "deletedAt" IS NULL
-        ${afterMemberId ? `AND "memberId" > $(afterMemberId)` : ''}
-      ORDER BY "memberId"
-      LIMIT $(limit)
-    `,
-    { limit, afterMemberId },
-  )
-
-  return rows.map((r) => r.memberId)
-}
-
-export async function fetchEmailDomainMemberOrganizationActivityDates(
-  qx: QueryExecutor,
-  memberId: string,
-): Promise<EmailDomainMemberOrganizationActivityDate[]> {
-  return qx.select(
-    `
-      WITH email_domain_member_orgs AS (
-        SELECT DISTINCT
-          mo."memberId",
-          mo."organizationId",
-          lower(oi.value) AS domain
-        FROM "memberOrganizations" mo
-        INNER JOIN "organizationIdentities" oi
-          ON oi."organizationId" = mo."organizationId"
-          AND oi.type = 'primary-domain'
-          AND oi.verified = true
-        WHERE mo."memberId" = $(memberId)
-          AND mo."source" = 'email-domain'
-          AND mo."deletedAt" IS NULL
-      )
-      SELECT DISTINCT
-        edmo."memberId",
-        edmo."organizationId",
-        ar."timestamp"::date::text AS date
-      FROM email_domain_member_orgs edmo
-      INNER JOIN "memberIdentities" mi
-        ON mi."memberId" = edmo."memberId"
-        AND mi.verified = true
-        AND mi.type = 'email'
-        AND mi."deletedAt" IS NULL
-        AND lower(split_part(mi.value, '@', 2)) = edmo.domain
-      INNER JOIN "activityRelations" ar
-        ON ar."memberId" = mi."memberId"
-        AND ar.platform = mi.platform
-        AND lower(ar.username) = lower(mi.value)
-        AND ar."timestamp" IS NOT NULL
-      ORDER BY edmo."memberId", edmo."organizationId", date
-    `,
-    { memberId },
-  )
-}
-
 export async function fetchOrganizationMemberIds(
   qx: QueryExecutor,
   organizationId: string,

services/libs/data-access-layer/src/members/organizations.ts

@@ -1,4 +1,4 @@
-import { IAttributes, IMemberAttribute, MemberAttributeType, MemberOrgDate } from '@crowd/types'
+import { IAttributes, IMemberAttribute, MemberAttributeType } from '@crowd/types'
 
 export interface IQueryNumberOfNewMembers {
   segmentIds?: string[]
@@ -93,7 +93,3 @@ export interface IDbMemberBotSuggestionBySegment {
   avatarUrl: string
   attributes: IAttributes
 }
-
-export interface EmailDomainMemberOrganizationActivityDate extends MemberOrgDate {
-  memberId: string
-}