Merge branch 'improve/CM-1105' into script/CM-1107

Author: skwowet

services/apps/cron_service/package.json

@@ -2,7 +2,7 @@
   "name": "@crowd/cron-service",
   "private": true,
   "scripts": {
-    "start": "SERVICE=cron-service tsx src/main.ts",
+    "start": "SERVICE=cron-service LOG_LEVEL=trace tsx src/main.ts",
     "start:debug:local": "set -a && . ../../../backend/.env.dist.local && . ../../../backend/.env.override.local && set +a && SERVICE=cron-service LOG_LEVEL=trace tsx --inspect=0.0.0.0:9232 src/main.ts",
     "start:debug": "SERVICE=cron-service LOG_LEVEL=trace tsx --inspect=0.0.0.0:9232 src/main.ts",
     "dev:local": "nodemon --watch src --watch ../../libs --ext ts --exec pnpm run start:debug:local",

services/apps/cron_service/src/jobs/inferMemberOrganizationStintChanges.job.ts

@@ -5,11 +5,18 @@ import {
   MEMBER_ORG_STINT_CHANGES_QUEUE,
   inferMemberOrganizationStintChanges,
 } from '@crowd/common_services'
-import { fetchMemberOrganizationsBySource } from '@crowd/data-access-layer'
+import {
+  QueryExecutor,
+  changeMemberOrganizationAffiliationOverrides,
+  checkOrganizationAffiliationPolicy,
+  createMemberOrganization,
+  fetchMemberOrganizationsBySource,
+  updateMemberOrganization,
+} from '@crowd/data-access-layer'
 import { WRITE_DB_CONFIG, getDbConnection } from '@crowd/data-access-layer/src/database'
 import { pgpQx } from '@crowd/data-access-layer/src/queryExecutor'
 import { REDIS_CONFIG, getRedisClient } from '@crowd/redis'
-import { OrganizationSource } from '@crowd/types'
+import { MemberOrgStintChange, OrganizationSource } from '@crowd/types'
 
 import { IJobDefinition } from '../types'
 
@@ -19,32 +26,31 @@ const job: IJobDefinition = {
   timeout: 10 * 60,
   process: async (ctx) => {
     const redis = await getRedisClient(REDIS_CONFIG())
-    const db = await getDbConnection(WRITE_DB_CONFIG(), 2, 0)
+    const db = await getDbConnection(WRITE_DB_CONFIG())
     const qx = pgpQx(db)
 
-    // 1. Get a batch of work
+    ctx.log.info('Starting member organization stint inference job.')
+
     const memberIds = await redis.sRandMemberCount(MEMBER_ORG_STINT_CHANGES_QUEUE, 500)
     if (!memberIds?.length) return
 
-    ctx.log.info({ count: memberIds.length }, 'Processing pending members.')
-    const stats = { processed: 0, inserts: 0, updates: 0 }
+    ctx.log.info({ count: memberIds.length }, 'Processing members from queue.')
+
+    let processed = 0
 
     for (const memberId of memberIds) {
       try {
         const datesKey = `${MEMBER_ORG_STINT_CHANGES_DATES_PREFIX}:${memberId}`
         const hash = await redis.hGetAll(datesKey)
 
-        // If no data, just remove from queue and move on
         if (!hash || Object.keys(hash).length === 0) {
           await redis.sRem(MEMBER_ORG_STINT_CHANGES_QUEUE, memberId)
           continue
         }
 
-        // 2. Parse Redis data into domain objects
         const { activityDates, orgIds } = parseMemberActivityHash(hash)
 
         if (activityDates.length > 0) {
-          // 3. Compare with DB and calculate delta
           const existingOrgs = await fetchMemberOrganizationsBySource(
             qx,
             memberId,
@@ -54,26 +60,25 @@ const job: IJobDefinition = {
           const changes = inferMemberOrganizationStintChanges(memberId, existingOrgs, activityDates)
 
           if (changes.length > 0) {
-            ctx.log.info({ memberId, count: changes.length }, 'Stint changes identified.')
-            stats.inserts += changes.filter((c) => c.type === 'insert').length
-            stats.updates += changes.filter((c) => c.type === 'update').length
+            ctx.log.debug({ memberId, changes }, 'Stint changes identified.')
+            await applyStintChanges(qx, changes)
           }
         }
 
-        // 4. Cleanup: Remove only the fields we actually read
+        // Remove only the fields we actually read
         await redis
           .multi()
           .hDel(datesKey, orgIds)
           .sRem(MEMBER_ORG_STINT_CHANGES_QUEUE, memberId)
           .exec()
 
-        stats.processed++
+        processed++
       } catch (err) {
         ctx.log.error(err, { memberId }, 'Failed to process member stint inference.')
       }
     }
 
-    ctx.log.info(stats, 'Batch complete.')
+    ctx.log.info({ processed }, 'Batch complete.')
   },
 }
 
@@ -97,4 +102,40 @@ function parseMemberActivityHash(hash: Record<string, string>) {
   return { activityDates, orgIds }
 }
 
+/**
+ * Applies the stint changes to the database.
+ */
+async function applyStintChanges(qx: QueryExecutor, changes: MemberOrgStintChange[]) {
+  for (const change of changes) {
+    if (change.type === 'insert') {
+      const memberOrganizationId = await createMemberOrganization(qx, change.memberId, {
+        organizationId: change.organizationId,
+        dateStart: change.dateStart,
+        dateEnd: change.dateEnd,
+        source: OrganizationSource.EMAIL_DOMAIN,
+      })
+
+      const isAffiliationBlocked = await checkOrganizationAffiliationPolicy(
+        qx,
+        change.organizationId,
+      )
+
+      if (memberOrganizationId && isAffiliationBlocked) {
+        await changeMemberOrganizationAffiliationOverrides(qx, [
+          {
+            memberId: change.memberId,
+            memberOrganizationId,
+            allowAffiliation: false,
+          },
+        ])
+      }
+    } else {
+      await updateMemberOrganization(qx, change.memberId, change.id, {
+        dateStart: change.dateStart,
+        dateEnd: change.dateEnd,
+      })
+    }
+  }
+}
+
 export default job

services/apps/data_sink_worker/package.json

@@ -2,7 +2,7 @@
   "name": "@crowd/data-sink-worker",
   "private": true,
   "scripts": {
-    "start": "SERVICE=data-sink-worker tsx src/main.ts",
+    "start": "SERVICE=data-sink-worker LOG_LEVEL=trace tsx src/main.ts",
     "start:debug:local": "set -a && . ../../../backend/.env.dist.local && . ../../../backend/.env.override.local && set +a && SERVICE=data-sink-worker LOG_LEVEL=trace tsx --inspect=0.0.0.0:9233 src/main.ts",
     "start:debug": "SERVICE=data-sink-worker LOG_LEVEL=trace tsx --inspect=0.0.0.0:9233 src/main.ts",
     "dev:local": "nodemon --watch src --watch ../../libs --ext ts --exec pnpm run start:debug:local",