fix: resolve pr review comments

Signed-off-by: Yeganathan S <63534555+skwowet@users.noreply.github.com>

Author: skwowet

services/libs/data-access-layer/src/member-organization-affiliation/index.test.ts

@@ -1,4 +1,4 @@
-import { test as base, describe, expect } from 'vitest'
+import { afterEach, test as base, beforeEach, describe, expect, vi } from 'vitest'
 
 import type { QueryExecutor } from '@crowd/database'
 import { withQx } from '@crowd/test-kit/db'
@@ -40,6 +40,18 @@ const test = withQx(base)
 
 const EPOCH = new Date('1970-01-01').toISOString()
 
+/** Frozen "now" so prepare() dateEnd boundaries stay deterministic. */
+const NOW = '2024-06-15T00:00:00.000Z'
+
+beforeEach(() => {
+  vi.useFakeTimers({ toFake: ['Date'] })
+  vi.setSystemTime(new Date(NOW))
+})
+
+afterEach(() => {
+  vi.useRealTimers()
+})
+
 const SEGMENT_TREES = withSegmentDefaults([
   {
     name: 'Cloud Native Computing Foundation',
@@ -104,7 +116,7 @@ function expectTimeline(
   expected: Array<{
     organizationId: string | null
     dateStart: string
-    dateEnd: unknown
+    dateEnd: string | null
     segmentId?: string | null
     matchEmailDomain?: string | null
   }>,
@@ -149,9 +161,7 @@ describe('prepareMemberOrganizationAffiliationTimeline', () => {
 
     const timeline = await prepareMemberOrganizationAffiliationTimeline(qx, member.id)
 
-    expectTimeline(baseItems(timeline), [
-      { organizationId: null, dateStart: EPOCH, dateEnd: expect.any(String) },
-    ])
+    expectTimeline(baseItems(timeline), [{ organizationId: null, dateStart: EPOCH, dateEnd: NOW }])
     expect(manualItems(timeline)).toHaveLength(0)
     expect(emailItems(timeline)).toHaveLength(0)
   })
@@ -176,7 +186,7 @@ describe('prepareMemberOrganizationAffiliationTimeline', () => {
     const timeline = await prepareMemberOrganizationAffiliationTimeline(qx, member.id)
 
     expectTimeline(baseItems(timeline), [
-      { organizationId: org.id, dateStart: EPOCH, dateEnd: expect.any(String) },
+      { organizationId: org.id, dateStart: EPOCH, dateEnd: NOW },
     ])
   })
 
@@ -206,17 +216,24 @@ describe('prepareMemberOrganizationAffiliationTimeline', () => {
     ])
 
     const timeline = await prepareMemberOrganizationAffiliationTimeline(qx, member.id)
-    const base = baseItems(timeline)
-    const orgIds = base.map((item) => item.organizationId)
 
-    expect(orgIds[0]).toBe(undated.id)
-    expect(base[0].dateStart).toBe(EPOCH)
-    expect(orgIds).toContain(employer.id)
-    expect(base.find((item) => item.organizationId === employer.id)?.dateStart).toBe(
-      '2017-07-01T00:00:00.000Z',
-    )
-    // Dated stint ended — undated fills the post-career gap through now as well.
-    expect(orgIds[orgIds.length - 1]).toBe(undated.id)
+    expectTimeline(baseItems(timeline), [
+      {
+        organizationId: undated.id,
+        dateStart: EPOCH,
+        dateEnd: '2017-06-30T00:00:00.000Z',
+      },
+      {
+        organizationId: employer.id,
+        dateStart: '2017-07-01T00:00:00.000Z',
+        dateEnd: '2020-01-01T00:00:00.000Z',
+      },
+      {
+        organizationId: undated.id,
+        dateStart: '2020-01-02T00:00:00.000Z',
+        dateEnd: null,
+      },
+    ])
   })
 
   test('gap between jobs is filled by the undated fallback', async ({ qx }) => {
@@ -386,9 +403,7 @@ describe('prepareMemberOrganizationAffiliationTimeline', () => {
 
     const timeline = await prepareMemberOrganizationAffiliationTimeline(qx, member.id)
 
-    expectTimeline(baseItems(timeline), [
-      { organizationId: null, dateStart: EPOCH, dateEnd: expect.any(String) },
-    ])
+    expectTimeline(baseItems(timeline), [{ organizationId: null, dateStart: EPOCH, dateEnd: NOW }])
   })
 
   test('primary undated MO wins over other undated as fallback', async ({ qx }) => {
@@ -426,7 +441,7 @@ describe('prepareMemberOrganizationAffiliationTimeline', () => {
     const timeline = await prepareMemberOrganizationAffiliationTimeline(qx, member.id)
 
     expectTimeline(baseItems(timeline), [
-      { organizationId: orgB.id, dateStart: EPOCH, dateEnd: expect.any(String) },
+      { organizationId: orgB.id, dateStart: EPOCH, dateEnd: NOW },
     ])
     expect(baseItems(timeline).every((item) => item.organizationId !== orgA.id)).toBe(true)
   })
@@ -753,7 +768,7 @@ describe('prepareMemberOrganizationAffiliationTimeline', () => {
       {
         organizationId: null,
         dateStart: '2024-02-02T00:00:00.000Z',
-        dateEnd: expect.any(String),
+        dateEnd: NOW,
       },
     ])
   })
@@ -800,7 +815,7 @@ describe('prepareMemberOrganizationAffiliationTimeline', () => {
       {
         organizationId: null,
         dateStart: '2023-01-02T00:00:00.000Z',
-        dateEnd: expect.any(String),
+        dateEnd: NOW,
       },
     ])
   })
@@ -880,7 +895,7 @@ describe('prepareMemberOrganizationAffiliationTimeline', () => {
       {
         organizationId: null,
         dateStart: '2023-01-02T00:00:00.000Z',
-        dateEnd: expect.any(String),
+        dateEnd: NOW,
       },
     ])
   })
