@open-mercato/core 0.5.1-develop.2917.31ee9898e3 → 0.5.1-develop.2935.357c9db339

package/src/modules/customers/lib/personCompanies.ts

@@ -6,7 +6,10 @@ import {
   CustomerPersonCompanyLink,
   CustomerPersonProfile,
 } from '../data/entities'
-import { withActiveCustomerPersonCompanyLinkFilter } from './personCompanyLinkTable'
+import {
+  filterActivePersonCompanyLinks,
+  withActiveCustomerPersonCompanyLinkFilter,
+} from './personCompanyLinkTable'
 
 export type PersonCompanySummary = {
   linkId: string | null
@@ -62,12 +65,14 @@ export async function loadPersonCompanyLinks(
     { person, organizationId: person.organizationId, tenantId: person.tenantId },
     'customers.personCompanies.loadPersonCompanyLinks',
   )
-  return findWithDecryption(
-    em,
-    CustomerPersonCompanyLink,
-    where,
-    { populate: ['company'], orderBy: { isPrimary: 'desc', createdAt: 'asc' } },
-    { tenantId: person.tenantId, organizationId: person.organizationId },
+  return filterActivePersonCompanyLinks(
+    await findWithDecryption(
+      em,
+      CustomerPersonCompanyLink,
+      where,
+      { populate: ['company'], orderBy: { isPrimary: 'desc', createdAt: 'asc' } },
+      { tenantId: person.tenantId, organizationId: person.organizationId },
+    ),
   )
 }
 

package/src/modules/customers/lib/personCompanyLinkTable.ts

@@ -51,3 +51,17 @@ export async function withActiveCustomerPersonCompanyLinkFilter<T extends Record
   }
   return { ...where, deletedAt: null }
 }
+
+/**
+ * Drop soft-deleted link rows from a result set as a defense-in-depth fallback.
+ * MikroORM has historically dropped `deletedAt: null` from the WHERE clause for
+ * nullable date columns under certain configurations, so callers SHOULD apply this
+ * after `findWithDecryption(...)` until the upstream query filter is verified to
+ * fully cover all callers.
+ */
+export function filterActivePersonCompanyLinks<T extends { deletedAt?: Date | string | null | undefined }>(
+  links: T[] | null | undefined,
+): T[] {
+  if (!Array.isArray(links)) return []
+  return links.filter((entry) => entry?.deletedAt == null)
+}

package/src/modules/integrations/data/validators.ts

@@ -45,7 +45,7 @@ const optionalBooleanQuery = z.preprocess((value) => {
   if (value === true || value === 'true' || value === '1') return true
   if (value === false || value === 'false' || value === '0') return false
   return value
-}, z.boolean().optional())
+}, z.boolean().optional()).optional()
 
 export const integrationMarketplaceHealthStatusSchema = z.enum(['healthy', 'degraded', 'unhealthy', 'unconfigured'])