@hed-hog/contact 0.0.279 → 0.0.285

package/hedhog/frontend/app/reports/page.tsx.ejs

@@ -1,15 +1,15 @@
-'use client';
-
-import { CrmComingSoon } from '../_components/crm-coming-soon';
-import { BarChart3 } from 'lucide-react';
-
-export default function CrmReportsPage() {
-  return (
-    <CrmComingSoon
-      currentHref="/contact/reports"
-      titleKey="reports"
-      descriptionKey="reports"
-      icon={BarChart3}
-    />
-  );
-}
+'use client';
+
+import { CrmComingSoon } from '../_components/crm-coming-soon';
+import { BarChart3 } from 'lucide-react';
+
+export default function CrmReportsPage() {
+  return (
+    <CrmComingSoon
+      currentHref="/contact/reports"
+      titleKey="reports"
+      descriptionKey="reports"
+      icon={BarChart3}
+    />
+  );
+}

package/hedhog/frontend/messages/en.json

@@ -173,6 +173,15 @@
     "rowsPerPage": "Rows per page",
     "paginationLabel": "Page {current} of {total}",
     "register": "Register",
+    "duplicateWarning": "Possible duplicate found: {names}.",
+    "duplicateDialogTitle": "Possible duplicate record",
+    "duplicateDialogDescription": "We found records with matching key data. Choose a primary record to merge into, or continue anyway.",
+    "duplicateTargetLabel": "Primary record",
+    "duplicateSelectTarget": "Select a record to merge into",
+    "duplicateContinueAction": "Continue anyway",
+    "duplicateMergeAction": "Merge into selected record",
+    "duplicateMergeSuccess": "Merge completed successfully into {name}.",
+    "duplicateMergeError": "Failed to merge records.",
     "owner": "Owner",
     "unassigned": "Unassigned",
     "registerInteraction": "Register Interaction",
@@ -292,6 +301,8 @@
     "tableCreatedAt": "Created At",
     "loading": "Loading...",
     "noResults": "No contact types found",
+    "emptyStateDescription": "Create the first contact type or adjust the search to find existing records.",
+    "emptyStateAction": "Create Contact Type",
     "menuOpen": "Open menu",
     "menuActions": "Actions",
     "menuEdit": "Edit",
@@ -334,6 +345,8 @@
     "tableCreatedAt": "Created At",
     "loading": "Loading...",
     "noResults": "No document types found",
+    "emptyStateDescription": "Create the first document type or adjust the search to find existing records.",
+    "emptyStateAction": "Create Document Type",
     "menuOpen": "Open menu",
     "menuActions": "Actions",
     "menuEdit": "Edit",
@@ -521,8 +534,10 @@
     "filterBadge": "Owner-based reading",
     "heroTitle": "Visualize the funnel by stage and distribute operations clearly.",
     "heroDescription": "Track each owner's workload, see lead aging, and identify where the next opportunities to advance are.",
+    "newPerson": "New lead",
     "ownerFilterLabel": "Filter by owner",
     "ownerFilterAll": "All owners",
