test: update tests with new scenarios

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

@@ -588,8 +588,8 @@ describe('prepareMemberOrganizationAffiliationTimeline', () => {
     const [company, university] = await createOrganizations(
       qx,
       withOrganizationDefaults([
-        { displayName: 'Acme Corp' },
-        { displayName: 'Sharda University' },
+        { displayName: 'Intel Corporation' },
+        { displayName: 'New York University' },
       ]),
     )
     const [member] = await createMembers(qx, withMemberDefaults([{}]))
@@ -598,42 +598,49 @@ describe('prepareMemberOrganizationAffiliationTimeline', () => {
       {
         organizationId: company.id,
         platform: 'integration',
-        value: 'acme.com',
+        value: 'intel.com',
         type: OrganizationIdentityType.PRIMARY_DOMAIN,
         verified: true,
       },
       {
         organizationId: university.id,
         platform: 'integration',
-        value: 'sharda.edu',
+        value: 'nyu.edu',
         type: OrganizationIdentityType.PRIMARY_DOMAIN,
         verified: true,
       },
     ])
 
+    // Same source; university stint is longer. Without company-over-uni, longest-range
+    // (and equal source rank) would pick the university for the overlap.
     await createMemberOrganizations(qx, [
       {
         memberId: member.id,
-        organizationId: company.id,
+        organizationId: university.id,
         dateStart: '2021-01-01T00:00:00.000Z',
         dateEnd: '2022-01-01T00:00:00.000Z',
-        title: 'Engineer',
-        source: OrganizationSource.UI,
+        title: 'Student Researcher',
+        source: OrganizationSource.ENRICHMENT_CRUSTDATA,
       },
       {
         memberId: member.id,
-        organizationId: university.id,
+        organizationId: company.id,
         dateStart: '2021-06-01T00:00:00.000Z',
-        dateEnd: '2022-03-01T00:00:00.000Z',
-        title: 'Student Researcher',
+        dateEnd: '2021-09-01T00:00:00.000Z',
+        title: 'Engineer',
         source: OrganizationSource.ENRICHMENT_CRUSTDATA,
       },
     ])
 
     const timeline = await prepareMemberOrganizationAffiliationTimeline(qx, member.id)
     const base = baseItems(timeline)
 
-    // Company wins the overlap, so university must not open a range at its own dateStart.
+    expect(
+      base.some(
+        (item) =>
+          item.organizationId === company.id && item.dateStart === '2021-06-01T00:00:00.000Z',
+      ),
+    ).toBe(true)
     expect(
       base.some(
         (item) =>
@@ -643,11 +650,9 @@ describe('prepareMemberOrganizationAffiliationTimeline', () => {
     expect(
       base.some(
         (item) =>
-          item.organizationId === company.id && item.dateStart === '2021-01-01T00:00:00.000Z',
+          item.organizationId === university.id && item.dateStart === '2021-01-01T00:00:00.000Z',
       ),
     ).toBe(true)
-    // University-only tail after the company ends is fine.
-    expect(base.some((item) => item.organizationId === university.id)).toBe(true)
   })
 
   test('verified primary-domain yields an email timeline item', async ({ qx }) => {
@@ -824,6 +829,8 @@ describe('refreshMemberOrganizationAffiliations', () => {
       withOrganizationDefaults([{ displayName: 'Red Hat' }, { displayName: 'Previous Employer' }]),
     )
     const { member, identities } = await createMemberWithIdentity(qx, {
+      platform: PlatformType.GITHUB,
+      type: MemberIdentityType.EMAIL,
       value: 'dev@redhat.com',
     })
     const { kubernetes } = await createLeafSegments(qx)
@@ -872,4 +879,112 @@ describe('refreshMemberOrganizationAffiliations', () => {
     expect(await countByOrg(qx, member.id, kubernetes.id, emailOrg.id)).toBe(seeded.length)
     expect(await countByOrg(qx, member.id, kubernetes.id, datedOrg.id)).toBe(0)
   })
+
+  test('during company/university overlap, non-email follows company while email domains keep their orgs', async ({
+    qx,
+  }) => {
+    const [company, university] = await createOrganizations(
+      qx,
+      withOrganizationDefaults([
+        { displayName: 'Intel Corporation' },
+        { displayName: 'New York University' },
+      ]),
+    )
+    const [member] = await createMembers(qx, withMemberDefaults([{}]))
+    const { kubernetes } = await createLeafSegments(qx)
+
+    const [githubIdentity, uniEmailIdentity, companyEmailIdentity] = await createMemberIdentities(
+      qx,
+      withMemberIdentityDefaults([
+        {
+          memberId: member.id,
+          platform: PlatformType.GITHUB,
+          type: MemberIdentityType.USERNAME,
+          value: 'student-dev',
+        },
+        {
+          memberId: member.id,
+          platform: PlatformType.GITHUB,
+          type: MemberIdentityType.EMAIL,
+          value: 'student@nyu.edu',
+        },
+        {
+          memberId: member.id,
+          platform: PlatformType.GITHUB,
+          type: MemberIdentityType.EMAIL,
+          value: 'eng@intel.com',
+        },
+      ]),
+    )
+
+    await createOrganizationIdentities(qx, [
+      {
+        organizationId: company.id,
+        platform: 'integration',
+        value: 'intel.com',
+        type: OrganizationIdentityType.PRIMARY_DOMAIN,
+        verified: true,
+      },
+      {
+        organizationId: university.id,
+        platform: 'integration',
+        value: 'nyu.edu',
+        type: OrganizationIdentityType.PRIMARY_DOMAIN,
+        verified: true,
+      },
+    ])
+
+    await createMemberOrganizations(qx, [
+      {
+        memberId: member.id,
+        organizationId: university.id,
+        dateStart: '2021-01-01T00:00:00.000Z',
+        dateEnd: '2022-01-01T00:00:00.000Z',
+        title: 'Student Researcher',
+        source: OrganizationSource.ENRICHMENT_CRUSTDATA,
+      },
+      {
+        memberId: member.id,
+        organizationId: company.id,
+        dateStart: '2021-06-01T00:00:00.000Z',
+        dateEnd: '2021-09-01T00:00:00.000Z',
+        title: 'Engineer',
+        source: OrganizationSource.ENRICHMENT_CRUSTDATA,
+      },
+    ])
+
+    const overlap = {
+      from: '2021-07-01T00:00:00.000Z',
+      to: '2021-07-15T00:00:00.000Z',
+    } as const
+
+    await createActivityRelations(qx, [
+      ...generateActivityRelations({
+        memberId: member.id,
+        segmentId: kubernetes.id,
+        identities: [githubIdentity],
+        count: 10,
+        timestamp: overlap,
+      }),
+      ...generateActivityRelations({
+        memberId: member.id,
+        segmentId: kubernetes.id,
+        identities: [uniEmailIdentity],
+        count: 8,
+        timestamp: overlap,
+      }),
+      ...generateActivityRelations({
+        memberId: member.id,
+        segmentId: kubernetes.id,
+        identities: [companyEmailIdentity],
+        count: 6,
+        timestamp: overlap,
+      }),
+    ])
+
+    await refreshMemberOrganizationAffiliations(qx, member.id)
+
+    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
+  })
 })