chore: update image tag to 589fa29 [skip ci]

.gitea/workflows/deploy-api.yaml

@@ -1,23 +1,39 @@
-name: Deploy NestJS API
-on: [push]
+name: Build (develop) / Promote (main)
+on:
+  push:
+    branches: [main]
 
 jobs:
   build-and-push-deploy:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
-      - name: Login no Harbor
+      - name: Build and Push
         run: |
-          echo "${{ secrets.HARBOR_PASSWORD }}" | docker login 172.35.0.216 -u ${{ secrets.HARBOR_USERNAME }} --password-stdin
+          REGISTRY="git.simplifiquehc.com.br"
+          IMAGE_NAME="$REGISTRY/simplifique/vendaweb-api"
+          SHA_TAG=$(echo ${{ gitea.sha }} | cut -c1-7)
 
-      - name: Build e Push
+          echo "${{ secrets.K8S }}" | docker login "$REGISTRY" -u "${{ gitea.actor }}" --password-stdin
+
+          docker build -t "$IMAGE_NAME:$SHA_TAG" -t "$IMAGE_NAME:latest" .
+          docker push "$IMAGE_NAME:$SHA_TAG"
+          docker push "$IMAGE_NAME:latest"
+
+      - name: Update Kubernetes Manifest
         run: |
-          TAG=${{ gitea.sha }}
-          docker build -t 172.35.0.216/library/vendaweb-api:$TAG .
-          docker tag 172.35.0.216/library/vendaweb-api:$TAG 172.35.0.216/library/vendaweb-api:latest
+          SHA_TAG=$(echo ${{ gitea.sha }} | cut -c1-7)
+          IMAGE_NAME="git.simplifiquehc.com.br/simplifique/vendaweb-api"
 
-          docker push 172.35.0.216/library/vendaweb-api:$TAG
-          docker push 172.35.0.216/library/vendaweb-api:latest
+          sed -i "s|image: $IMAGE_NAME:.*|image: $IMAGE_NAME:$SHA_TAG|g" k8s/base/deployment.yaml
 
+          git config --global user.name "Gitea Action"
+          git config --global user.email "actions@simplifiquehc.com.br"
+
+          git add k8s/base/deployment.yaml
+          git commit -m "chore: update image tag to $SHA_TAG [skip ci]"
+          git push origin main

Dockerfile

@@ -1,39 +1,55 @@
-# Estágio 1: Build
-FROM node:16-bullseye-slim AS builder
+ARG NODE_VERSION=16.20
+ARG DEBIAN_VARIANT=bullseye
+
+FROM node:${NODE_VERSION}-${DEBIAN_VARIANT} AS builder
 
 WORKDIR /app
-COPY package*.json ./
-RUN npm install --legacy-peer-deps
-COPY . .
-RUN npm run build
 
-FROM node:16-bullseye-slim
-# Instalar dependências do Oracle 
-RUN apt-get update && apt-get install -y \
-    libaio1 \
-    unzip \
-    wget \
-    && mkdir -p /opt/oracle
+ARG INSTANTCLIENT_ZIP_URL=https://download.oracle.com/otn_software/linux/instantclient/instantclient-basiclite-linuxx64.zip
+RUN apt-get update \
+  && apt-get install -y --no-install-recommends ca-certificates wget unzip libaio1 libnsl2 \
+  && rm -rf /var/lib/apt/lists/* \
+  && mkdir -p /opt/oracle \
+  && wget -q "${INSTANTCLIENT_ZIP_URL}" -O /opt/oracle/instantclient.zip \
+  && unzip -q /opt/oracle/instantclient.zip -d /opt/oracle \
+  && rm /opt/oracle/instantclient.zip \
+  && rm -f /opt/oracle/instantclient_*/ojdbc*.jar \
+           /opt/oracle/instantclient_*/ucp*.jar \
+           /opt/oracle/instantclient_*/xstreams.jar \
+           /opt/oracle/instantclient_*/adrci \
+           /opt/oracle/instantclient_*/genezi \
+           /opt/oracle/instantclient_*/uidrvci \
+  && ln -s "$(ls -d /opt/oracle/instantclient_* | head -n 1)" /opt/oracle/instantclient
 