+    "searchPlaceholder": "Search by lead, company, or trade name...",
     "summary": {
       "total": {
         "title": "Leads in filter",
@@ -552,6 +567,47 @@
       "days": "{count} days",
       "nextAction": "Next action",
       "noFollowup": "No follow-up"
+    },
+    "controls": {
+      "expandAll": "Expand all",
+      "collapseAll": "Collapse all",
+      "showDetails": "Show details",
+      "hideDetails": "Hide details"
+    },
+    "detail": {
+      "title": "Lead overview",
+      "lost": "Lost opportunity",
+      "owner": "Owner",
+      "source": "Source",
+      "advanceStage": "Advance stage",
+      "moveTo": "Move to {stage}",
+      "timeline": "Timeline",
+      "noInteractions": "No interactions recorded for this lead yet.",
+      "loadingTimeline": "Loading interaction history...",
+      "createdAt": "Created at",
+      "lastInteraction": "Last interaction",
+      "editCadastro": "Edit full record",
+      "stageMoveSuccess": "Lead moved to {stage} successfully",
+      "stageMoveError": "Failed to move lead to a new stage",
+      "interactionType": {
+        "call": "Call",
+        "email": "Email",
+        "whatsapp": "WhatsApp",
+        "meeting": "Meeting",
+        "note": "Note"
+      }
+    },
+    "tooltips": {
+      "statusActive": "Active lead — being followed up by the owner.",
+      "statusInactive": "Inactive lead — not currently in the operational flow.",
+      "owner": "Person responsible for this lead.",
+      "dealValue": "Estimated value of this opportunity.",
+      "nextActionOverdue": "Action overdue — date has already passed.",
+      "nextActionSoon": "Next action within 3 days — attention needed.",
+      "nextActionOk": "Next action scheduled — no immediate urgency.",
+      "nextActionNone": "No follow-up scheduled for this lead.",
+      "score": "Conversion probability score (0–100).",
+      "age": "Days since first contact with this lead."
     }
   },
   "CrmFuturePage": {
@@ -568,5 +624,56 @@
     "stepOne": "Define indicators, filters, and operational rules for this area with the commercial team.",
     "stepTwo": "Connect the page to the real data already available in the people and interactions modules.",
     "stepThree": "Add automations, reports, and quick actions based on daily usage."
+  },
+  "AccountsPage": {
+    "title": "Accounts",
+    "description": "Manage strategic accounts, prospects, and customer relationships",
+    "newAccount": "New Account",
+    "edit": "Edit",
+    "delete": "Delete",
+    "cancel": "Cancel",
+    "deleting": "Deleting...",
+    "searchPlaceholder": "Search accounts by name, trade name, email, or city...",
+    "viewMode": "View",
+    "viewModeTable": "Table",
+    "viewModeCards": "Cards",
+    "filterByStatus": "Filter by status",
+    "filterByStage": "Filter by stage",
+    "allStatuses": "All statuses",
+    "allStages": "All stages",
+    "columnName": "Company",
+    "columnIndustry": "Industry",
+    "columnStage": "Stage",
+    "columnStatus": "Status",
+    "columnOwner": "Owner",
+    "columnCity": "City",
+    "columnCreatedAt": "Created",
+    "status_active": "Active",
+    "status_inactive": "Inactive",
+    "stage_prospect": "Prospect",
+    "stage_customer": "Customer",
+    "stage_churned": "Churned",
+    "stage_inactive": "Inactive",
+    "statsTotal": "Total Accounts",
+    "statsActive": "Active",
+    "statsCustomers": "Customers",
+    "statsProspects": "Prospects",
+    "emptyStateTitle": "No accounts found",
+    "emptyStateDescription": "Start by adding your first account or adjust the filters to see more results.",
+    "deleteTitle": "Delete Account",
+    "deleteDescription": "Are you sure you want to delete {name}? This action cannot be undone.",
+    "createSuccess": "Account created successfully",
+    "editSuccess": "Account updated successfully",
+    "deleteSuccess": "Account deleted successfully",
+    "owner": "Owner",
+    "unassigned": "Unassigned",
+    "tileEmail": "Email",
+    "tilePhone": "Phone",
+    "tileWebsite": "Website",
+    "tileIndustry": "Industry",
+    "email": "Email",
+    "phone": "Phone",
+    "website": "Website",
+    "industry": "Industry"
   }
 }

package/hedhog/frontend/messages/pt.json

@@ -203,6 +203,14 @@
     "saveAndNew": "Salvar e novo",
     "formShortcutsHint": "Atalhos: Ctrl/Cmd+S para salvar, Esc para fechar.",
     "duplicateWarning": "Possível duplicidade encontrada: {names}.",
