Merge pull request RyanCNP#103 from RyanCNP/feature/monitoramento

Feature/monitoramento

Author: devDavyRibeiro

.github/workflows/develop-actions.yml

@@ -2,7 +2,7 @@ name: CI / CD - develop (preview)
 
 on:
   push:
-    branches: 
+    branches:
       - develop
 
 jobs:
@@ -111,21 +111,26 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
-      - name: Extrai metadatas para o Docker
-        id: meta
+      # Docker Image Back-DEV
+
+      - name: Extrai metadatas para a Imagem Back-Dev
+        id: metaDev
         uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
         with:
-          images: saneasp/sanea-back
+          images: saneasp/front-back-dev
+          tags: |
+            type=raw,value=${{ steps.version.outputs.new_version }}
+            type=raw,value=latest
 
-      - name: Build e publicação da imagem Docker
-        id: push
+      - name: Build e publicação da Imagem Back-Dev
+        id: pushDev
         uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671
         with:
           context: .
-          file: ./Dockerfile
+          file: ./Dockerfile.dev
           push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
+          tags: ${{ steps.metaDev.outputs.tags }}
+          labels: ${{ steps.metaDev.outputs.labels }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -137,7 +142,6 @@ jobs:
     if: failure()
 
     steps:
-
       # --- Checkout do código ---
       - name: Checkout code
         uses: actions/checkout@v3
@@ -175,4 +179,4 @@ jobs:
           subject: "🚨 Falha no Pipeline - ${{ github.ref_name }}"
           to: "${{ secrets.TEAM_EMAILS }}"
           from: "CI/CD SaneaSP <no-reply@saneasp.com>"
-          html_body: ${{ steps.template.outputs.html }}
+          html_body: ${{ steps.template.outputs.html }}

.github/workflows/main-actions.yml

@@ -31,7 +31,6 @@ jobs:
 
             echo "✔ Mensagem válida."
 
-
       # --- Instalar dependências ---
       - name: Instalar dependências
         run: npm ci
@@ -144,35 +143,106 @@ jobs:
           draft: false
           prerelease: false
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN:
+            ${{ secrets.GITHUB_TOKEN }}
 
-      # ---- Imagem Docker -----
+            # Docker Login
       - name: Login Docker Hub
         uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
-      - name: Extrai metadatas para o Docker
-        id: meta
+      # Docker Image Back-PROD
+      - name: Extrai metadatas para a Imagem Back-Prod
+        id: metaProd
         uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
         with:
-          images: saneasp/back-sanea
+          images: ${{ secrets.DOCKER_USERNAME }}/back-sanea-prod
           tags: |
             type=raw,value=${{ steps.version.outputs.new_version }}
             type=raw,value=latest
 
-      - name: Build e publicação da imagem Docker
-        id: push
+      - name: Build e publicação da Imagem Back-Prod
+        id: pushProd
         uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671
         with:
           context: .
           file: ./Dockerfile
           push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
+          tags: ${{ steps.metaProd.outputs.tags }}
+          labels: ${{ steps.metaProd.outputs.labels }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      # Docker Image Back-DEV
+
+      - name: Extrai metadatas para a Imagem Back-Dev
+        id: metaDev
+        uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
+        with:
+          images: ${{ secrets.DOCKER_USERNAME }}/back-sanea-dev
+          tags: |
+            type=raw,value=${{ steps.version.outputs.new_version }}
+            type=raw,value=latest
+
+      - name: Build e publicação da Imagem Back-Dev
+        id: pushDev
+        uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671
+        with:
+          context: .
+          file: ./Dockerfile.dev
+          push: true
+          tags: ${{ steps.metaDev.outputs.tags }}
+          labels: ${{ steps.metaDev.outputs.labels }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+            # --- Deploy automático via Render ---
+      - name: Deploy via Render API
+        env:
+          RENDER_API_KEY: ${{secrets.RENDER_API_KEY}}
+          SERVICE_ID: ${{secrets.SERVICE_ID}}
+          REPO_NAME: ${{secrets.REPO_NAME_PROD}}
+        run: |
+            echo "Criando payload para deploy da versão latest"
+
+            PAYLOAD=$(jq -n \
+              --arg image "docker.io/${{ secrets.DOCKER_USERNAME }}/$REPO_NAME:latest" \
+              --arg version "latest" \
+              '{
+                clearCache: "clear",
+                imageUrl: $image,
+                overrideImage: true,
+                imagePullPolicy: "Always"
+              }'
+            )
+
+            echo "Payload JSON gerado:"
+            echo "$PAYLOAD" | jq .
+
+            echo "Iniciando deploy no Render..."
+
+            RESPONSE=$(curl -i -s -X POST \
+              "https://api.render.com/v1/services/$SERVICE_ID/deploys" \
+              -H "Accept: application/json" \
+              -H "Content-Type: application/json" \
+              -H "Authorization: Bearer $RENDER_API_KEY" \
+              -d "$PAYLOAD"
+            )
+
+            echo "Resposta completa:"
+            echo "$RESPONSE"
+
+            HTTP_STATUS=$(echo "$RESPONSE" | grep HTTP | awk '{print $2}')
+
+            echo "Status da resposta HTTP: $HTTP_STATUS"
+
+            if [[ "$HTTP_STATUS" =~ ^2[0-9]{2}$ ]]; then
+              echo "Deploy iniciado com sucesso!"
+            else
+              echo "Falha no deploy!"
+              exit 1
+            fi
 
   # --- Enviar e-mail em caso de falha ---
   notify_failure:
@@ -182,7 +252,6 @@ jobs:
     if: failure()
 
     steps:
-
       # --- Checkout do código ---
       - name: Checkout code
         uses: actions/checkout@v3
@@ -220,4 +289,4 @@ jobs:
           subject: "🚨 Falha no Pipeline - ${{ github.ref_name }}"
           to: "${{ secrets.TEAM_EMAILS }}"
           from: "CI/CD SaneaSP <no-reply@saneasp.com>"
-          html_body: ${{ steps.template.outputs.html }}
+          html_body: ${{ steps.template.outputs.html }}

Dockerfile

@@ -1,20 +1,13 @@
-# Usar a imagem do Node.js
-FROM node:16-alpine
-
-# Criar diretório de trabalho
+# Etapa 1: Build Angular
+FROM node:20 AS build
 WORKDIR /app
 
-# Copiar apenas package.json para instalar dependências
 COPY package*.json ./
-
-# Instalar dependências
 RUN npm install
 
-# Copiar restante do código
 COPY . .
+RUN npm run build
 
-# Expor a porta da API
 EXPOSE 3000
 
-# Rodar em modo desenvolvimento
-CMD ["npm", "run", "dev"]
+CMD [ "npm","run","start" ]

Dockerfile.dev

@@ -0,0 +1,20 @@
+# Usar a imagem do Node.js
+FROM node:16-alpine
+
+# Criar diretório de trabalho
+WORKDIR /app
+
+# Copiar apenas package.json para instalar dependências
+COPY package*.json ./
+
+# Instalar dependências
+RUN npm install
+
+# Copiar restante do código
+COPY . .
+
+# Expor a porta da API
+EXPOSE 3000
+
+# Rodar em modo desenvolvimento
+CMD ["npm", "run", "dev"]

app.ts

@@ -19,17 +19,18 @@ import bodyParser from "body-parser";
 import stripeRoutes from "./src/routes/stripe.routes";
 import RegistroRoutes from './src/routes/registro.routes';
 import VisitasRoutes from './src/routes/visita.routes';
+import { logHandler } from "./src/middlewares/log.middleware";
 
 const app = express();
 
 app.use(cors());
-
 app.use('/api/stripe/webhook', bodyParser.raw({ type: 'application/json' }));
 
 app.use(express.json());
 
 setupSwagger(app);
 
+app.use(logHandler);
 app.use("/categoria", categoriaRoutes);
 app.use("/denuncia", denunciaRoutes);
 app.use("/user", userRoutes);

config/config.js

@@ -4,7 +4,14 @@ const env = process.env.NODE_ENV || "development";
 
 let config;
 
-if (env === "development") {
+if (env === "test") {
+  config = {
+    dialect: "sqlite",
+    storage: "database.sqlite",
+    logging: false,
+  };
+}
+else if (env === "development") {
   config = {
       url: process.env.DEV_DATABASE_URL,
       dialect: "postgres",

docker-compose.yaml

@@ -3,8 +3,24 @@ services:
     container_name: postgres
     image: postgres:latest
     ports:
-      - '5423:5432'
+      - '5432:5432'
     environment:
       POSTGRES_PASSWORD: "1234"
       POSTGRES_USER: postgres
       POSTGRES_DB: sanea
+  back:
+    image: saneasp/back-sanea-prod:latest
+    ports:
+      - '3000:3000'
+    env_file:
+      - ./.env
+    environment:
+      - NODE_ENV=development
+      - DEV_DATABASE_URL=postgresql://postgres:1234@banco:5432/postgres
+    depends_on:
+      - banco
+
+  front:
+    image: saneasp/front-sanea-prod:latest
+    ports:
+      - '4200:80'

logger-winston.ts

@@ -0,0 +1,42 @@
+
+import winston from "winston";
+import { Logtail } from '@logtail/node';
+import { LogtailTransport } from "@logtail/winston";
+
+const log = process.env.LOGTAIL_TOKEN;
+let logtail!: Logtail;
+if (log) {
+    logtail = new Logtail(log, {
+        endpoint: process.env.LOGTAIL_URI,
+    });
+}
+
+logtail.info('teste');
+
+/** Criando a instância base com formatação */
+const baseLogger = winston.createLogger({
+    level: 'debug',
+    format: winston.format.combine(
+        winston.format.timestamp(),
+        winston.format.printf(({ level, message, timestamp, ...rest }) => {
+            const meta = Object.keys(rest).length ? JSON.stringify(rest) : '';
+            return `[${timestamp}] ${level.toUpperCase()}: ${message} ${meta}`;
+        })
+    ),
+    transports: [new LogtailTransport(logtail)],
+});
+
+/** Métodos personalizados */
+const logger = {
+    info: (msg:string, meta = {}) => baseLogger.info(msg, meta),
+    warn: (msg:string, meta = {}) => baseLogger.warn(msg, meta),
+    error: (msg:string, meta = {}) => baseLogger.error(msg, meta),
+    debug: (msg:string, meta = {}) => baseLogger.debug(msg, meta),
+    alert: (msg:string, meta = {}) => baseLogger.log('alert', msg, meta), // nível customizado (precisa configurar abaixo)
+};
+
+// Adicionando nível "alert" (opcional)
+baseLogger.levels['alert'] = 0;
+baseLogger.add(new winston.transports.Console()); // Adiciona log no console também, se quiser
+
+export default logger;

migrations/20250925202854-alter-table-usuario-endereco.js

@@ -38,7 +38,7 @@ module.exports = {
     await queryInterface.removeColumn("usuario", "cidade");
     await queryInterface.removeColumn("usuario", "bairro");
     await queryInterface.removeColumn("usuario", "cep");
-    await queryInterface.removeColumn("usuario", "complmento");
+    await queryInterface.removeColumn("usuario", "complemento");
     await queryInterface.removeColumn("usuario", "numero");
 
     await queryInterface.addColumn("usuario", "endereco", {

migrations/20251120145923-alter-table-denuncia-status-endereco.js

@@ -4,7 +4,8 @@
 module.exports = {
   async up (queryInterface, Sequelize) {
     // Alterar status para string e default 'aberto'
-    await queryInterface.changeColumn('denuncia', 'status', {
+    await queryInterface.removeColumn('denuncia','status');
+    await queryInterface.addColumn('denuncia', 'status', {
       type: Sequelize.STRING(50),
       allowNull: false,
       defaultValue: 'aberto'
@@ -31,11 +32,8 @@ module.exports = {
 
   async down (queryInterface, Sequelize) {
     // Reverter status para integer e default 0
-    await queryInterface.changeColumn('denuncia', 'status', {
-      type: Sequelize.INTEGER,
-      allowNull: true,
-      defaultValue: 0
-    });
+
+    //await queryInterface.removeColumn('denuncia','status');
 
     // Reverter campos para allowNull true
     await queryInterface.changeColumn('denuncia', 'cep', {