From 8e4e79d059bf0fd8eb1f72a20ef252d58ea4dd37 Mon Sep 17 00:00:00 2001 From: Rafael Lopes Date: Mon, 20 Jul 2026 15:22:37 -0300 Subject: [PATCH 1/2] =?UTF-8?q?FIX:=20Corrigido=20status=20em=20espera=20p?= =?UTF-8?q?ara=20requisi=C3=A7=C3=B5es?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Requisições possui um código diferente de incidentes para em espera - Adicionado if tipo === 'reuqusicao' em espera = -5 --- src/services/servicenowService.js | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/src/services/servicenowService.js b/src/services/servicenowService.js index 77941c2..869d9c3 100644 --- a/src/services/servicenowService.js +++ b/src/services/servicenowService.js @@ -437,17 +437,6 @@ const fetchAndProcessClosedTicketsFromSN = async () => { }; const updateStatusInServiceNow = async (snTicketId, state) => { - // Mapeamento de status de string para codigo numerico do ServiceNow - const stateMap = { - 'Aguardando Atendimento': '1', // New - 'Em Atendimento': '2', // In Progress - 'Em Espera': '3', // On Hold (confirmado via teste real - '-5' era invalido e o SN ignorava silenciosamente) - 'Encerrado': '6', // Resolved - 'Encerrado - Omitido': '7' // Closed - }; - - const stateCode = stateMap[state] || state; // Usa o codigo mapeado ou o valor original se nao encontrar - let sysId = null; // Declarar sysId fora do try para estar disponivel no catch try { const ticketSn = await TicketSnModel.findById(snTicketId); @@ -459,6 +448,19 @@ const updateStatusInServiceNow = async (snTicketId, state) => { sysId = ticketSn.sys_id; // Atribuir valor const ticketType = ticketSn.tipo; + // Mapeamento de status de string para codigo numerico do ServiceNow. incident e sc_req_item + // (requisicao) tem modelos de status diferentes - confirmado via teste real em dev que + // 'Em Espera' e '-5' para requisicao, e '3' para incidente (o mesmo codigo que e invalido/ + // bloqueado por ACL do outro lado - ja aconteceu erro 403 em producao usando '3' numa requisicao). + const stateMap = { + 'Aguardando Atendimento': '1', // New / Open + 'Em Atendimento': '2', // In Progress / Work in Progress + 'Em Espera': ticketType === 'requisicao' ? '-5' : '3', // On Hold + 'Encerrado': '6', // Resolved + 'Encerrado - Omitido': '7' // Closed + }; + const stateCode = stateMap[state] || state; // Usa o codigo mapeado ou o valor original se nao encontrar + let url = ''; let payload = {}; From dd1d1e0851b98c24305722e558e5a4db367c8aa5 Mon Sep 17 00:00:00 2001 From: Rafael Lopes Date: Mon, 20 Jul 2026 15:23:28 -0300 Subject: [PATCH 2/2] =?UTF-8?q?CI:=20Definido=20para=20que=20automa=C3=A7?= =?UTF-8?q?=C3=A3o=20rode=20como=20user=20desenvolvimento=20ao=20inv=C3=A9?= =?UTF-8?q?s=20de=20root?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/deploy-production.yml | 80 +++++++++++++++----------- 1 file changed, 48 insertions(+), 32 deletions(-) diff --git a/.gitea/workflows/deploy-production.yml b/.gitea/workflows/deploy-production.yml index c87351c..18a405f 100644 --- a/.gitea/workflows/deploy-production.yml +++ b/.gitea/workflows/deploy-production.yml @@ -54,56 +54,72 @@ jobs: mkdir -p "$DEPLOY_PATH" printf '%s\n' "$ENV_PRODUCTION" > "$DEPLOY_PATH/.env.production" chmod 600 "$DEPLOY_PATH/.env.production" + chown desenvolvimento:desenvolvimento "$DEPLOY_PATH/.env.production" - name: Deploy files and restart PM2 shell: bash run: | set -euo pipefail + # O runner roda como root (compartilhado com outras automacoes deste servidor), mas o + # app deve rodar como 'desenvolvimento' - e o dono do PM2/logs/.env.production hoje. + # Em vez de mudar o usuario do runner (afetaria outras automacoes), so essa etapa troca + # de usuario via sudo -u, escrevendo o script num arquivo temporario pra evitar qualquer + # ambiguidade de escaping de aspas dentro do 'run:' do workflow. DEPLOY_PATH="${PROD_DEPLOY_PATH:-/opt/sn-glpi-sync-new}" LOCK_FILE="/tmp/sn-glpi-sync-new.deploy.lock" + DEPLOY_SCRIPT="/tmp/sn-glpi-sync-new.deploy.sh" mkdir -p "$DEPLOY_PATH" + cat > "$DEPLOY_SCRIPT" <<'DEPLOY_EOF' + #!/usr/bin/env bash + set -euo pipefail + + if [ -d "$DEPLOY_PATH" ] && [ -n "$(ls -A "$DEPLOY_PATH" 2>/dev/null)" ]; then + rsync -a --delete "$DEPLOY_PATH"/ "$DEPLOY_PATH.previous"/ + fi + + rsync -az --delete \ + --exclude='.git/' \ + --exclude='.gitea/' \ + --exclude='.env*' \ + --exclude='node_modules/' \ + --exclude='logs/' \ + "$SRC_DIR"/ "$DEPLOY_PATH"/ + + cd "$DEPLOY_PATH" + + test -f .env.production || { + echo "Missing $DEPLOY_PATH/.env.production" + exit 1 + } + + grep -q '^SERVICENOW_CAOA_TI_GROUP_ID=.\+' .env.production || { + echo "SERVICENOW_CAOA_TI_GROUP_ID must be set in $DEPLOY_PATH/.env.production" + exit 1 + } + + npm ci --omit=dev + + find . -path ./node_modules -prune -o -name '*.js' -print | xargs -n1 node --check + + pm2 startOrRestart ecosystem.config.js --env production + pm2 save + pm2 list + DEPLOY_EOF + chmod +x "$DEPLOY_SCRIPT" + ( flock -n 9 || { echo "Another deploy is already running." exit 1 } - - if [ -d "$DEPLOY_PATH" ] && [ -n "$(ls -A "$DEPLOY_PATH" 2>/dev/null)" ]; then - rsync -a --delete "$DEPLOY_PATH"/ "$DEPLOY_PATH.previous"/ - fi - - rsync -az --delete \ - --exclude='.git/' \ - --exclude='.gitea/' \ - --exclude='.env*' \ - --exclude='node_modules/' \ - --exclude='logs/' \ - ./ "$DEPLOY_PATH"/ - - cd "$DEPLOY_PATH" - - test -f .env.production || { - echo "Missing $DEPLOY_PATH/.env.production" - exit 1 - } - - grep -q '^SERVICENOW_CAOA_TI_GROUP_ID=.\+' .env.production || { - echo "SERVICENOW_CAOA_TI_GROUP_ID must be set in $DEPLOY_PATH/.env.production" - exit 1 - } - - npm ci --omit=dev - - find . -path ./node_modules -prune -o -name '*.js' -print | xargs -n1 node --check - - pm2 startOrRestart ecosystem.config.js --env production - pm2 save - pm2 list + sudo -u desenvolvimento -H DEPLOY_PATH="$DEPLOY_PATH" SRC_DIR="$PWD" bash "$DEPLOY_SCRIPT" ) 9>"$LOCK_FILE" + rm -f "$DEPLOY_SCRIPT" + - name: Show sync logs if: always() shell: bash