+    "duplicateDialogTitle": "Possível cadastro duplicado",
+    "duplicateDialogDescription": "Encontramos registros com os mesmos dados principais. Escolha um cadastro principal para mesclar ou continue mesmo assim.",
+    "duplicateTargetLabel": "Cadastro principal",
+    "duplicateSelectTarget": "Selecione um cadastro para mesclar",
+    "duplicateContinueAction": "Continuar mesmo assim",
+    "duplicateMergeAction": "Mesclar com cadastro selecionado",
+    "duplicateMergeSuccess": "Mesclagem concluída com sucesso em {name}.",
+    "duplicateMergeError": "Falha ao mesclar cadastros.",
     "createdAt": "Criado em",
     "close": "Fechar",
     "copiedToClipboard": "Copiado para a área de transferência!",
@@ -326,6 +334,8 @@
     "tableCreatedAt": "Data de Criação",
     "loading": "Carregando...",
     "noResults": "Nenhum tipo de contato encontrado",
+    "emptyStateDescription": "Crie o primeiro tipo de contato ou ajuste a busca para encontrar registros existentes.",
+    "emptyStateAction": "Criar Tipo de Contato",
     "menuOpen": "Abrir menu",
     "menuActions": "Ações",
     "menuEdit": "Editar",
@@ -368,6 +378,8 @@
     "tableCreatedAt": "Data de Criação",
     "loading": "Carregando...",
     "noResults": "Nenhum tipo de documento encontrado",
+    "emptyStateDescription": "Crie o primeiro tipo de documento ou ajuste a busca para encontrar registros existentes.",
+    "emptyStateAction": "Criar Tipo de Documento",
     "menuOpen": "Abrir menu",
     "menuActions": "Ações",
     "menuEdit": "Editar",
@@ -555,8 +567,10 @@
     "filterBadge": "Leitura por responsável",
     "heroTitle": "Visualize o funil por estágio e distribua a operação com clareza.",
     "heroDescription": "Acompanhe a carga de cada owner, veja o tempo de maturação dos leads e identifique onde estão as próximas oportunidades de avanço.",
+    "newPerson": "Novo lead",
     "ownerFilterLabel": "Filtrar por owner",
     "ownerFilterAll": "Todos os owners",