-# Instalar Oracle Instant Client
-RUN wget https://download.oracle.com/otn_software/linux/instantclient/instantclient-basic-linuxx64.zip -O /opt/oracle/client.zip && \
-    unzip /opt/oracle/client.zip -d /opt/oracle && \
-    rm /opt/oracle/client.zip && \
-    ln -s /opt/oracle/instantclient_* /opt/oracle/instantclient
-
-# Configurar o sistema para encontrar as bibliotecas do Oracle
 ENV LD_LIBRARY_PATH=/opt/oracle/instantclient
-RUN echo "/opt/oracle/instantclient" > /etc/ld.so.conf.d/oracle-instantclient.conf && ldconfig
+ENV PATH=/opt/oracle/instantclient:$PATH
+
+COPY package*.json ./
+ENV NPM_CONFIG_LEGACY_PEER_DEPS=true
+RUN npm ci
+
+COPY . .
+RUN npm run build \
+  && npm prune --omit=dev --legacy-peer-deps \
+  && npm cache clean --force
+
+FROM node:${NODE_VERSION}-${DEBIAN_VARIANT}-slim AS runtime
 
 WORKDIR /app
 
-# Copiar apenas o necessário do estágio anterior
-COPY --from=builder /app/dist ./dist
+ENV NODE_ENV=production
+ENV LD_LIBRARY_PATH=/opt/oracle/instantclient
+ENV PATH=/opt/oracle/instantclient:$PATH
+
+RUN apt-get update \
+  && apt-get install -y --no-install-recommends libaio1 libnsl2 \
+  && rm -rf /var/lib/apt/lists/*
+
+COPY --from=builder /opt/oracle /opt/oracle
 COPY --from=builder /app/package*.json ./
 COPY --from=builder /app/node_modules ./node_modules
+COPY --from=builder /app/dist ./dist
 
-# Variáveis de ambiente padrão para o driver oracledb
-ENV OCI_LIB_DIR=/opt/oracle/instantclient
-ENV OCI_INC_DIR=/opt/oracle/instantclient/sdk/include
+EXPOSE 8065
 
-CMD ["npm", "run", "start:prod"]
+CMD ["node", "dist/main"]

k8s/base/deployment.yaml

@@ -15,10 +15,10 @@ spec:
         app: vendaweb-api
     spec:
       imagePullSecrets:
-        - name: harbor-secret
+        - name: gitea-auth
       containers:
         - name: api
-          image: 172.35.0.216/library/vendaweb-api:latest
+          image: git.simplifiquehc.com.br/simplifique/vendaweb-api:589fa29
           imagePullPolicy: IfNotPresent
           ports:
             - name: http

k8s/overlays/prod/deployment-image-digest-patch.yaml

@@ -7,4 +7,4 @@ spec:
     spec:
       containers:
         - name: api
-          image: 172.35.0.216/library/vendaweb-api@sha256:aac490fcb4ef7baa95f1df01fa50d2d44bdb4ed12b235e5dd89e1d7dc3cd0a3a
+          image: git.simplifiquehc.com.br/simplifique/vendaweb-api:latest

k8s/overlays/prod/kustomization.yaml

@@ -7,5 +7,4 @@ resources:
   - ../../base
 
 patches:
-  - path: deployment-image-digest-patch.yaml
   - path: service-patch.yaml

src/app.controller.ts

@@ -14,7 +14,7 @@ export class AppController {
   @Get('health')
   @ApiOperation({ summary: 'Health check' })
   healthCheck() {
-    return { status: 'SIMPLIFIQUE HOME CENTER 2026' };
+    return { status: 'SIMPLIFIQUE HOME CENTER 202' };
   }
 
 }

src/main.ts

@@ -16,7 +16,7 @@ async function bootstrap() {
                      do cadastro de parceiros, consulta de venda de movimentação e pagamentos, e fechamento das comissões dos parceiros.`)
     .setVersion("2023.1.2")
     .addTag("VendaWeb")
-    .addTag("Autenticação")
+    .addTag("Auth")
     .build();
   const document = SwaggerModule.createDocument(app, options);
   SwaggerModule.setup("docs", app, document);

src/sales/sales/sales.service.ts

@@ -1448,7 +1448,7 @@ export class SalesService {
         const queryRunner = connectionDb.createQueryRunner();
         await queryRunner.connect();
         try {
-            const sql = 'SELECT  ESVCALCULOFRETE.CODTABELAFRETE as "id"     ' +
+            /*const sql = 'SELECT  ESVCALCULOFRETE.CODTABELAFRETE as "id"     ' +
                 '       ,ESVCALCULOFRETE.CODFILIAL      as "store"              ' +
                 '       ,ESVCALCULOFRETE.CODCIDADE      as "cityId"             ' +
                 '       ,PCCIDADE.NOMECIDADE            as "cityName"           ' +
@@ -1462,7 +1462,22 @@ export class SalesService {
                 '   AND ESVCALCULOFRETE.CODCIDADE = PCCIDADE.CODCIDADE          ' +
                 '   AND ESVCALCULOFRETE.CODCIDADE = :1          ' +
                 '   AND ESVCALCULOFRETE.IDCART = :2             ' +
-                ' ORDER BY VLFRETE';
+                ' ORDER BY VLFRETE';*/
+
+            const sql = `SELECT  0 as "id"     
+                       ,'1'                            as "store"              
+                       ,ESVCALCULOFRETE.CODCIDADE      as "cityId"             
+                       ,PCCIDADE.NOMECIDADE            as "cityName"           
+                       ,NULL                           as "carrierId"          
+                       ,'SIMPLIFIQUE HOMECENTER'       as "carrierName"        
+                       ,0                              as "minSale"            
+                       ,ESVCALCULOFRETE.VLFRETE        as "deliveryValue"      
+                       ,NULL                           as "deliveryTime"       
+                  FROM ESVCALCULOFRETE, PCCIDADE                     
+                 WHERE ESVCALCULOFRETE.CODCIDADE = PCCIDADE.CODCIDADE          
+                   AND ESVCALCULOFRETE.CODCIDADE = :1          
+                   AND ESVCALCULOFRETE.IDCART = :2            
+                 ORDER BY VLFRETE`;
 
             const deliveryTaxTable = await queryRunner.manager
                 .query(sql, [cityId, cartId]);
