Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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
23 changes: 22 additions & 1 deletion src/controllers/tombos-controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,12 @@
import {
converteParaDecimal, converteDecimalParaGraus, converteDecimalParaGMSGrau, converteDecimalParaGMSMinutos, converteDecimalParaGMSSegundos,
} from '../helpers/coordenadas';
import pick from '../helpers/pick';

Check warning on line 10 in src/controllers/tombos-controller.js

View workflow job for this annotation

GitHub Actions / lint

There should be no empty line within import group
import { converteInteiroParaRomano } from '../helpers/tombo';
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 @@
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
13 changes: 12 additions & 1 deletion src/routes/tombos.js
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
Loading