Merge pull request RyanCNP#99 from RyanCNP/hotfix/ultimo-dia

Hotfix/ultimo dia

Author: MathGueff

.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,33 +143,58 @@ 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: saneasp/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: saneasp/front-back-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 }}
 
@@ -182,7 +206,6 @@ jobs:
     if: failure()
 
     steps:
-
       # --- Checkout do código ---
       - name: Checkout code
         uses: actions/checkout@v3
@@ -220,4 +243,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"]

docker-compose.yaml

@@ -8,3 +8,9 @@ services:
       POSTGRES_PASSWORD: "1234"
       POSTGRES_USER: postgres
       POSTGRES_DB: sanea
+  back:
+    image: saneasp/back-sanea-prod
+    ports:
+      - '3000:3000'
+    env_file:
+      - ./.env

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,6 +32,7 @@ module.exports = {
 
   async down (queryInterface, Sequelize) {
     // Reverter status para integer e default 0
+    await queryInterface.removeColumn('denuncia','status');
     await queryInterface.changeColumn('denuncia', 'status', {
       type: Sequelize.INTEGER,
       allowNull: true,

package.json

@@ -6,7 +6,9 @@
   "scripts": {
     "dev": "ts-node-dev --respawn --transpile-only ./app.ts",
     "start": "node dist/app.js",
-    "build": "tsc",
+    "build": "tsc && npm run copy-public && npm run copy-templates",
+    "copy-public": "cp -r public dist/public",
+    "copy-templates": "xcopy src\\templates dist\\src\\templates /E /I /Y",
     "migration-create": "npx sequelize-cli migration:generate --name",
     "migrate": "npx sequelize-cli db:migrate",
     "migrate:undo": "npx sequelize-cli db:migrate:undo",

src/config/database.config.ts

@@ -14,7 +14,7 @@ if (env === "development") {
   });
 }
 else if (env === "production") {
-  const databaseUrl = process.env.PROD_DATABASE_URL;
+  const databaseUrl:string | undefined = process.env.PROD_DATABASE_URL;
 
   if (!databaseUrl) {
     throw new Error("PROD_DATABASE_URL é necessário para ambiente de produção");
@@ -25,7 +25,7 @@ else if (env === "production") {
     dialectOptions: {
       ssl: {
         require: true,
-        rejectUnauthorized: false,
+        rejectUnauthorized: true,
       },
     },
     logging: false,

src/models/grupo-categoria.model.ts

@@ -2,7 +2,7 @@ import { DataTypes, Model, Optional } from "sequelize";
 import sequelize from '../config/database.config'
 import { IGrupoCategoria } from "../interfaces/grupo-categoria";
 
-const IMAGE_BASE_URL = `${process.env.HOST}:${process.env.PORT}/public`;
+const IMAGE_BASE_URL = process.env.UPLOADED_IMAGES_BASE_URL;
 
 type GrupoCategoriaCricao = Optional<IGrupoCategoria, "id">