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
5 changes: 2 additions & 3 deletions src/controllers/usuarios-controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import models from '../models';
import codigos from '../resources/codigos-http';

const {
Sequelize: { Op }, Usuario, TipoUsuario, Coletor,
Sequelize: { Op }, Usuario, TipoUsuario, Coletor, Identificador,
} = models;

export const encontraUsuarioAtivoPorEmail = email => {
Expand Down Expand Up @@ -262,11 +262,10 @@ export const obtemIdentificadores = (request, response, next) => {
const { nome } = request.query;

Promise.resolve()
.then(() => Usuario.findAll({
.then(() => Identificador.findAll({
attributes: ['id', 'nome'],
order: [['nome', 'ASC']],
where: {
ativo: true,
nome: { [Op.like]: `%${nome}%` },
},
limit: 10,
Expand Down
10 changes: 5 additions & 5 deletions src/routes/identificador.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as identificadoresController from '../controllers/identificador-controller';
import listagensMiddleware from '../middlewares/listagens-middleware';
import tokensMiddleware from '../middlewares/tokens-middleware';
import tokensMiddleware, { TIPOS_USUARIOS } from '../middlewares/tokens-middleware';
import validacoesMiddleware from '../middlewares/validacoes-middleware';
import atualizarIdentificadorEsquema from '../validators/identificador-atualiza';
import cadastrarIdentificadorEsquema from '../validators/identificador-cadastro';
Expand Down Expand Up @@ -62,7 +62,7 @@ export default app => {
* $ref: '#/components/responses/InternalServerError'
*/
app.route('/identificadores').post([
tokensMiddleware(['CURADOR']),
tokensMiddleware([TIPOS_USUARIOS.CURADOR]),
validacoesMiddleware(cadastrarIdentificadorEsquema),
identificadoresController.cadastraIdentificador,
]);
Expand Down Expand Up @@ -103,7 +103,7 @@ export default app => {
* $ref: '#/components/responses/InternalServerError'
*/
app.route('/identificadores/:id').get([
tokensMiddleware(['CURADOR']),
tokensMiddleware([TIPOS_USUARIOS.CURADOR]),
listagensMiddleware,
identificadoresController.encontradaIdentificador,
]);
Expand Down Expand Up @@ -167,7 +167,7 @@ export default app => {
* $ref: '#/components/responses/InternalServerError'
*/
app.route('/identificadores').get([
tokensMiddleware(['CURADOR']),
tokensMiddleware([TIPOS_USUARIOS.CURADOR]),
validacoesMiddleware(listarIdentificadoresEsquema),
listagensMiddleware,
identificadoresController.listaIdentificadores,
Expand Down Expand Up @@ -225,7 +225,7 @@ export default app => {
* $ref: '#/components/responses/InternalServerError'
*/
app.route('/identificadores/:id').put([
tokensMiddleware(['CURADOR']),
tokensMiddleware([TIPOS_USUARIOS.CURADOR]),
validacoesMiddleware(atualizarIdentificadorEsquema),
identificadoresController.atualizaIdentificador,
]);
Expand Down
Loading