serverest 2.27.5 → 2.29.0-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "serverest",
-  "version": "2.27.5",
+  "version": "2.29.0-beta.1",
   "description": "Servidor REST local de forma rápida e simples para estudo de testes de API",
   "author": "Paulo Gonçalves <author@serverest.dev> (https://www.linkedin.com/in/paulo-goncalves/)",
   "license": "GPL-3.0",
@@ -53,6 +53,7 @@
     "dd-trace": "^4.14.0",
     "debug": "^4.3.4",
     "dotenv": "^16.3.1",
+    "escape-string-regexp": "^4.0.0",
     "express": "^4.17.1",
     "express-async-errors": "^3.1.1",
     "express-query-int": "^3.0.0",

package/src/app.js

@@ -9,7 +9,6 @@ const queryParser = require('express-query-int')
 const timeout = require('connect-timeout')
 const { join } = require('path')
 const swaggerUi = require('swagger-ui-express')
-const ddTrace = require('dd-trace')
 
 const {
   aplicacaoExecutandoLocalmente,
@@ -27,7 +26,8 @@ const packageJson = require('../package.json')
 const app = express()
 
 /* istanbul ignore next */
-if (formaDeExecucao() !== 'npm') {
+if (!aplicacaoExecutandoLocalmente()) {
+  const ddTrace = require('dd-trace')
   ddTrace.init()
   ddTrace.use('express')
 }
@@ -44,6 +44,8 @@ app.disable('etag')
 /* istanbul ignore else */
 if (!conf.semHeaderDeSeguranca) {
   app.disable('x-powered-by')
+  app.disable('Server')
+  app.disable('X-Cloud-Trace-Context')
   app.use((req, res, next) => {
     res.set('x-dns-prefetch-control', 'off')
     res.set('x-frame-options', 'SAMEORIGIN')
@@ -62,25 +64,18 @@ if (aplicacaoExecutandoLocalmente() && !ehAmbienteDeTestes) {
 
 localMonitor(app)
 
-/* istanbul ignore next */
-switch (formaDeExecucao()) {
-  case 'serverest.dev':
-    swaggerDocument.host = 'serverest.dev'
-    break
-  case 'staging.serverest.dev':
-    swaggerDocument.host = 'staging.serverest.dev'
-    break
-  case 'agilizei':
-    swaggerDocument.host = 'agilizei.serverest.dev'
-    break
-  case 'compassuol':
-    swaggerDocument.host = 'compassuol.serverest.dev'
-    break
-  case 'cesarschool':
-    swaggerDocument.host = 'cesarschool.serverest.dev'
-    break
+const hostMapping = {
+  'serverest.dev': 'serverest.dev',
+  'staging.serverest.dev': 'staging.serverest.dev',
+  agilizei: 'agilizei.serverest.dev',
+  compassuol: 'compassuol.serverest.dev',
+  cesarschool: 'cesarschool.serverest.dev'
 }
 
+const environment = formaDeExecucao()
+
+swaggerDocument.host = hostMapping?.[environment] ?? swaggerDocument.host
+
 swaggerDocument.info.version = packageJson.version
 
 const uiOptions = {

package/src/controllers/login-controller.js

@@ -6,11 +6,13 @@ const { conf } = require('../utils/conf')
 const usuariosService = require('../services/usuarios-service')
 
 exports.post = async (req, res) => {
-  if (await usuariosService.existeUsuario(req.body)) {
-    const token = authService.createToken(req.body)
-    /* istanbul ignore next */
-    const authorization = conf.semBearer ? token : `Bearer ${token}`
-    return res.status(200).send({ message: constant.LOGIN_SUCCESS, authorization })
+  const userExists = await usuariosService.existeUsuario(req.body)
+  if (!userExists) {
+    return res.status(401).send({ message: constant.LOGIN_FAIL })
   }
-  res.status(401).send({ message: constant.LOGIN_FAIL })
+
+  const token = authService.createToken(req.body)
+  /* istanbul ignore next */
+  const authorization = conf.semBearer ? token : `Bearer ${token}`
+  return res.status(200).send({ message: constant.LOGIN_SUCCESS, authorization })
 }

package/src/controllers/produtos-controller.js

@@ -19,18 +19,25 @@ exports.getOne = async (req, res) => {
 }
 
 exports.post = async (req, res) => {
-  if (await service.existeProduto({ nome: req.body.nome.trim() })) {
+  const { nome } = req.body
+  const trimmedName = nome.trim()
+
+  const productExists = await service.existeProduto({ nome: trimmedName })
+
+  if (productExists) {
     return res.status(400).send({ message: constant.NAME_ALREADY_USED })
   }
-  const dadosCadastrados = await service.criarProduto(req.body)
-  res.status(201).send({ message: constant.POST_SUCCESS, _id: dadosCadastrados._id })
+
+  const { _id } = await service.criarProduto(req.body)
+
+  res.status(201).send({ message: constant.POST_SUCCESS, _id })
 }
 
 exports.delete = async (req, res) => {
   const carrinhoDoUsuario = await carrinhosService.getAll({ produtos: { $elemMatch: { idProduto: req.params.id } } })
-  const usuarioTemCarrinho = typeof carrinhoDoUsuario[0] !== 'undefined'
+  const usuarioTemCarrinho = carrinhoDoUsuario.length > 0
   if (usuarioTemCarrinho) {
-    const idCarrinhos = carrinhoDoUsuario.map((carrinhos) => { return carrinhos._id })
+    const idCarrinhos = carrinhoDoUsuario.map(carrinhos => carrinhos._id)
     return res.status(400).send({ message: constant.DELETE_PRODUCT_WITH_CART, idCarrinhos })
   }
   const quantidadeRegistrosExcluidos = await service.deleteById(req.params.id)
@@ -39,11 +46,20 @@ exports.delete = async (req, res) => {
 }
 
 exports.put = async (req, res) => {
-  const idInexistenteENomeRepetido = await service.existeProduto({ nome: req.body.nome.trim(), $not: { _id: req.params.id } })
-  if (idInexistenteENomeRepetido) {
-    return res.status(400).send({ message: constant.NAME_ALREADY_USED })
+  const { id } = req.params
+  const { nome } = req.body
+  const product = { nome: nome.trim(), $not: { _id: id } }
+
+  const productExists = await service.existeProduto(product)
+
+  if (productExists) {
+    return res.status(400).json({ message: constant.NAME_ALREADY_USED })
   }
-  const registroCriado = await service.createOrUpdateById(req.params.id, req.body)
-  if (registroCriado._id !== req.params.id) { return res.status(201).send({ message: constant.POST_SUCCESS, _id: registroCriado._id }) }
-  res.status(200).send({ message: constant.PUT_SUCCESS })
+
+  const updatedProduct = await service.createOrUpdateById(id, req.body)
+  if (updatedProduct._id !== id) {
+    return res.status(201).json({ message: constant.POST_SUCCESS, _id: updatedProduct._id })
+  }
+
+  return res.status(200).json({ message: constant.PUT_SUCCESS })
 }

package/src/utils/alterarValoresParaRegex.js

@@ -1,9 +1,17 @@
+const escapeStringRegexp = require('escape-string-regexp')
+
+const { log } = require('./logger')
+
 module.exports = queryString => {
   Object.keys(queryString).forEach(key => {
     if (['nome', 'password', 'descricao'].includes(key)) {
       try {
-        queryString[key] = new RegExp(queryString[key])
-      } catch (error) {}
+        // Add 'i' flag for case-insensitive matching
+        queryString[key] = new RegExp(escapeStringRegexp(queryString[key]), 'i')
+      } catch (error) /* istanbul ignore next */ {
+        log({ level: 'error', message: `Failed to convert ${key} to RegExp: ${error.message}` })
+        throw error
+      }
     }
   })
   return queryString

package/src/utils/ambiente.js

@@ -2,40 +2,39 @@
 
 const { conf } = require('./conf')
 
+const environments = new Set([
+  'docker',
+  'serverest.dev',
+  'staging.serverest.dev',
+  'agilizei',
+  'cesarschool',
+  'compassuol'
+])
+
 function formaDeExecucao () {
-  if (process.env.ENVIRONMENT === 'docker' ||
-      process.env.ENVIRONMENT === 'serverest.dev' ||
-      process.env.ENVIRONMENT === 'staging.serverest.dev' ||
-      process.env.ENVIRONMENT === 'agilizei' ||
-      process.env.ENVIRONMENT === 'cesarschool' ||
-      process.env.ENVIRONMENT === 'compassuol') {
-    return process.env.ENVIRONMENT
-  }
-  return 'npm'
+  const env = process.env.ENVIRONMENT
+  return environments.has(env) ? env : 'npm'
 }
 
 const ehAmbienteDeTestes = process.env.NODE_ENV === 'serverest-test'
 const ehAmbienteDeDesenvolvimento = process.env.NODE_ENV === 'serverest-development'
 
 const aplicacaoExecutandoLocalmente = () => {
-  return (formaDeExecucao() === 'npm' || formaDeExecucao() === 'docker')
+  const environment = formaDeExecucao()
+  return environment === 'npm' || environment === 'docker'
+}
+
+const urlMapping = {
+  'serverest.dev': 'https://serverest.dev',
+  'staging.serverest.dev': 'https://staging.serverest.dev',
+  agilizei: 'https://agilizei.serverest.dev',
+  compassuol: 'https://compassuol.serverest.dev',
+  cesarschool: 'https://cesarschool.serverest.dev'
 }
 
 function urlDocumentacao () {
-  switch (formaDeExecucao()) {
-    case 'serverest.dev':
-      return 'https://serverest.dev'
-    case 'staging.serverest.dev':
-      return 'https://staging.serverest.dev'
-    case 'agilizei':
-      return 'https://agilizei.serverest.dev'
-    case 'compassuol':
-      return 'https://compassuol.serverest.dev'
-    case 'cesarschool':
-      return 'https://cesarschool.serverest.dev'
-    default:
-      return `http://localhost:${conf.porta}`
-  }
+  const environment = formaDeExecucao()
+  return urlMapping[environment] || `http://localhost:${conf.porta}`
 }
 
 module.exports = {

package/src/utils/getRandomFinancialContributor.js

@@ -2,23 +2,29 @@
 
 const axios = require('axios')
 
+const { log } = require('../utils/logger')
+
 module.exports = async () => {
-  const { data } = await axios.get('https://opencollective.com/serverest/members/all.json')
-  const userArray = removeAdminAndHostUser(data)
-  let arrayNameUsers = getOnlyNameFromAllUsers(userArray)
-  arrayNameUsers = removeDuplicatedValuesFromArray(arrayNameUsers)
-  const randomFinancialContributor = arrayNameUsers[Math.floor(Math.random() * arrayNameUsers.length)]
-  return randomFinancialContributor
+  try {
+    const { data: users } = await axios.get('https://opencollective.com/serverest/members/all.json')
+    const filteredUsers = removeAdminAndHostUser(users)
+    const uniqueUserNames = getUniqueUserNames(filteredUsers)
+    const randomFinancialContributor = getRandomElement(uniqueUserNames)
+    return randomFinancialContributor
+  } catch (error) {
+    log({ level: 'error', message: 'Failed to get financial contributor.' })
+  }
 }
 
 const removeAdminAndHostUser = userArray => {
   return userArray.filter((user) => user.role !== 'ADMIN' && user.role !== 'HOST' && user.name !== 'Paulo Gonçalves')
 }
 
-const getOnlyNameFromAllUsers = userArray => {
-  return Object.keys(userArray).map((key) => userArray[key].name)
+const getUniqueUserNames = userArray => {
+  const names = userArray.map(user => user.name)
+  return [...new Set(names)]
 }
 
-const removeDuplicatedValuesFromArray = array => {
-  return [...new Set(array)]
+const getRandomElement = array => {
+  return array[Math.floor(Math.random() * array.length)]
 }

package/src/utils/localMonitor.js

@@ -22,23 +22,24 @@ module.exports = async app => {
     return
   }
   const { porta, timeout, nodoc, nobearer, nosec } = require('../server').argv
+  const urlsToSkip = [
+    '/__messages__',
+    '/favicon.ico',
+    '/socket.io',
+    '/swagger-ui.css',
+    '/swagger-ui.css.map',
+    '/swagger-ui-init.js',
+    '/swagger-ui-standalone-preset.js',
+    '/swagger-ui-standalone-preset.js.map',
+    '/swagger-ui-bundle.js',
+    '/swagger-ui-bundle.js.map'
+  ]
   const moesifMiddleware = moesif({
     applicationId: process.env.MOESIF_APPLICATION_ID,
     identifyUser: (req, res) => { return formaDeExecucao() },
     identifyCompany: (req, res) => { return version },
     skip: (req, res) => {
-      if (req.originalUrl === '/__messages__' ||
-          req.originalUrl === '/favicon.ico' ||
-          req.originalUrl === '/socket.io' ||
-          req.originalUrl === '/swagger-ui.css' ||
-          req.originalUrl === '/swagger-ui.css.map' ||
-          req.originalUrl === '/swagger-ui-init.js' ||
-          req.originalUrl === '/swagger-ui-standalone-preset.js' ||
-          req.originalUrl === '/swagger-ui-standalone-preset.js.map' ||
-          req.originalUrl === '/swagger-ui-bundle.js' ||
-          req.originalUrl === '/swagger-ui-bundle.js.map') {
-        return true
-      }
+      return urlsToSkip.includes(req.originalUrl)
     },
     getMetadata: (req, res) => {
       return {

package/src/utils/logger.js

@@ -1,15 +1,20 @@
-const tracer = require('dd-trace')
-const formats = require('dd-trace/ext/formats')
+const { aplicacaoExecutandoLocalmente } = require('./ambiente')
+/* istanbul ignore next */
+const tracer = aplicacaoExecutandoLocalmente() ? null : require('dd-trace')
+/* istanbul ignore next */
+const formats = tracer ? require('dd-trace/ext/formats') : null
 
 function log ({ level = 'alert', message }) {
-  const span = tracer.scope().active()
   const time = new Date().toISOString()
   const record = { time, level, message }
+  console.log(record)
   /* istanbul ignore next */
-  if (span) {
-    tracer.inject(span.context(), formats.LOG, record)
+  if (tracer) {
+    const span = tracer.scope().active()
+    if (span) {
+      tracer.inject(span.context(), formats.LOG, record)
+    }
   }
-  console.log(record)
 }
 
 module.exports = { log }