feat: add logs

Author: ulemons

services/apps/script_executor_worker/src/activities.ts

@@ -17,6 +17,8 @@ import {
   syncRemoveOrganization,
 } from './activities/cleanup/organization'
 import {
+  countOrphanMembersSegmentsAgg,
+  countOrphanOrganizationSegmentsAgg,
   deleteOrphanMembersSegmentsAgg,
   deleteOrphanOrganizationSegmentsAgg,
   getOrphanMembersSegmentsAgg,
@@ -100,6 +102,8 @@ export {
   calculateMemberAffiliations,
   startOrphanCleanupRun,
   updateOrphanCleanupRun,
+  countOrphanMembersSegmentsAgg,
+  countOrphanOrganizationSegmentsAgg,
   getOrphanMembersSegmentsAgg,
   deleteOrphanMembersSegmentsAgg,
   getOrphanOrganizationSegmentsAgg,

services/apps/script_executor_worker/src/activities/cleanup/segments-agg.ts

@@ -1,8 +1,10 @@
 import {
+  countOrphanMemberSegmentsAgg as countMemberSegmentsAgg,
   deleteOrphanMemberSegmentsAgg as deleteMemberSegmentsAgg,
   getOrphanMemberSegmentsAgg as getMemberSegmentsAgg,
 } from '@crowd/data-access-layer/src/members/segmentsAgg'
 import {
+  countOrphanOrganizationSegmentsAgg as countOrganizationSegmentsAgg,
   deleteOrphanOrganizationSegmentsAgg as deleteOrganizationSegmentsAgg,
   getOrphanOrganizationSegmentsAgg as getOrganizationSegmentsAgg,
 } from '@crowd/data-access-layer/src/organizations/segmentsAgg'
@@ -72,3 +74,21 @@ export async function deleteOrphanOrganizationSegmentsAgg(organizationId: string
     throw error
   }
 }
+
+export async function countOrphanMembersSegmentsAgg(): Promise<number> {
+  try {
+    return countMemberSegmentsAgg(dbStoreQx(svc.postgres.reader))
+  } catch (error) {
+    svc.log.error(error, 'Error counting orphan memberSegmentsAgg records!')
+    throw error
+  }
+}
+
+export async function countOrphanOrganizationSegmentsAgg(): Promise<number> {
+  try {
+    return countOrganizationSegmentsAgg(dbStoreQx(svc.postgres.reader))
+  } catch (error) {
+    svc.log.error(error, 'Error counting orphan organizationSegmentsAgg records!')
+    throw error
+  }
+}

services/apps/script_executor_worker/src/workflows/cleanup/memberSegmentsAgg.ts

@@ -7,6 +7,7 @@ import { chunkArray } from '../../utils/common'
 const {
   startOrphanCleanupRun,
   updateOrphanCleanupRun,
+  countOrphanMembersSegmentsAgg,
   getOrphanMembersSegmentsAgg,
   deleteOrphanMembersSegmentsAgg,
 } = proxyActivities<typeof activities>({
@@ -28,6 +29,10 @@ export async function cleanupMemberSegmentsAgg(args: IScriptBatchTestArgs): Prom
     // Initialize the cleanup run only on the first iteration
     if (!args.cleanupRunId) {
       runId = await startOrphanCleanupRun(AGGREGATE_NAME)
+      
+      // Get and log total count of orphans on first run
+      const totalCount = await countOrphanMembersSegmentsAgg()
+      console.log(`Total orphan ${AGGREGATE_NAME} records to delete: ${totalCount}`)
     } else {
       runId = args.cleanupRunId
     }

services/apps/script_executor_worker/src/workflows/cleanup/organizationSegmentsAgg.ts

@@ -7,6 +7,7 @@ import { chunkArray } from '../../utils/common'
 const {
   startOrphanCleanupRun,
   updateOrphanCleanupRun,
+  countOrphanOrganizationSegmentsAgg,
   getOrphanOrganizationSegmentsAgg,
   deleteOrphanOrganizationSegmentsAgg,
 } = proxyActivities<typeof activities>({
@@ -28,6 +29,10 @@ export async function cleanupOrganizationSegmentAgg(args: IScriptBatchTestArgs):
     // Initialize the cleanup run only on the first iteration
     if (!args.cleanupRunId) {
       runId = await startOrphanCleanupRun(AGGREGATE_NAME)
+      
+      // Get and log total count of orphans on first run
+      const totalCount = await countOrphanOrganizationSegmentsAgg()
+      console.log(`Total orphan ${AGGREGATE_NAME} records to delete: ${totalCount}`)
     } else {
       runId = args.cleanupRunId
     }

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

@@ -1,5 +1,19 @@
 import { QueryExecutor } from '../queryExecutor'
 
+export async function countOrphanMemberSegmentsAgg(qx: QueryExecutor): Promise<number> {
+  const result = await qx.selectOneOrNone(
+    `
+    SELECT COUNT(*) as count
+    FROM "memberSegmentsAgg" msa
+    LEFT JOIN members m ON msa."memberId" = m.id
+    WHERE m.id IS NULL
+    `,
+    {},
+  )
+
+  return parseInt(result?.count || '0', 10)
+}
+
 export async function getOrphanMemberSegmentsAgg(
   qx: QueryExecutor,
   batchSize: number,

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

@@ -1,5 +1,19 @@
 import { QueryExecutor } from '../queryExecutor'
 
+export async function countOrphanOrganizationSegmentsAgg(qx: QueryExecutor): Promise<number> {
+  const result = await qx.selectOneOrNone(
+    `
+    SELECT COUNT(*) as count
+    FROM "organizationSegmentsAgg" osa
+    LEFT JOIN organizations o ON osa."organizationId" = o.id
+    WHERE o.id IS NULL
+    `,
+    {},
+  )
+
+  return parseInt(result?.count || '0', 10)
+}
+
 export async function getOrphanOrganizationSegmentsAgg(
   qx: QueryExecutor,
   batchSize: number,