From befce1a51c6c5c664040fee0669de4ac5ee4005f Mon Sep 17 00:00:00 2001
From: Yeganathan S <hilariousengineer@protonmail.com>
Date: Fri, 14 Feb 2025 16:14:02 +0530
Subject: [PATCH] fix: add affiliation overrides to member list endpoint
 (#2837)

---
 .../data-access-layer/src/members/base.ts     | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/services/libs/data-access-layer/src/members/base.ts b/services/libs/data-access-layer/src/members/base.ts
index e88cfea777..eb1b848b3b 100644
--- a/services/libs/data-access-layer/src/members/base.ts
+++ b/services/libs/data-access-layer/src/members/base.ts
@@ -17,6 +17,7 @@ import {
 import { getLastActivitiesForMembers } from '../activities'
 import { findManyLfxMemberships } from '../lfx_memberships'
 import { findMaintainerRoles } from '../maintainers'
+import { findOverrides as findMemberOrganizationAffiliationOverrides } from '../member_organization_affiliation_overrides'
 import { OrganizationField, queryOrgs } from '../orgs'
 import { QueryExecutor } from '../queryExecutor'
 import { fetchManySegments, findSegmentById, getSegmentActivityTypes } from '../segments'
@@ -313,15 +314,27 @@ export async function queryMembersAdvanced(
         })
       : []
 
-    rows.forEach((member) => {
-      member.organizations = (
+    for (const member of rows) {
+      const memberOrgs =
         memberOrganizations.find((o) => o.memberId === member.id)?.organizations || []
-      ).map((o) => ({
+
+      const affiliationOverrides = memberOrgs.length
+        ? await findMemberOrganizationAffiliationOverrides(
+            qx,
+            member.id,
+            memberOrgs.map((o) => o.id),
+          )
+        : []
+
+      member.organizations = memberOrgs.map((o) => ({
         id: o.organizationId,
         ...orgExtra.find((odn) => odn.id === o.organizationId),
-        memberOrganizations: o,
+        memberOrganizations: {
+          ...o,
+          affiliationOverride: affiliationOverrides.find((ao) => ao.memberOrganizationId === o.id),
+        },
       }))
-    })
+    }
   }
   if (include.lfxMemberships) {
     const lfxMemberships = await findManyLfxMemberships(qx, {