@@ -959,7 +974,7 @@ describe('prepareMemberOrganizationAffiliationTimeline', () => {
       {
         organizationId: null,
         dateStart: '2022-01-02T00:00:00.000Z',
-        dateEnd: expect.any(String),
+        dateEnd: NOW,
       },
     ])
   })
@@ -1347,4 +1362,32 @@ describe('refreshMemberOrganizationAffiliations', () => {
     expect(await countByOrg(qx, member.id, kubernetes.id, company.id)).toBe(16) // 10 GH + 6 @intel.com
     expect(await countByOrg(qx, member.id, kubernetes.id, university.id)).toBe(8) // @nyu.edu
   })
+
+  test('clears stale organizationId when timeline resolves to null', async ({ qx }) => {
+    const [staleOrg] = await createOrganizations(
+      qx,
+      withOrganizationDefaults([{ displayName: 'Stale Co' }]),
+    )
+    const { member, identities } = await createMemberWithIdentity(qx, { value: 'no-employer' })
+    const { kubernetes } = await createLeafSegments(qx)
+
+    // No member organizations → prepare yields a null fallback for the whole timeline.
+    const seeded = await createActivityRelations(
+      qx,
+      generateActivityRelations({
+        memberId: member.id,
+        segmentId: kubernetes.id,
+        identities,
+        count: 20,
+        timestamp: { from: '2021-01-01T00:00:00.000Z', to: '2021-06-01T00:00:00.000Z' },
+      }).map((row) => ({ ...row, organizationId: staleOrg.id })),
+    )
+
+    expect(await countByOrg(qx, member.id, kubernetes.id, staleOrg.id)).toBe(seeded.length)
+
+    await refreshMemberOrganizationAffiliations(qx, member.id)
+
+    expect(await countByOrg(qx, member.id, kubernetes.id, staleOrg.id)).toBe(0)
+    expect(await countByOrg(qx, member.id, kubernetes.id, null)).toBe(seeded.length)
+  })
 })