+    "searchPlaceholder": "Buscar por lead, empresa ou nome fantasia...",
     "summary": {
       "total": {
         "title": "Leads no filtro",
@@ -586,6 +600,47 @@
       "days": "{count} dias",
       "nextAction": "Próxima ação",
       "noFollowup": "Sem follow-up"
+    },
+    "controls": {
+      "expandAll": "Abrir todos",
+      "collapseAll": "Fechar todos",
+      "showDetails": "Ver detalhes",
+      "hideDetails": "Ocultar detalhes"
+    },
+    "detail": {
+      "title": "Visão do lead",
+      "lost": "Oportunidade perdida",
+      "owner": "Owner",
+      "source": "Origem",
+      "advanceStage": "Avançar etapa",
+      "moveTo": "Mover para {stage}",
+      "timeline": "Linha do tempo",
+      "noInteractions": "Nenhuma interação registrada para este lead ainda.",
+      "loadingTimeline": "Carregando histórico de interações...",
+      "createdAt": "Criado em",
+      "lastInteraction": "Última interação",
+      "editCadastro": "Editar cadastro completo",
+      "stageMoveSuccess": "Lead movido para {stage} com sucesso",
+      "stageMoveError": "Falha ao mover lead de etapa",
+      "interactionType": {
+        "call": "Ligação",
+        "email": "E-mail",
+        "whatsapp": "WhatsApp",
+        "meeting": "Reunião",
+        "note": "Anotação"
+      }
+    },
+    "tooltips": {
+      "statusActive": "Lead ativo — em acompanhamento pelo responsável.",
+      "statusInactive": "Lead inativo — fora do fluxo operacional do momento.",
+      "owner": "Responsável por este lead.",
+      "dealValue": "Valor estimado desta oportunidade.",
+      "nextActionOverdue": "Ação atrasada — data já passou.",
+      "nextActionSoon": "Próxima ação em até 3 dias — atenção.",
+      "nextActionOk": "Próxima ação agendada — sem urgência.",
+      "nextActionNone": "Nenhum follow-up agendado para este lead.",
+      "score": "Pontuação de probabilidade de conversão (0–100).",
+      "age": "Dias desde o primeiro contato com este lead."
     }
   },
   "CrmFuturePage": {
@@ -602,5 +657,56 @@
     "stepOne": "Definir indicadores, filtros e regras operacionais desta área com o time comercial.",
     "stepTwo": "Conectar a página aos dados reais já existentes no módulo de pessoas e interações.",
     "stepThree": "Adicionar automações, relatórios e ações rápidas com base no uso diário."
+  },
+  "AccountsPage": {
+    "title": "Contas",
+    "description": "Gerencie contas estratégicas, prospects e relacionamentos com clientes",
+    "newAccount": "Nova Conta",
+    "edit": "Editar",
+    "delete": "Excluir",
+    "cancel": "Cancelar",
+    "deleting": "Excluindo...",
+    "searchPlaceholder": "Pesquisar contas por nome, razão social, email ou cidade...",
+    "viewMode": "Visualização",
+    "viewModeTable": "Tabela",
+    "viewModeCards": "Cards",
+    "filterByStatus": "Filtrar por status",
+    "filterByStage": "Filtrar por estágio",
+    "allStatuses": "Todos os status",
+    "allStages": "Todos os estágios",
+    "columnName": "Empresa",
+    "columnIndustry": "Setor",
+    "columnStage": "Estágio",
+    "columnStatus": "Status",
+    "columnOwner": "Responsável",
+    "columnCity": "Cidade",
+    "columnCreatedAt": "Criado em",
+    "status_active": "Ativo",
+    "status_inactive": "Inativo",
+    "stage_prospect": "Prospect",
+    "stage_customer": "Cliente",
+    "stage_churned": "Desativado",
+    "stage_inactive": "Inativo",
+    "statsTotal": "Total de Contas",
+    "statsActive": "Ativas",
+    "statsCustomers": "Clientes",
+    "statsProspects": "Prospects",
+    "emptyStateTitle": "Nenhuma conta encontrada",
+    "emptyStateDescription": "Comece adicionando sua primeira conta ou ajuste os filtros para ver mais resultados.",
+    "deleteTitle": "Excluir Conta",
+    "deleteDescription": "Tem certeza de que deseja excluir {name}? Esta ação não pode ser desfeita.",
+    "createSuccess": "Conta criada com sucesso",
+    "editSuccess": "Conta atualizada com sucesso",
+    "deleteSuccess": "Conta excluída com sucesso",
+    "owner": "Responsável",
+    "unassigned": "Não atribuído",
+    "tileEmail": "Email",
+    "tilePhone": "Telefone",
+    "tileWebsite": "Site",
+    "tileIndustry": "Setor",
+    "email": "Email",
+    "phone": "Telefone",
+    "website": "Site",
+    "industry": "Setor"
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hed-hog/contact",
-  "version": "0.0.279",
+  "version": "0.0.285",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "dependencies": {
@@ -9,13 +9,13 @@
     "@nestjs/core": "^11",
     "@nestjs/jwt": "^11",
     "@nestjs/mapped-types": "*",
-    "@hed-hog/core": "0.0.279",
-    "@hed-hog/address": "0.0.279",
+    "@hed-hog/address": "0.0.285",
+    "@hed-hog/api-mail": "0.0.8",
+    "@hed-hog/core": "0.0.285",
+    "@hed-hog/api": "0.0.4",
     "@hed-hog/api-pagination": "0.0.6",
-    "@hed-hog/api-locale": "0.0.13",
     "@hed-hog/api-prisma": "0.0.5",
-    "@hed-hog/api-mail": "0.0.8",
-    "@hed-hog/api": "0.0.4"
+    "@hed-hog/api-locale": "0.0.13"
   },
   "exports": {
     ".": {

package/src/person/dto/create-followup.dto.ts

@@ -0,0 +1,15 @@
+import { getLocaleText } from '@hed-hog/api-locale';
+import { IsDateString, IsOptional, IsString } from 'class-validator';
+
+export class CreateFollowupDTO {
+  @IsDateString({}, {
+    message: (args) => getLocaleText('validation.dateMustBeString', args.value),
+  })
+  next_action_at: string;
+
+  @IsOptional()
+  @IsString({
+    message: (args) => getLocaleText('validation.notesMustBeString', args.value),
+  })
+  notes?: string | null;
+}

package/src/person/dto/create-interaction.dto.ts

@@ -0,0 +1,23 @@
+import { getLocaleText } from '@hed-hog/api-locale';
+import { IsEnum, IsOptional, IsString } from 'class-validator';
+
+export enum PersonInteractionTypeDTO {
+  CALL = 'call',
+  EMAIL = 'email',
+  WHATSAPP = 'whatsapp',
+  MEETING = 'meeting',
+  NOTE = 'note',
+}
+
+export class CreateInteractionDTO {
+  @IsEnum(PersonInteractionTypeDTO, {
+    message: (args) => getLocaleText('validation.typeMustBeEnum', args.value),
+  })
+  type: PersonInteractionTypeDTO;
+
+  @IsOptional()
+  @IsString({
+    message: (args) => getLocaleText('validation.notesMustBeString', args.value),
+  })
+  notes?: string | null;
+}

package/src/person/dto/create.dto.ts

@@ -1,9 +1,11 @@
 import { getLocaleText } from '@hed-hog/api-locale';
 import {
+  IsArray,
   IsDateString,
   IsEnum,
   IsInt,
   IsOptional,
+  IsNumber,
   IsString,
 } from 'class-validator';
 
@@ -23,6 +25,25 @@ export enum PersonGender {
   OTHER = 'other'
 }
 
+export enum PersonSource {
+  REFERRAL = 'referral',
+  WEBSITE = 'website',
+  SOCIAL = 'social',
+  INBOUND = 'inbound',
+  OUTBOUND = 'outbound',
+  OTHER = 'other',
+}
+
+export enum PersonLifecycleStage {
+  NEW = 'new',
+  CONTACTED = 'contacted',
+  QUALIFIED = 'qualified',
+  PROPOSAL = 'proposal',
+  NEGOTIATION = 'negotiation',
+  CUSTOMER = 'customer',
+  LOST = 'lost',
+}
+
 export class CreateDTO {
   @IsString({ message: (args) => getLocaleText('validation.nameMustBeString', args.value) })
   name: string;
@@ -68,4 +89,33 @@ export class CreateDTO {
   @IsOptional()
   @IsInt({ message: (args) => getLocaleText('validation.idMustBeInteger', args.value) })
   employer_company_id?: number | null;
+
+  @IsOptional()
+  @IsInt({ message: (args) => getLocaleText('validation.idMustBeInteger', args.value) })
+  owner_user_id?: number | null;
+
+  @IsOptional()
+  @IsEnum(PersonSource, { message: (args) => getLocaleText('validation.typeMustBeEnum', args.value) })
+  source?: PersonSource | null;
+
+  @IsOptional()
+  @IsEnum(PersonLifecycleStage, { message: (args) => getLocaleText('validation.typeMustBeEnum', args.value) })
+  lifecycle_stage?: PersonLifecycleStage | null;
+
+  @IsOptional()
+  @IsDateString({}, { message: (args) => getLocaleText('validation.dateMustBeString', args.value) })
+  next_action_at?: string | null;
+
+  @IsOptional()
+  @IsNumber({}, { message: (args) => getLocaleText('validation.numberMustBeNumber', args.value) })
+  score?: number | null;
+
+  @IsOptional()
+  @IsNumber({}, { message: (args) => getLocaleText('validation.numberMustBeNumber', args.value) })
+  deal_value?: number | null;
+
+  @IsOptional()
+  @IsArray({ message: (args) => getLocaleText('validation.tagsMustBeArray', args.value) })
+  @IsString({ each: true, message: (args) => getLocaleText('validation.stringRequired', args.value) })
+  tags?: string[] | null;
 }

package/src/person/dto/duplicates-query.dto.ts

@@ -0,0 +1,34 @@
+import { Type } from 'class-transformer';
+import {
+    IsEmail,
+    IsInt,
+    IsOptional,
+    IsString,
+    ValidateIf,
+} from 'class-validator';
+
+export class CheckPersonDuplicatesQueryDTO {
+  @IsOptional()
+  @Type(() => Number)
+  @IsInt()
+  person_id?: number;
+
+  @IsOptional()
+  @IsEmail()
+  email?: string;
+
+  @IsOptional()
+  @IsString()
+  phone?: string;
+
+  @IsOptional()
+  @IsString()
+  document_value?: string;
+
+  @ValidateIf((value: CheckPersonDuplicatesQueryDTO) =>
+    Boolean(value.document_value),
+  )
+  @Type(() => Number)
+  @IsInt()
+  document_type_id?: number;
+}

package/src/person/dto/merge.dto.ts

@@ -0,0 +1,15 @@
+import { Type } from 'class-transformer';
+import { IsIn, IsInt } from 'class-validator';
+
+export class MergePersonDTO {
+  @Type(() => Number)
+  @IsInt()
+  source_person_id: number;
+
+  @Type(() => Number)
+  @IsInt()
+  target_person_id: number;
+
+  @IsIn(['contact_only'])
+  strategy: 'contact_only' = 'contact_only';
+}

package/src/person/dto/update-lifecycle-stage.dto.ts

@@ -0,0 +1,19 @@
+import { getLocaleText } from '@hed-hog/api-locale';
+import { IsEnum } from 'class-validator';
+
+export enum PersonLifecycleStageDTO {
+  NEW = 'new',
+  CONTACTED = 'contacted',
+  QUALIFIED = 'qualified',
+  PROPOSAL = 'proposal',
+  NEGOTIATION = 'negotiation',
+  CUSTOMER = 'customer',
+  LOST = 'lost',
+}
+
+export class UpdateLifecycleStageDTO {
+  @IsEnum(PersonLifecycleStageDTO, {
+    message: (args) => getLocaleText('validation.typeMustBeEnum', args.value),
+  })
+  lifecycle_stage: PersonLifecycleStageDTO;
+}

package/src/person/dto/update.dto.ts

@@ -1,5 +1,5 @@
 import { AddressTypeEnum } from '../../address-type.enum';
-import { PersonGender } from './create.dto';
+import { PersonGender, PersonLifecycleStage, PersonSource } from './create.dto';
 import { getLocaleText } from '@hed-hog/api-locale';
 import { Type } from 'class-transformer';
 import {
@@ -8,6 +8,7 @@ import {
   IsDateString,
   IsEnum,
   IsInt,
+  IsNumber,
   IsOptional,
   IsString,
   ValidateNested,
@@ -121,6 +122,35 @@ export class UpdateAllPersonDTO {
   @IsInt({ message: (args) => getLocaleText('validation.idMustBeInteger', args.value) })
   employer_company_id?: number | null;
 
+  @IsOptional()
+  @IsInt({ message: (args) => getLocaleText('validation.idMustBeInteger', args.value) })
+  owner_user_id?: number | null;
+
+  @IsOptional()
+  @IsEnum(PersonSource, { message: (args) => getLocaleText('validation.typeMustBeEnum', args.value) })
+  source?: PersonSource | null;
+
+  @IsOptional()
+  @IsEnum(PersonLifecycleStage, { message: (args) => getLocaleText('validation.typeMustBeEnum', args.value) })
+  lifecycle_stage?: PersonLifecycleStage | null;
+
+  @IsOptional()
+  @IsDateString({}, { message: (args) => getLocaleText('validation.dateMustBeString', args.value) })
+  next_action_at?: string | null;
+
+  @IsOptional()
+  @IsNumber({}, { message: (args) => getLocaleText('validation.numberMustBeNumber', args.value) })
+  score?: number | null;
+
+  @IsOptional()
+  @IsNumber({}, { message: (args) => getLocaleText('validation.numberMustBeNumber', args.value) })
+  deal_value?: number | null;
+
+  @IsOptional()
+  @IsArray({ message: (args) => getLocaleText('validation.tagsMustBeArray', args.value) })
+  @IsString({ each: true, message: (args) => getLocaleText('validation.stringRequired', args.value) })
+  tags?: string[] | null;
+
   @IsOptional()
   @IsInt({ message: (args) => getLocaleText('validation.idMustBeInteger', args.value) })
   headquarter_id?: number | null;

package/src/person/person.controller.ts

@@ -16,7 +16,12 @@ import {
     forwardRef
 } from '@nestjs/common';
 import { Response } from 'express';
+import { CreateFollowupDTO } from './dto/create-followup.dto';
+import { CreateInteractionDTO } from './dto/create-interaction.dto';
 import { CreateDTO } from './dto/create.dto';
+import { CheckPersonDuplicatesQueryDTO } from './dto/duplicates-query.dto';
+import { MergePersonDTO } from './dto/merge.dto';
+import { UpdateLifecycleStageDTO } from './dto/update-lifecycle-stage.dto';
 import { UpdateAllPersonDTO } from './dto/update.dto';
 import { PersonService } from './person.service';
 
@@ -38,9 +43,17 @@ export class PersonController {
     return this.personService.getOwnerOptions(Number(user?.id || 0));
   }
 
+  @Get('duplicates')
+  async checkDuplicates(@Query() query: CheckPersonDuplicatesQueryDTO) {
+    return this.personService.checkDuplicates(query);
+  }
+
   @Get()
-  async list(@Pagination() paginationParams, @Query() filters) {
-    return this.personService.list({ ...paginationParams, ...filters });
+  async list(@Pagination() paginationParams, @Query() filters, @User() user) {
+    return this.personService.list(
+      { ...paginationParams, ...filters },
+      Number(user?.id || 0),
+    );
   }
 
   @Public()
@@ -63,6 +76,54 @@ export class PersonController {
     return this.personService.create(data, locale);
   }
 
+  @Post('merge')
+  async merge(@Body() data: MergePersonDTO, @Locale() locale: string) {
+    return this.personService.merge(data, locale);
+  }
+
+  @Get(':id/interaction')
+  async listInteractions(
+    @Param('id', ParseIntPipe) id: number,
+    @Locale() locale: string,
+  ) {
+    return this.personService.listInteractions(id, locale);
+  }
+
+  @Post(':id/interaction')
+  async createInteraction(
+    @Param('id', ParseIntPipe) id: number,
+    @Body() data: CreateInteractionDTO,
+    @Locale() locale: string,
+    @User() user,
+  ) {
+    return this.personService.createInteraction(id, data, locale, {
+      id: Number(user?.id || 0),
+      name: user?.name,
+    });
+  }
+
+  @Post(':id/followup')
+  async createFollowup(
+    @Param('id', ParseIntPipe) id: number,
+    @Body() data: CreateFollowupDTO,
+    @Locale() locale: string,
+    @User() user,
+  ) {
+    return this.personService.scheduleFollowup(id, data, locale, {
+      id: Number(user?.id || 0),
+      name: user?.name,
+    });
+  }
+
+  @Post(':id/lifecycle-stage')
+  async updateLifecycleStage(
+    @Param('id', ParseIntPipe) id: number,
+    @Body() data: UpdateLifecycleStageDTO,
+    @Locale() locale: string,
+  ) {
+    return this.personService.updateLifecycleStage(id, data, locale);
+  }
+
   @Patch(':id')
   async update(
     @Param('id', ParseIntPipe) id: number,