Merge branch 'main' into fix/member-enrichment-savepoint-race

Author: skwowet

backend/src/database/repositories/organizationRepository.ts

@@ -1316,6 +1316,7 @@ class OrganizationRepository {
       limit = 20,
       offset = 0,
       orderBy = undefined,
+      search = undefined as string | undefined,
       segmentId = undefined,
     },
     options: IRepositoryOptions,
@@ -1332,6 +1333,7 @@ class OrganizationRepository {
       limit,
       offset,
       orderBy,
+      search,
       segmentId,
     })
 
@@ -1345,6 +1347,7 @@ class OrganizationRepository {
         cacheKey,
         {
           filter,
+          search,
           limit,
           offset,
           orderBy,
@@ -1366,6 +1369,7 @@ class OrganizationRepository {
         cacheKey,
         {
           filter,
+          search,
           segmentId,
           include,
         },
@@ -1386,6 +1390,7 @@ class OrganizationRepository {
       cacheKey,
       {
         filter,
+        search,
         limit,
         offset,
         orderBy,
@@ -1403,6 +1408,7 @@ class OrganizationRepository {
     cacheKey: string,
     {
       filter = {} as any,
+      search = undefined as string | undefined,
       limit = 20,
       offset = 0,
       orderBy = undefined,
@@ -1458,13 +1464,19 @@ class OrganizationRepository {
       segmentId = segment.id
     }
 
-    const params = {
+    const params: Record<string, any> = {
       limit,
       offset,
       segmentId,
       tenantId: options.currentTenant.id,
     }
 
+    let searchWhereClause = ''
+    if (search) {
+      params.searchTerm = `%${search}%`
+      searchWhereClause = `AND o."displayName" ILIKE $(searchTerm)`
+    }
+
     const filterString = RawQueryParser.parseFilters(
       filter,
       OrganizationRepository.QUERY_FILTER_COLUMN_MAP,
@@ -1498,6 +1510,7 @@ class OrganizationRepository {
       WHERE 1=1
         AND o."tenantId" = $(tenantId)
         ${lfxMembershipFilterWhereClause}
+        ${searchWhereClause}
         AND (${filterString})
     `
     const countQuery = createQuery('COUNT(*)')
@@ -1649,6 +1662,7 @@ class OrganizationRepository {
     params: {
       // TODO: REMOVE this any
       filter?: any
+      search?: string
       limit: number
       offset: number
       orderBy?: string
@@ -1671,6 +1685,7 @@ class OrganizationRepository {
     cacheKey: string,
     params: {
       filter?: any
+      search?: string
       segmentId?: string
       include: any
     },

backend/src/database/repositories/organizationsQueryCache.ts

@@ -38,6 +38,7 @@ export class OrganizationQueryCache {
     limit: number
     offset: number
     orderBy?: string
+    search?: string
     segmentId?: string
   }): string {
     const cleanParams = Object.fromEntries(
@@ -49,6 +50,7 @@ export class OrganizationQueryCache {
         limit: params.limit,
         offset: params.offset,
         orderBy: params.orderBy,
+        search: params.search,
         segmentId: params.segmentId,
       }).filter(([, value]) => value !== null && value !== undefined),
     )

backend/src/services/organizationService.ts

@@ -1163,10 +1163,19 @@ export default class OrganizationService extends LoggerBase {
   }
 
   async query(data) {
-    const { filter, orderBy, limit, offset, segments } = data
+    const { filter: rawFilter, orderBy, limit, offset, segments, search: rawSearch } = data
+    const searchTerm =
+      typeof rawSearch === 'string' && rawSearch.trim() ? rawSearch.trim() : undefined
+
+    // Strip frontend-state keys that are never valid filter columns or operators.
+    // These can appear when the raw Pinia filter state is sent instead of the
+    // processed output of buildApiFilter.
+    const { search: _s, relation: _r, order: _o, settings: _st, ...filter } = rawFilter ?? {}
+
     return OrganizationRepository.findAndCountAll(
       {
         filter,
+        search: searchTerm,
         orderBy,
         limit,
         offset,

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

@@ -10,6 +10,7 @@ import {
   changeMemberOrganizationAffiliationOverrides,
   checkOrganizationAffiliationPolicy,
   createMemberOrganization,
+  deleteUndatedMemberOrganizations,
   fetchMemberOrganizationsBySource,
   updateMemberOrganization,
 } from '@crowd/data-access-layer'
@@ -136,6 +137,10 @@ async function applyStintChanges(qx: QueryExecutor, changes: MemberOrgStintChang
       })
     }
   }
+
+  await deleteUndatedMemberOrganizations(qx, changes[0].memberId, [
+    ...new Set(changes.map((c) => c.organizationId)),
+  ])
 }
 
 export default job

services/libs/data-access-layer/src/members/organizations.ts

@@ -482,6 +482,47 @@ export async function deleteMemberOrganizations(
   })
 }
 
+export async function deleteUndatedMemberOrganizations(
+  qx: QueryExecutor,
+  memberId: string,
+  organizationIds: string[],
+): Promise<void> {
+  if (organizationIds.length === 0) {
+    return
+  }
+
+  const whereClause = `
+    "memberId" = $(memberId)
+    AND "organizationId" IN ($(organizationIds:csv))
+    AND "dateStart" IS NULL
+    AND "dateEnd" IS NULL
+    AND "deletedAt" IS NULL
+  `
+
+  const params = { memberId, organizationIds }
+
+  await qx.tx(async (tx) => {
+    await tx.result(
+      `
+        DELETE FROM "memberOrganizationAffiliationOverrides"
+        WHERE "memberOrganizationId" IN (
+          SELECT "id" FROM "memberOrganizations" WHERE ${whereClause}
+        )
+      `,
+      params,
+    )
+
+    await tx.result(
+      `
+        UPDATE "memberOrganizations"
+        SET "deletedAt" = NOW()
+        WHERE ${whereClause}
+      `,
+      params,
+    )
+  })
+}
+
 export async function cleanSoftDeletedMemberOrganization(
   qx: QueryExecutor,
   memberId: string,