From 68102edd0f2c41c0d6a7f65db7a8f38b802cf81f Mon Sep 17 00:00:00 2001 From: Edvaldo Szymonek Date: Mon, 8 Jun 2026 09:02:04 -0300 Subject: [PATCH] corrige alias de coletor na listagem de tombos --- docker-compose.yml | 2 +- src/controllers/darwincore-controller.js | 1 + src/controllers/fichas-tombos-controller.js | 1 + src/controllers/pendencias-controller.js | 3 ++- src/controllers/relatorios-controller.js | 1 + src/controllers/splinker-controller.js | 1 + src/controllers/tombos-controller.js | 3 +++ src/services/tombos-service.js | 2 +- 8 files changed, 11 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 761a09fb..b3f364a0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,7 +14,7 @@ services: POSTGRES_USER: $PG_USERNAME POSTGRES_PASSWORD: $PG_PASSWORD volumes: - - postgres_data:/var/lib/postgresql/data + - postgres_data:/var/lib/postgresql ports: - ${PG_PORT:-5432}:5432 shm_size: 128mb diff --git a/src/controllers/darwincore-controller.js b/src/controllers/darwincore-controller.js index c2a591f4..230dffd2 100644 --- a/src/controllers/darwincore-controller.js +++ b/src/controllers/darwincore-controller.js @@ -193,6 +193,7 @@ const obterModeloDarwinCoreLotes = async (limit, offset, request, response) => { }, { model: Coletor, + as: 'coletor', }, { model: ColetorComplementar, diff --git a/src/controllers/fichas-tombos-controller.js b/src/controllers/fichas-tombos-controller.js index 3a41097e..374d63c7 100644 --- a/src/controllers/fichas-tombos-controller.js +++ b/src/controllers/fichas-tombos-controller.js @@ -88,6 +88,7 @@ export default function fichaTomboController(request, response, next) { const include = [ { model: Coletor, + as: 'coletor', }, { model: Identificador, diff --git a/src/controllers/pendencias-controller.js b/src/controllers/pendencias-controller.js index 993ac8f6..f6363067 100644 --- a/src/controllers/pendencias-controller.js +++ b/src/controllers/pendencias-controller.js @@ -1007,6 +1007,7 @@ export const visualizarAlteracaoOperador = (json, alteracao, transaction) => { include: [ { model: Coletor, + as: 'coletor', }, { model: Herbario, @@ -1889,7 +1890,7 @@ export async function visualizar(request, response, next) { include: [ { model: Variedade }, { model: Especie }, { model: Familia }, { model: Subfamilia }, { model: Genero }, { model: Subespecie }, - { model: Herbario }, { model: Tipo }, { model: Coletor }, { model: ColetorComplementar, as: 'coletor_complementar' }, + { model: Herbario }, { model: Tipo }, { model: Coletor, as: 'coletor' }, { model: ColetorComplementar, as: 'coletor_complementar' }, { model: Solo }, { model: Relevo }, { model: Vegetacao }, { model: ColecaoAnexa }, { model: FaseSucessional }, { model: LocalColeta, diff --git a/src/controllers/relatorios-controller.js b/src/controllers/relatorios-controller.js index e9a956eb..462d02ee 100644 --- a/src/controllers/relatorios-controller.js +++ b/src/controllers/relatorios-controller.js @@ -445,6 +445,7 @@ export const obtemDadosDoRelatorioDeColetaPorColetorEIntervaloDeData = async (re }, { model: Coletor, + as: 'coletor', where: whereColetor, required: true, attributes: ['id', 'nome'], diff --git a/src/controllers/splinker-controller.js b/src/controllers/splinker-controller.js index b4b3ad2c..3e390155 100644 --- a/src/controllers/splinker-controller.js +++ b/src/controllers/splinker-controller.js @@ -122,6 +122,7 @@ const obterModeloSPlinkerLotes = async (limit, offset, request, response) => { }, { model: Coletor, + as: 'coletor', }, { model: Identificador, diff --git a/src/controllers/tombos-controller.js b/src/controllers/tombos-controller.js index 05af31fe..2a154ee4 100644 --- a/src/controllers/tombos-controller.js +++ b/src/controllers/tombos-controller.js @@ -746,6 +746,7 @@ export const listagem = (request, response, next) => { let include = [ { model: Coletor, + as: 'coletor', attributes: ['id', 'nome'], required: false, }, @@ -838,6 +839,7 @@ export async function listagemTombosPorIdentificador(request, response, next) { }, { model: Coletor, + as: 'coletor', attributes: ['id', 'nome'], required: false, }, @@ -1198,6 +1200,7 @@ export const obterTombo = async (request, response, next) => { }, { model: Coletor, + as: 'coletor', attributes: ['id', 'nome'], }, { diff --git a/src/services/tombos-service.js b/src/services/tombos-service.js index 2ba53022..5059a948 100644 --- a/src/services/tombos-service.js +++ b/src/services/tombos-service.js @@ -40,7 +40,7 @@ export function selecionaObjetoCompletoTomboPorId(condicoes, transacao) { { required: true, model: Coletor, - through: { attributes: [] }, + as: 'coletor', }, ],