@reachy/audience-module 1.0.20 → 1.0.22

package/src/builders/QueryBuilder.ts

@@ -131,6 +131,10 @@ export class QueryBuilder {
 
     const dbField = this.mapFieldToColumn(field, condition.customFieldKey)
 
+    if (dbField === 'tags') {
+      return this.applyTagCondition(query, operator, value)
+    }
+
     switch (operator) {
       case 'equals':
       case 'eq':
@@ -163,6 +167,39 @@ export class QueryBuilder {
     }
   }
 
+  private static applyTagCondition(query: any, operator: string, value: any): any {
+    const op = String(operator || '').trim().toLowerCase()
+    const values = QueryBuilder.normalizeTagValues(value)
+
+    if (op === 'has_all' || op === 'equals' || op === 'eq' || op === '=') {
+      if (values.length === 0) return query.eq('id', '__never__')
+      return query.contains('tags', values)
+    }
+    if (op === 'has_any' || op === 'contains' || op === 'in') {
+      if (values.length === 0) return query.eq('id', '__never__')
+      return query.overlaps('tags', values)
+    }
+    if (op === 'is_empty') {
+      return query.or('tags.is.null,tags.eq.{}')
+    }
+    if (op === 'is_not_empty') {
+      return query.not('tags', 'is', null).neq('tags', '{}')
+    }
+    console.warn(`⚠️ Operador de tag desconhecido: ${operator}`)
+    return query.eq('id', '__never__')
+  }
+
+  private static normalizeTagValues(value: any): string[] {
+    if (value === null || value === undefined) return []
+    const raw = Array.isArray(value) ? value : String(value).split(',')
+    const out: string[] = []
+    for (const item of raw) {
+      const v = String(item ?? '').trim()
+      if (v.length > 0) out.push(v)
+    }
+    return out
+  }
+
   /**
    * Constrói string de condição para uso em .or()
    */
@@ -173,6 +210,10 @@ export class QueryBuilder {
 
     const dbField = this.mapFieldToColumn(field, condition.customFieldKey)
 
+    if (dbField === 'tags') {
+      return QueryBuilder.buildTagConditionString(operator, value)
+    }
+
     switch (operator) {
       case 'equals':
       case 'eq':
@@ -204,6 +245,24 @@ export class QueryBuilder {
     }
   }
 
+  private static buildTagConditionString(operator: string, value: any): string | null {
+    const op = String(operator || '').trim().toLowerCase()
+    const values = QueryBuilder.normalizeTagValues(value)
+    const arrLiteral = `{${values.map((v) => v.includes(',') ? `"${v.replace(/"/g, '\\"')}"` : v).join(',')}}`
+
+    if (op === 'has_all' || op === 'equals' || op === 'eq' || op === '=') {
+      if (values.length === 0) return null
+      return `tags.cs.${arrLiteral}`
+    }
+    if (op === 'has_any' || op === 'contains' || op === 'in') {
+      if (values.length === 0) return null
+      return `tags.ov.${arrLiteral}`
+    }
+    if (op === 'is_empty') return `tags.is.null`
+    if (op === 'is_not_empty') return `tags.not.is.null`
+    return null
+  }
+
   /**
    * Mapeia campo da audiência para coluna do banco
    */

package/src/engine/V2AudienceEngine.ts

@@ -163,6 +163,31 @@ const normalizePropertyOp = (opRaw: any): string => {
   return op
 }
 