@@ -1514,7 +1529,22 @@ export class SalesService {
         const queryRunner = connectionDb.createQueryRunner();
         await queryRunner.connect();
         try {
-            const sql = 'SELECT  ESVCALCULOFRETE.CODTABELAFRETE as "id"             ' +
+            const sql = `SELECT  0 as "id"     
+                       ,'1'                            as "store"              
+                       ,ESVCALCULOFRETE.CODCIDADE      as "cityId"             
+                       ,PCCIDADE.NOMECIDADE            as "cityName"           
+                       ,NULL                           as "carrierId"          
+                       ,'SIMPLIFIQUE HOMECENTER'       as "carrierName"        
+                       ,0                              as "minSale"            
+                       ,ESVCALCULOFRETE.VLFRETE        as "deliveryValue"      
+                       ,NULL                           as "deliveryTime"       
+                  FROM ESVCALCULOFRETE, PCCIDADE                     
+                 WHERE ESVCALCULOFRETE.CODCIDADE = PCCIDADE.CODCIDADE          
+                   AND ESVCALCULOFRETE.CODCIDADE = :1          
+                   AND ESVCALCULOFRETE.IDCART = :2            
+                 ORDER BY VLFRETE`;
+
+            /*const sql = 'SELECT  ESVCALCULOFRETE.CODTABELAFRETE as "id"             ' +
                 '       ,ESVCALCULOFRETE.CODFILIAL          as "store"              ' +
                 '       ,ESVCALCULOFRETE.CODCIDADE          as "cityId"             ' +
                 '       ,PCCIDADE.NOMECIDADE                as "cityName"           ' +
@@ -1528,7 +1558,7 @@ export class SalesService {
                 '   AND ESVCALCULOFRETE.CODCIDADE = PCCIDADE.CODCIDADE              ' +
                 '   AND ESVCALCULOFRETE.CODCIDADE = :1                              ' +
                 '   AND ESVCALCULOFRETE.IDCART = :2                                 ' +
-                ' ORDER BY VLFRETE';
+                ' ORDER BY VLFRETE';*/
 
             let deliveryTaxTable = await queryRunner.manager
                 .query(sql, [dataDeliveryTax.cityId, dataDeliveryTax.cartId]);