Merge branch 'main' into better-error-message-handling-CM-1117

Author: themarolt

backend/src/api/public/v1/members/work-experiences/createMemberWorkExperience.ts

@@ -2,7 +2,12 @@ import type { Request, Response } from 'express'
 import { z } from 'zod'
 
 import { captureApiChange, memberEditOrganizationsAction } from '@crowd/audit-logs'
-import { ConflictError, NotFoundError } from '@crowd/common'
+import {
+  BadRequestError,
+  ConflictError,
+  NotFoundError,
+  sanitizeMemberOrganizationDateRange,
+} from '@crowd/common'
 import { CommonMemberService } from '@crowd/common_services'
 import {
   MemberField,
@@ -14,7 +19,11 @@ import {
   findMemberById,
   optionsQx,
 } from '@crowd/data-access-layer'
-import type { IMemberOrganization, IMemberRoleWithOrganization } from '@crowd/types'
+import type {
+  IMemberOrganization,
+  IMemberRoleWithOrganization,
+  MemberOrganizationDateRange,
+} from '@crowd/types'
 
 import { created } from '@/utils/api'
 import { toMemberWorkExperience } from '@/utils/mapper'
@@ -53,12 +62,20 @@ export async function createMemberWorkExperience(req: Request, res: Response): P
     memberEditOrganizationsAction(memberId, async (captureOldState, captureNewState) => {
       captureOldState({})
 
+      let dates: MemberOrganizationDateRange
+
+      try {
+        dates = sanitizeMemberOrganizationDateRange(data.startDate, data.endDate, true)
+      } catch (error) {
+        throw new BadRequestError('Invalid work experience date range')
+      }
+
       const memberOrgData: IMemberOrganization = {
         memberId,
         organizationId: data.organizationId,
         title: data.jobTitle,
-        dateStart: data.startDate,
-        dateEnd: data.endDate,
+        dateStart: dates.dateStart,
+        dateEnd: dates.dateEnd,
         source: data.source,
         verified: data.verified,
         verifiedBy: data.verifiedBy,
@@ -67,7 +84,7 @@ export async function createMemberWorkExperience(req: Request, res: Response): P
       let newMemberOrgId: string | undefined
 
       await qx.tx(async (tx) => {
-        await cleanSoftDeletedMemberOrganization(tx, memberId, data.organizationId, data)
+        await cleanSoftDeletedMemberOrganization(tx, memberId, data.organizationId, memberOrgData)
 
         newMemberOrgId = await createMemberOrganization(tx, memberId, memberOrgData)
 

backend/src/api/public/v1/members/work-experiences/updateMemberWorkExperience.ts

@@ -2,7 +2,7 @@ import type { Request, Response } from 'express'
 import { z } from 'zod'
 
 import { captureApiChange, memberEditOrganizationsAction } from '@crowd/audit-logs'
-import { NotFoundError } from '@crowd/common'
+import { BadRequestError, NotFoundError, sanitizeMemberOrganizationDateRange } from '@crowd/common'
 import { CommonMemberService } from '@crowd/common_services'
 import {
   MemberField,
@@ -12,7 +12,7 @@ import {
   optionsQx,
   updateMemberOrganization,
 } from '@crowd/data-access-layer'
-import type { MemberOrganizationUpdate } from '@crowd/types'
+import type { MemberOrganizationDateRange, MemberOrganizationUpdate } from '@crowd/types'
 
 import { ok } from '@/utils/api'
 import { toMemberWorkExperience } from '@/utils/mapper'
@@ -52,14 +52,22 @@ export async function updateMemberWorkExperience(req: Request, res: Response): P
     throw new NotFoundError('Work experience not found')
   }
 
+  let dates: MemberOrganizationDateRange
+
+  try {
+    dates = sanitizeMemberOrganizationDateRange(data.startDate, data.endDate, true)
+  } catch (error) {
+    throw new BadRequestError('Invalid work experience date range')
+  }
+
   const update: MemberOrganizationUpdate = {
     organizationId: data.organizationId,
     title: data.jobTitle,
     verified: data.verified,
     verifiedBy: data.verifiedBy,
     source: data.source,
-    dateStart: data.startDate,
-    dateEnd: data.endDate,
+    dateStart: dates.dateStart,
+    dateEnd: dates.dateEnd,
   }
 
   let updated: ReturnType<typeof toMemberWorkExperience> | undefined

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/member/memberOrganizationsService.ts

@@ -1,7 +1,8 @@
 /* eslint-disable no-continue */
+import lodash from 'lodash'
 import { Transaction } from 'sequelize'
 
-import { Error404 } from '@crowd/common'
+import { Error404, sanitizeMemberOrganizationDateRange } from '@crowd/common'
 import { CommonMemberService } from '@crowd/common_services'
 import {
   OrganizationField,
@@ -10,6 +11,7 @@ import {
   cleanSoftDeletedMemberOrganization,
   createMemberOrganization,
   deleteMemberOrganizations,
+  fetchMemberOrganizationById,
   fetchMemberOrganizations,
   findMemberAffiliationOverrides,
   optionsQx,
@@ -167,12 +169,18 @@ export default class MemberOrganizationsService extends LoggerBase {
 
     try {
       const qx = SequelizeRepository.getQueryExecutor(repositoryOptions)
+      const dates = sanitizeMemberOrganizationDateRange(data.dateStart, data.dateEnd, true)
+      const memberOrgData: Partial<IMemberOrganization> = {
+        ...data,
+        dateStart: dates.dateStart,
+        dateEnd: dates.dateEnd,
+      }
 
       // Clean up any soft-deleted entries
-      await cleanSoftDeletedMemberOrganization(qx, memberId, data.organizationId, data)
+      await cleanSoftDeletedMemberOrganization(qx, memberId, data.organizationId, memberOrgData)
 
       // Create new member organization
-      const newMemberOrgId = await createMemberOrganization(qx, memberId, data)
+      const newMemberOrgId = await createMemberOrganization(qx, memberId, memberOrgData)
 
       // Check if organization affiliation is blocked
       const isAffiliationBlocked = await checkOrganizationAffiliationPolicy(qx, data.organizationId)
@@ -214,26 +222,44 @@ export default class MemberOrganizationsService extends LoggerBase {
     try {
       const qx = SequelizeRepository.getQueryExecutor(repositoryOptions)
 
-      const update: MemberOrganizationUpdate = Object.fromEntries(
-        Object.entries({
+      const existing = await fetchMemberOrganizationById(qx, id)
+      if (!existing || existing.memberId !== memberId) {
+        throw new Error404(`Member organization with id ${id} not found!`)
+      }
+
+      const hasDateStart = data.dateStart !== undefined
+      const hasDateEnd = data.dateEnd !== undefined
+      const targetDateRange = sanitizeMemberOrganizationDateRange(
+        hasDateStart ? data.dateStart : existing.dateStart,
+        hasDateEnd ? data.dateEnd : existing.dateEnd,
+        true,
+      )
+
+      const update = lodash.pickBy(
+        {
           organizationId: data.organizationId,
           title: data.title,
-          dateStart: data.dateStart,
-          dateEnd: data.dateEnd,
+          dateStart: hasDateStart ? targetDateRange.dateStart : undefined,
+          dateEnd: hasDateEnd ? targetDateRange.dateEnd : undefined,
+
           verified: data.verified,
           verifiedBy: data.verifiedBy,
-        }).filter(([, v]) => v !== undefined),
-      )
+        },
+        (v) => v !== undefined,
+      ) as MemberOrganizationUpdate
 
-      await cleanSoftDeletedMemberOrganization(qx, memberId, data.organizationId, data)
-      // Any manual edit from the frontend promotes ownership to UI so automated
-      // sources (e.g. email-domain inference) no longer overwrite user intent.
+      await cleanSoftDeletedMemberOrganization(qx, memberId, data.organizationId, update)
       await updateMemberOrganization(qx, memberId, id, {
         ...update,
         source: OrganizationSource.UI,
       })
 
-      await this.commonMemberService.startAffiliationRecalculation(memberId, [data.organizationId])
+      // Trigger recalculation for old and new orgs if changed
+      const orgsToRecalculate = Array.from(
+        new Set([existing.organizationId, data.organizationId]),
+      ).filter((orgId): orgId is string => Boolean(orgId))
+
+      await this.commonMemberService.startAffiliationRecalculation(memberId, orgsToRecalculate)
 
       const result = await this.list(memberId, transaction)
 

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/apps/members_enrichment_worker/src/activities/enrichment.ts

@@ -6,6 +6,7 @@ import {
   generateUUIDv1,
   hasIntersection,
   replaceDoubleQuotes,
+  sanitizeMemberOrganizationDateRange,
   setAttributesDefaultValues,
 } from '@crowd/common'
 import { CommonMemberService } from '@crowd/common_services'
@@ -383,6 +384,10 @@ export async function updateMemberUsingSquashedPayload(
 
     const newOrUpdatedMemberOrgs = []
 
+    squashedPayload.memberOrganizations = sanitizeWorkExperienceDateRanges(
+      squashedPayload.memberOrganizations,
+    )
+
     if (squashedPayload.memberOrganizations.length > 0) {
       const orgPromises = []
 
@@ -754,6 +759,20 @@ interface IWorkExperienceChanges {
   toUpdate: Map<IMemberOrganizationData, Record<string, any>>
 }
 
+function sanitizeWorkExperienceDateRanges(
+  organizations: IMemberEnrichmentDataNormalizedOrganization[],
+): IMemberEnrichmentDataNormalizedOrganization[] {
+  return organizations.map((org) => {
+    const dates = sanitizeMemberOrganizationDateRange(org.startDate, org.endDate)
+
+    return {
+      ...org,
+      startDate: dates.dateStart instanceof Date ? dates.dateStart.toISOString() : dates.dateStart,
+      endDate: dates.dateEnd instanceof Date ? dates.dateEnd.toISOString() : dates.dateEnd,
+    }
+  })
+}
+
 function prepareWorkExperiences(
   oldVersion: IMemberOrganizationData[],
   newVersion: IMemberEnrichmentDataNormalizedOrganization[],

services/apps/members_enrichment_worker/src/types.ts

@@ -93,8 +93,8 @@ export interface IMemberEnrichmentDataNormalizedOrganization {
   identities?: IOrganizationIdentity[]
   title?: string
   organizationDescription?: string
-  startDate?: string
-  endDate?: string
+  startDate?: string | null
+  endDate?: string | null
   source: OrganizationSource
 }