fix: resolve pr reviews and comments

Author: skwowet

backend/src/database/migrations/R__organizationEnrichmentMaterializedViews.sql

@@ -5,7 +5,7 @@ drop materialized view if exists "organizationsGlobalActivityCount" cascade;
 create materialized view "organizationsGlobalActivityCount" as
 select 
     osa."organizationId",
-    sum(osa."activityCount") as total_count
+    sum(osa."activityCount") as total_count_estimate
 from "organizationSegmentsAgg" osa
 where osa."segmentId" in (
     select id
@@ -19,4 +19,4 @@ order by sum(osa."activityCount") desc;
 create unique index ix_organization_global_activity_count_organization_id
     on "organizationsGlobalActivityCount" ("organizationId");
 
-create index ix_organization_global_activity_count on "organizationsGlobalActivityCount" (total_count);
+create index ix_organization_global_activity_count_estimate on "organizationsGlobalActivityCount" (total_count_estimate);

services/apps/members_enrichment_worker/src/workflows/enrichMember.ts

@@ -18,7 +18,6 @@ const {
   findMemberEnrichmentCache,
   insertMemberEnrichmentCache,
   touchMemberEnrichmentCacheUpdatedAt,
-  touchMemberEnrichmentLastTriedAt,
   updateMemberEnrichmentCache,
   isCacheObsolete,
   getEnrichmentInput,
@@ -62,9 +61,6 @@ export async function enrichMember(
 
       const data = await getEnrichmentData(source, enrichmentInput)
 
-      // Record enrichment attempt
-      await touchMemberEnrichmentLastTriedAt(input.id)
-
       if (!cache) {
         await insertMemberEnrichmentCache(source, input.id, data)
         if (data) {

services/apps/members_enrichment_worker/src/workflows/processMemberSources.ts

@@ -14,6 +14,7 @@ const {
   squashWorkExperiencesWithLLM,
   updateMemberUsingSquashedPayload,
   cleanAttributeValue,
+  touchMemberEnrichmentLastTriedAt,
 } = proxyActivities<typeof activities>({
   startToCloseTimeout: '2 minutes',
   retry: {
@@ -309,5 +310,7 @@ export async function processMemberSources(args: IProcessMemberSourcesArgs): Pro
     return memberUpdated
   }
 
+  await touchMemberEnrichmentLastTriedAt(args.memberId)
+
   return false
 }

services/apps/organizations_enrichment_worker/src/activities/enrichment.ts

@@ -206,7 +206,7 @@ export async function applyEnrichmentToOrganization(
   const prepared = prepareOrganizationData(
     // organization attributes are expected to be flattened
     { identities: data.identities, displayName: data.displayName, ...data.attributes },
-    OrganizationAttributeSource.ENRICHMENT_INTERNAL_API,
+    OrganizationAttributeSource.ENRICHMENT_LFX_INTERNAL_API,
     orgData,
     existingAttributes,
   )

services/apps/organizations_enrichment_worker/src/factory.ts

@@ -2,7 +2,7 @@
 import { Logger } from '@crowd/logging'
 import { OrganizationEnrichmentSource } from '@crowd/types'
 
-import EnrichmentServiceInternalAPI from './sources/internal-api/service'
+import EnrichmentServiceLFXInternalAPI from './sources/lfx-internal-api/service'
 import { IOrganizationEnrichmentService } from './types'
 
 export class OrganizationEnrichmentSourceServiceFactory {
@@ -11,8 +11,8 @@ export class OrganizationEnrichmentSourceServiceFactory {
     log: Logger,
   ): IOrganizationEnrichmentService {
     switch (source) {
-      case OrganizationEnrichmentSource.INTERNAL_API:
-        return new EnrichmentServiceInternalAPI(log)
+      case OrganizationEnrichmentSource.LFX_INTERNAL_API:
+        return new EnrichmentServiceLFXInternalAPI(log)
       default:
         throw new Error(`Organization enrichment service for ${source} is not found!`)
     }

…rker/src/sources/internal-api/service.ts …/src/sources/lfx-internal-api/service.tsservices/apps/organizations_enrichment_worker/src/sources/internal-api/service.ts renamed to services/apps/organizations_enrichment_worker/src/sources/lfx-internal-api/service.ts services/apps/organizations_enrichment_worker/src/sources/internal-api/service.ts renamed to services/apps/organizations_enrichment_worker/src/sources/lfx-internal-api/service.ts

@@ -25,11 +25,11 @@ export default class EnrichmentServiceInternalAPI
   extends LoggerBase
   implements IOrganizationEnrichmentService
 {
-  public source: OrganizationEnrichmentSource = OrganizationEnrichmentSource.INTERNAL_API
+  public source: OrganizationEnrichmentSource = OrganizationEnrichmentSource.LFX_INTERNAL_API
   public platform = `enrichment-${this.source}`
   public enrichOrganizationsWithActivityMoreThan = 10
 
-  public enrichableBySql = `"organizationsGlobalActivityCount".total_count > ${this.enrichOrganizationsWithActivityMoreThan}`
+  public enrichableBySql = `"organizationsGlobalActivityCount".total_count_estimate > ${this.enrichOrganizationsWithActivityMoreThan}`
 
   public maxConcurrentRequests = 5
 

…worker/src/sources/internal-api/types.ts …er/src/sources/lfx-internal-api/types.tsservices/apps/organizations_enrichment_worker/src/sources/internal-api/types.ts renamed to services/apps/organizations_enrichment_worker/src/sources/lfx-internal-api/types.ts services/apps/organizations_enrichment_worker/src/sources/internal-api/types.ts renamed to services/apps/organizations_enrichment_worker/src/sources/lfx-internal-api/types.ts

@@ -1,6 +1,6 @@
 import { IOrganizationIdentity, OrganizationEnrichmentSource } from '@crowd/types'
 
-import { IOrganizationEnrichmentDataInternalAPI } from './sources/internal-api/types'
+import { IOrganizationEnrichmentDataInternalAPI } from './sources/lfx-internal-api/types'
 
 export interface IOrganizationEnrichmentSourceInput {
   organizationId: string

services/apps/organizations_enrichment_worker/src/types.ts

@@ -59,9 +59,6 @@ export async function enrichOrganization(
   // Fetch new enrichment data
   const data = await getEnrichmentData(source, enrichmentInput)
 
-  // Record enrichment attempt
-  await touchOrganizationEnrichmentLastTriedAt(input.id)
-
   let changeInEnrichmentSourceData = false
 
   if (!cache) {
@@ -84,9 +81,12 @@ export async function enrichOrganization(
     }
   }
 
-  // Apply enrichment only if there’s new data to apply
+  // Apply enrichment only if there's new data to apply
   if (changeInEnrichmentSourceData && data) {
     const normalized = await normalizeEnrichmentData(source, data)
     await applyEnrichmentToOrganization(input.id, normalized)
   }
+
+  // Record enrichment processing attempt
+  await touchOrganizationEnrichmentLastTriedAt(input.id)
 }

services/apps/organizations_enrichment_worker/src/workflows/enrichOrganization.ts

@@ -23,7 +23,7 @@ export async function triggerOrganizationsEnrichment(
   input: ITriggerOrganizationsEnrichmentInput,
 ): Promise<void> {
   const QUERY_FOR_ENRICHABLE_ORGANIZATIONS_PER_RUN = input.perRunLimit ?? 500
-  const source = OrganizationEnrichmentSource.INTERNAL_API
+  const source = OrganizationEnrichmentSource.LFX_INTERNAL_API
 
   const organizations = await getEnrichableOrganizations(
     QUERY_FOR_ENRICHABLE_ORGANIZATIONS_PER_RUN,