+const normalizeTagValues = (value: any): string[] => {
+  if (value === null || value === undefined) return []
+  const raw = Array.isArray(value) ? value : String(value).split(',')
+  const out: string[] = []
+  for (const item of raw) {
+    const v = String(item ?? '').trim()
+    if (v.length > 0) out.push(v)
+  }
+  return out
+}
+
+const normalizeTagOp = (opRaw: any): string => {
+  const op = String(opRaw ?? '').trim().toLowerCase()
+  // UI principal: espelha os operadores dos campos texto.
+  if (op === 'equals' || op === 'eq' || op === '=' || op === 'has_all' || op === 'has') return 'equals'
+  if (op === 'not_equals' || op === 'neq' || op === '!=' || op === '<>') return 'not_equals'
+  if (op === 'contains') return 'contains'
+  if (op === 'not_contains') return 'not_contains'
+  // Array-specific (forward-compat / API direta)
+  if (op === 'has_any' || op === 'in') return 'has_any'
+  if (op === 'is_empty') return 'is_empty'
+  if (op === 'is_not_empty') return 'is_not_empty'
+  return op
+}
+
 const isNumericLike = (value: any): boolean => {
   if (typeof value === 'number') return Number.isFinite(value)
   if (typeof value !== 'string') return false
@@ -1034,6 +1059,63 @@ export class V2AudienceEngine {
       }
 
       const mappedField = mapAudienceFieldToContactField(field)
+
+      if (field === 'tags' || mappedField === 'tags') {
+        const tagOp = normalizeTagOp(opRaw)
+
+        if (tagOp === 'contains' || tagOp === 'not_contains') {
+          const expected = String(value ?? '').trim().toLowerCase()
+          if (!expected) return new Set<string>()
+          const fetchQuery = this.supabase
+            .from('contacts')
+            .select('id, tags')
+            .eq('organization_id', organizationId)
+            .eq('project_id', projectId)
+          const data = await fetchAll(fetchQuery, 1000)
+          if (!data || data.length === 0) return new Set<string>()
+          const result = new Set<string>()
+          for (const row of data as any[]) {
+            const id = row?.id as string | undefined
+            if (!id) continue
+            const tags = Array.isArray(row.tags) ? row.tags : []
+            const hasMatch = tags.some((t: any) => String(t ?? '').toLowerCase().includes(expected))
+            if (tagOp === 'contains' && hasMatch) result.add(id)
+            else if (tagOp === 'not_contains' && !hasMatch) result.add(id)
+          }
+          return result
+        }
+
+        const tagValues = normalizeTagValues(value)
+        let tagQuery = this.supabase
+          .from('contacts')
+          .select('id')
+          .eq('organization_id', organizationId)
+          .eq('project_id', projectId)
+
+        if (tagOp === 'equals') {
+          if (tagValues.length === 0) return new Set<string>()
+          tagQuery = tagQuery.contains('tags', tagValues)
+        } else if (tagOp === 'not_equals') {
+          if (tagValues.length === 0) return new Set<string>()
+          const arrLiteral = `{${tagValues.join(',')}}`
+          tagQuery = tagQuery.or(`tags.is.null,tags.not.cs.${arrLiteral}`)
+        } else if (tagOp === 'has_any') {
+          if (tagValues.length === 0) return new Set<string>()
+          tagQuery = tagQuery.overlaps('tags', tagValues)
+        } else if (tagOp === 'is_empty') {
+          tagQuery = tagQuery.or('tags.is.null,tags.eq.{}')
+        } else if (tagOp === 'is_not_empty') {
+          tagQuery = tagQuery.not('tags', 'is', null).neq('tags', '{}')
+        } else {
+          this.dlog('tags rule with unsupported op, returning empty', { opRaw, tagOp })
+          return new Set<string>()
+        }
+
+        const tagData = await fetchAll(tagQuery, 1000)
+        if (!tagData || tagData.length === 0) return new Set<string>()
+        return new Set<string>(tagData.map((r: any) => r.id as string))
+      }
+
       const known = ['email', 'first_name', 'last_name', 'phone', 'is_subscribed', 'created_at', 'updated_at', 'name']
       const isJsonb = !(known.includes(field) || known.includes(mappedField))
       const dbField = isJsonb ? `properties->>${field}` : mappedField
@@ -1341,12 +1423,25 @@ export class V2AudienceEngine {
   /**
    * Variante otimizada para avaliar apenas UM contato (useful para Journeys/Live).
    * Retorna true se o contact_id atende ao critério.
+   *
+   * @param triggerEvent (opcional) Restringe a avaliação de regras de evento
+   *   ao evento específico que disparou o fluxo (ex.: split de Journey).
+   *   Quando informado, a query em `contact_events` é limitada a este registro
+   *   pelo `event_id` (preferencial) OU pelo par (event_name, event_timestamp).
+   *   Sem isso, o engine percorre TODO o histórico do contato — esse é o
+   *   comportamento correto para audiências/segmentos, mas é um BUG quando o
+   *   uso é "avaliar a propriedade do evento de gatilho atual" em journeys.
    */
   async matchesContactByAudienceCriteriaV2(
     organizationId: string,
     projectId: string,
     criteriaRaw: any,
-    contactId: string
+    contactId: string,
+    triggerEvent?: {
+      event_id?: string
+      event_name?: string
+      event_timestamp?: string
+    }
   ): Promise<boolean> {
     let criteria: AudienceCriteria = CriteriaParser.parse(criteriaRaw as any) as any
 
@@ -1419,6 +1514,24 @@ export class V2AudienceEngine {
       if (reachyId) ors.push(`reachy_id.eq.${reachyId}`)
       if (ors.length > 0) query = query.or(ors.join(','))
 
+      // 🎯 NARROW para o evento que disparou a journey (split com event_property).
+      // Sem isso, a avaliação considera TODO o histórico do contato, fazendo a
+      // condição cair sempre em "yes" se algum evento histórico bater.
+      // Só restringe quando o nome do evento de gatilho casa com a regra avaliada
+      // (caso contrário, manteria o comportamento correto p/ outras regras).
+      const triggerEventNameMatches =
+        !!triggerEvent &&
+        typeof triggerEvent.event_name === 'string' &&
+        String(triggerEvent.event_name).trim() === String(effectiveEventName).trim()
+
+      if (triggerEvent && triggerEventNameMatches) {
+        if (triggerEvent.event_id) {
+          query = query.eq('id', triggerEvent.event_id)
+        } else if (triggerEvent.event_timestamp) {
+          query = query.eq('event_timestamp', triggerEvent.event_timestamp)
+        }
+      }
+
       // live presets helpers (paridade)
       if (typeId === 'live-page-visit') {
         const v = cfg.pageUrl
@@ -1816,6 +1929,59 @@ export class V2AudienceEngine {
       }
 
       const mappedField = mapAudienceFieldToContactField(field)
+
+      // Coluna `tags` é text[] — desvia para operadores de array antes do path scalar/JSONB.
+      if (field === 'tags' || mappedField === 'tags') {
+        const tagOp = normalizeTagOp(opRaw)
+
+        // contains/not_contains: substring — fetch + filtro em memória.
+        if (tagOp === 'contains' || tagOp === 'not_contains') {
+          const expected = String(value ?? '').trim().toLowerCase()
+          if (!expected) return false
+          const { data: tagsRow, error: tagsErr } = await this.supabase
+            .from('contacts')
+            .select('tags')
+            .eq('organization_id', organizationId)
+            .eq('project_id', projectId)
+            .eq('id', contactId)
+            .maybeSingle()
+          if (tagsErr) return false
+          const tags = Array.isArray((tagsRow as any)?.tags) ? (tagsRow as any).tags : []
+          const hasMatch = tags.some((t: any) => String(t ?? '').toLowerCase().includes(expected))
+          return tagOp === 'contains' ? hasMatch : !hasMatch
+        }
+
+        const tagValues = normalizeTagValues(value)
+        let tagQuery = this.supabase
+          .from('contacts')
+          .select('id')
+          .eq('organization_id', organizationId)
+          .eq('project_id', projectId)
+          .eq('id', contactId)
+
+        if (tagOp === 'equals') {
+          if (tagValues.length === 0) return false
+          tagQuery = tagQuery.contains('tags', tagValues)
+        } else if (tagOp === 'not_equals') {
+          if (tagValues.length === 0) return false
+          const arrLiteral = `{${tagValues.join(',')}}`
+          tagQuery = tagQuery.or(`tags.is.null,tags.not.cs.${arrLiteral}`)
+        } else if (tagOp === 'has_any') {
+          if (tagValues.length === 0) return false
+          tagQuery = tagQuery.overlaps('tags', tagValues)
+        } else if (tagOp === 'is_empty') {
+          tagQuery = tagQuery.or('tags.is.null,tags.eq.{}')
+        } else if (tagOp === 'is_not_empty') {
+          tagQuery = tagQuery.not('tags', 'is', null).neq('tags', '{}')
+        } else {
+          return false
+        }
+
+        const { data: tagData, error: tagErr } = await tagQuery
+        if (tagErr) return false
+        return Array.isArray(tagData) && tagData.length > 0
+      }
+
       const known = ['email', 'first_name', 'last_name', 'phone', 'is_subscribed', 'created_at', 'updated_at', 'name']
       const isJsonb = !(known.includes(field) || known.includes(mappedField))
       const dbField = isJsonb ? `properties->>${field}` : mappedField

package/src/repositories/SupabaseContactRepository.ts

@@ -30,9 +30,16 @@ export class SupabaseContactRepository {
     organizationId: string,
     projectId: string,
     criteria: any,
-    contactId: string
+    contactId: string,
+    triggerEvent?: { event_id?: string; event_name?: string; event_timestamp?: string }
   ): Promise<boolean> {
-    return this.engine.matchesContactByAudienceCriteriaV2(organizationId, projectId, criteria, contactId)
+    return this.engine.matchesContactByAudienceCriteriaV2(
+      organizationId,
+      projectId,
+      criteria,
+      contactId,
+      triggerEvent
+    )
   }
 
   async findByIds(organizationId: string, projectId: string, ids: string[]) {