From 5ff2bbe60e08a1995d51d53981013a91a085cfa5 Mon Sep 17 00:00:00 2001 From: ulemons Date: Tue, 9 Sep 2025 15:14:34 +0200 Subject: [PATCH 1/4] fix: add logs --- .../src/members/organizations.ts | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/services/libs/data-access-layer/src/members/organizations.ts b/services/libs/data-access-layer/src/members/organizations.ts index aab3fab675..b81b21a670 100644 --- a/services/libs/data-access-layer/src/members/organizations.ts +++ b/services/libs/data-access-layer/src/members/organizations.ts @@ -1,3 +1,4 @@ +import { getServiceChildLogger } from '@crowd/logging' import { IMemberOrganization, IMemberOrganizationAffiliationOverride, @@ -16,6 +17,8 @@ import { QueryExecutor } from '../queryExecutor' /* eslint-disable @typescript-eslint/no-explicit-any */ +const logger = getServiceChildLogger('organizations') + export async function fetchMemberOrganizations( qx: QueryExecutor, memberId: string, @@ -489,6 +492,13 @@ async function moveRolesBetweenEntities( const primaryAffiliationOverrides = await findAffiliationOverrides(qx, primaryId) const secondaryAffiliationOverrides = await findAffiliationOverrides(qx, secondaryId) + logger.info( + `primaryMemberAffiliationOverrides: ${JSON.stringify(primaryAffiliationOverrides)}`, + ) + logger.info( + `secondaryMemberAffiliationOverrides: ${JSON.stringify(secondaryAffiliationOverrides)}`, + ) + await mergeRoles( qx, primaryRoles, @@ -507,13 +517,19 @@ async function moveRolesBetweenEntities( mergeStrat.intersectBasedOnField, ) + logger.info({ remainingRoles }, 'Found remaining roles to process') + for (const role of remainingRoles) { + logger.info(`Processing role:`, role) + // delete any existing affiliation override for the role to avoid foreign key conflicts // and reapply it with the new memberOrganizationId const existingOverride = secondaryAffiliationOverrides.find( (o) => o.memberOrganizationId === role.id, ) + logger.info(`Found existing override for role: ${existingOverride}`) + if (existingOverride) { await deleteAffiliationOverrides(qx, role.memberId, [role.id]) } From 15140a206496a6da5d6469810b773b47cf16fc21 Mon Sep 17 00:00:00 2001 From: ulemons Date: Tue, 9 Sep 2025 15:19:06 +0200 Subject: [PATCH 2/4] fix: add logs --- services/libs/data-access-layer/src/members/organizations.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/libs/data-access-layer/src/members/organizations.ts b/services/libs/data-access-layer/src/members/organizations.ts index b81b21a670..3c8b118d08 100644 --- a/services/libs/data-access-layer/src/members/organizations.ts +++ b/services/libs/data-access-layer/src/members/organizations.ts @@ -517,10 +517,10 @@ async function moveRolesBetweenEntities( mergeStrat.intersectBasedOnField, ) - logger.info({ remainingRoles }, 'Found remaining roles to process') + logger.info(`Found remaining roles to process: ${JSON.stringify(remainingRoles)}`) for (const role of remainingRoles) { - logger.info(`Processing role:`, role) + logger.info(`Processing role: ${JSON.stringify(role)}`) // delete any existing affiliation override for the role to avoid foreign key conflicts // and reapply it with the new memberOrganizationId From 8e44cfa3a478144c9cf8727ce3e65bcbfc0a44d7 Mon Sep 17 00:00:00 2001 From: ulemons Date: Tue, 9 Sep 2025 15:25:19 +0200 Subject: [PATCH 3/4] fix: add logs --- services/libs/data-access-layer/src/members/organizations.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/services/libs/data-access-layer/src/members/organizations.ts b/services/libs/data-access-layer/src/members/organizations.ts index 3c8b118d08..47b384553d 100644 --- a/services/libs/data-access-layer/src/members/organizations.ts +++ b/services/libs/data-access-layer/src/members/organizations.ts @@ -706,11 +706,14 @@ export async function mergeRoles( const existingOverrides = [...primaryAffiliationOverrides, ...secondaryAffiliationOverrides] for (const removeRole of removeRoles) { + logger.info(`Removing role: ${JSON.stringify(removeRole)}`) // delete affiliation overrides before removing roles to avoid foreign key conflicts const existingOverride = existingOverrides.find( (o) => o.memberOrganizationId === removeRole.id, ) + logger.info(`Found existing override for role: ${JSON.stringify(existingOverride)}`) + if (existingOverride) { await deleteAffiliationOverrides(qx, removeRole.memberId, [removeRole.id]) affiliationOverridesToRecreate.push({ From 79026d16305fca4ee610d311f917cf263cb744aa Mon Sep 17 00:00:00 2001 From: Umberto Sgueglia Date: Wed, 10 Sep 2025 09:58:03 +0200 Subject: [PATCH 4/4] fix: lint --- services/libs/data-access-layer/src/members/organizations.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/services/libs/data-access-layer/src/members/organizations.ts b/services/libs/data-access-layer/src/members/organizations.ts index 47b384553d..a6e253942e 100644 --- a/services/libs/data-access-layer/src/members/organizations.ts +++ b/services/libs/data-access-layer/src/members/organizations.ts @@ -492,9 +492,7 @@ async function moveRolesBetweenEntities( const primaryAffiliationOverrides = await findAffiliationOverrides(qx, primaryId) const secondaryAffiliationOverrides = await findAffiliationOverrides(qx, secondaryId) - logger.info( - `primaryMemberAffiliationOverrides: ${JSON.stringify(primaryAffiliationOverrides)}`, - ) + logger.info(`primaryMemberAffiliationOverrides: ${JSON.stringify(primaryAffiliationOverrides)}`) logger.info( `secondaryMemberAffiliationOverrides: ${JSON.stringify(secondaryAffiliationOverrides)}`, )