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
4 changes: 2 additions & 2 deletions src/controllers/pendencias-controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -1370,7 +1370,7 @@ export const aprovarPendencia = async (alteracao, hcf, transaction) => {
: tomboAtual.cidade_id;

if (cidadeRefId !== undefined && cidadeRefId !== null) {
if (localColeta.cidade_id !== cidadeRefId) {
if (Number(localColeta.cidade_id) !== Number(cidadeRefId)) {
throw new BadRequestExeption(535);
}
}
Expand Down Expand Up @@ -1573,7 +1573,7 @@ export const aprovarPendencia = async (alteracao, hcf, transaction) => {
}

const tomboFinal = await Tombo.findOne({
where: { hcf, ativo: 1 },
where: { hcf, ativo: true },
transaction,
raw: true,
nest: true,
Expand Down
6 changes: 3 additions & 3 deletions src/controllers/tombos-controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,7 @@ export const cadastro = (request, response, next) => {
usuario_id: request.usuario.id,
status,
tombo_json: JSON.stringify(tomboData),
ativo: true,
ativo: 1,
identificacao: 1,
};
tomboCriado = tombo;
Expand Down Expand Up @@ -486,7 +486,7 @@ function alteracaoIdentificador(request, transaction) {
usuario_id: request.usuario.id,
status: 'ESPERANDO',
tombo_json: JSON.stringify(update),
ativo: true,
ativo: 1,
identificacao: 1,
}, { transaction }))
.then(alteracaoIdent => {
Expand Down Expand Up @@ -612,7 +612,7 @@ function alteracaoCuradorouOperador(request, response, transaction) {
usuario_id: request.usuario.id,
status: 'ESPERANDO',
tombo_json: JSON.stringify(update),
ativo: true,
ativo: 1,
identificacao: 1,
}, { transaction })
.then(alteracaoCriada => {
Expand Down
3 changes: 2 additions & 1 deletion src/middlewares/tokens-middleware.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@ export default (tipoUsuarioPermitido = []) =>
}

const usuario = decodificaTokenUsuario(token);
usuario.tipo_usuario_id = Number(usuario.tipo_usuario_id);

const estaPermitido = !Array.isArray(tipoUsuarioPermitido) || tipoUsuarioPermitido.length < 1 || tipoUsuarioPermitido.includes(Number(usuario.tipo_usuario_id));
const estaPermitido = !Array.isArray(tipoUsuarioPermitido) || tipoUsuarioPermitido.length < 1 || tipoUsuarioPermitido.includes(usuario.tipo_usuario_id);

if (!estaPermitido) {
throw new ForbiddenException(102);
Expand Down
4 changes: 2 additions & 2 deletions src/models/Alteracao.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@ export default (Sequelize, DataTypes) => {
allowNull: false,
},
ativo: {
type: DataTypes.BOOLEAN,
type: DataTypes.SMALLINT,
allowNull: true,
},
identificacao: {
type: DataTypes.BOOLEAN,
type: DataTypes.SMALLINT,
allowNull: true,
},
};
Expand Down
Loading