Skip to content

Fazer incremento do numero hcf na api #438

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
JosueModesto wants to merge 8 commits into from
Closed

Fazer incremento do numero hcf na api #438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5263551
Criação da função do cálculo do número do hcf na api, alteração do ca…
JosueModesto Apr 15, 2026
be7cc74
fix: refazendo o pull request de incrimento do numero hcf na api
JosueModesto May 13, 2026
0b67a70
ajustes: hcf da requisicao e auth da rota
JosueModesto May 13, 2026
55d38d2
fix: incremento do numero hcf na api, adicionando o postgres no gitig…
JosueModesto May 13, 2026
89ac4fa
chore: parar de versionar dados do postgresql
JosueModesto May 13, 2026
c6db3ff
chore: remove yarn artifacts e packageManager
JosueModesto May 13, 2026
53c2cc9
fix: refatoração do fluxo para obtenção do proximo número hcf
JosueModesto May 13, 2026
8fbac3b
chore: restore yarn lock
JosueModesto May 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ node_modules/

uploads/
mysql/data/
postgresql/
reports/data/fs.journal
reports/data/fs.version
reports/data/profiles
Expand Down
24 changes: 23 additions & 1 deletion src/controllers/tombos-controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import models from '../models';
import codigos from '../resources/codigos-http';
import verifyRecaptcha from '../utils/verify-recaptcha';
import { aprovarPendencia } from './pendencias-controller';

const {
Solo, Relevo, Cidade, Estado, Vegetacao, FaseSucessional, Pais, Tipo, LocalColeta, Familia, sequelize,
Genero, Subfamilia, Autor, Coletor, Variedade, Subespecie, TomboFoto, Identificador,
Expand All @@ -35,6 +34,28 @@ function parseDataTombo(valor) {
return null;
}

const getProximoNumeroTombo = async () => {
const resultado = await Tombo.findOne({
attributes: [
[fn('MAX', col('hcf')), 'max_hcf'],
],
raw: true,
});
const maxNumero = resultado?.max_hcf;
return maxNumero ? Number(maxNumero) + 1 : 1;
};

export const getProximoNumeroTomboEndPoint = async (request, response, next) => {
try {
const proximoNumero = await getProximoNumeroTombo();
response
.status(codigos.BUSCAR_UM_ITEM)
.json({ hcf: proximoNumero });
} catch (error) {
next(error);
}
};

export const cadastro = (request, response, next) => {
const {
principal,
Expand Down Expand Up @@ -299,6 +320,7 @@ export const cadastro = (request, response, next) => {
// /////////// CADASTRA TOMBO /////////////
.then(() => {
let jsonTombo = {
hcf: principal.hcf,
Copy link
Copy Markdown
Collaborator

@edvaldoszy edvaldoszy May 15, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JosueModesto o André me confirmou que o compartamento antigo estava correto, então por favor, remove esta linha aqui que pega o número que o frontend enviou, mantém só o código que você fez pra gerar o próximo número mesmo.

Image

numero_coleta: principal.numero_coleta,
cidade_id: localidade.cidade_id,
coletor_id: coletor,
Expand Down
13 changes: 12 additions & 1 deletion src/routes/tombos.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
alteracao, getNumeroColetor, getUltimoNumeroTombo, getCodigoBarraTombo,
editarCodigoBarra, getUltimoNumeroCodigoBarras, postCodigoBarraTombo,
verificarCoordenada, getUltimoCodigoBarra, deletarCodigoBarras, listagemTombosPorIdentificador,
relatorioPorPeriodo,
relatorioPorPeriodo, getProximoNumeroTomboEndPoint,
} from '../controllers/tombos-controller';
import exportarTombosController from '../controllers/tombos-exportacoes-controller';
import criaJsonMiddleware from '../middlewares/json-middleware';
Expand All @@ -21,6 +21,7 @@ import coletorCadastro from '../validators/coletor-cadastro';
import cadastrarTipoEsquema from '../validators/tipo-cadastro';
import cadastrarTomboEsquema from '../validators/tombo-cadastro';
import listagemTombo from '../validators/tombo-listagem';

/**
* @swagger
* tags:
Expand Down Expand Up @@ -355,6 +356,16 @@ export default app => {
getUltimoNumeroTombo,
]);

app.route('/tombos/proximo_numero')
.get([
tokensMiddleware([
TIPOS_USUARIOS.CURADOR,
TIPOS_USUARIOS.OPERADOR,
TIPOS_USUARIOS.IDENTIFICADOR,
]),
getProximoNumeroTomboEndPoint,
]);

/**
* @swagger
* /tombos/ultimo_codigo_barra:
Expand Down
4 changes: 4 additions & 0 deletions src/validators/tombo-cadastro.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ export default {
},
isInt: true,
},
'json.principal.hcf': {
in: 'body',
isInt: true,
},
'json.principal.data_tombo': {
in: 'body',
custom: {
Expand Down
Loading