chore: organize project and update service

Reviewed-on: http://172.35.0.216:3000/simplifique/Vendaweb-api/pulls/1

.env

@@ -0,0 +1,13 @@
+ORACLE_CLIENT_PATH='/usr/lib/oracle/21/client64/lib'
+
+
+###REDIS
+REDIS_HOST='172.35.0.217'
+REDIS_PORT='6379'
+
+
+####ORACLE
+PORT='8065'
+DB_USERNAME='simplifique'
+DB_PASSWORD='simplifique'
+DB_CONNECT_STRING='(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=172.35.0.250)(PORT=1521))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=ORCL)))'

.gitea/workflows/deploy-api.yaml

@@ -0,0 +1,23 @@
+name: Deploy NestJS API
+on: [push]
+
+jobs:
+  build-and-push-deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Login no Harbor
+        run: |
+          echo "${{ secrets.HARBOR_PASSWORD }}" | docker login 172.35.0.216 -u ${{ secrets.HARBOR_USERNAME }} --password-stdin
+
+      - name: Build e Push
+        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
+          
+          docker push 172.35.0.216/library/vendaweb-api:$TAG
+          docker push 172.35.0.216/library/vendaweb-api:latest
+          

.gitignore

@@ -33,3 +33,6 @@ lerna-debug.log*
 !.vscode/launch.json
 !.vscode/extensions.json
 
+# Environment variables
+.env
+

Dockerfile

@@ -1,32 +1,39 @@
-FROM node:16
+# Estágio 1: Build
+FROM node:16-bullseye-slim 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 \
-    apt-transport-https \
-    ca-certificates \
     libaio1 \
     unzip \
     wget \
-    libc6 \
-    libncurses5 && \
-    mkdir -p /opt/oracle && \
-    wget https://download.oracle.com/otn_software/linux/instantclient/instantclient-basic-linuxx64.zip -O /opt/oracle/instantclient-basic-linuxx64.zip && \
-    unzip /opt/oracle/instantclient-basic-linuxx64.zip -d /opt/oracle && \
-    rm /opt/oracle/instantclient-basic-linuxx64.zip && \
-    ln -s /opt/oracle/instantclient_* /opt/oracle/instantclient && \
-    echo "/opt/oracle/instantclient" > /etc/ld.so.conf.d/oracle-instantclient.conf && \
-    ldconfig
+    && mkdir -p /opt/oracle
 
+# 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
 
 WORKDIR /app
 
+# Copiar apenas o necessário do estágio anterior
+COPY --from=builder /app/dist ./dist
+COPY --from=builder /app/package*.json ./
+COPY --from=builder /app/node_modules ./node_modules
 
-COPY package*.json ./
-
-
-RUN npm install  --legacy-peer-deps
-
-COPY . .
-
+# 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
 
 CMD ["npm", "run", "start:prod"]

KUBERNETES.md

@@ -0,0 +1,76 @@
+# Documentação do Kubernetes
+
+Este documento descreve a infraestrutura e configuração do Kubernetes para o projeto **Vendaweb-api**, utilizando uma abordagem GitOps com ArgoCD e Kustomize.
+
+## Estrutura de Diretórios e Arquivos
+
+A configuração do Kubernetes está localizada no diretório `k8s/` e segue uma estrutura organizada para facilitar a manutenção e escalabilidade:
+
+```
+k8s/
+├── argocd/                 # Configurações do ArgoCD
+│   └── application-prod.yaml # Definição da Application para o ambiente de produção
+├── base/                   # Recursos base do Kubernetes (Kustomize Base)
+│   ├── configmap.yaml      # ConfigMap base
+│   ├── deployment.yaml     # Deployment base da aplicação
+│   ├── kustomization.yaml  # Arquivo principal do Kustomize Base
+│   ├── secret.yaml         # Secret base
+│   └── service.yaml        # Service base
+└── overlays/               # Sobrescritas para diferentes ambientes (Kustomize Overlays)
+    └── prod/               # Ambiente de produção
+        ├── application-prod.yaml
+        ├── deployment-image-digest-patch.yaml
+        ├── kustomization.yaml
+        └── service-patch.yaml
+```
+
+## Recursos Base (`k8s/base`)
+
+O diretório `base` contém as definições padrão dos recursos que são comuns a todos os ambientes.
+
+### Deployment (`deployment.yaml`)
+
+- **Nome**: `vendaweb-api`
+- **Replicas**: 15 (Configuração base)
+- **Imagem**: `172.35.0.216/library/vendaweb-api:latest`
+- **Porta do Container**: 8065
+- **Resources**:
+  - Requests: CPU 100m, Memory 256Mi
+  - Limits: CPU 500m, Memory 512Mi
+- **Probes**: Liveness, Readiness e Startup probes configurados no endpoint `/v1/health`.
+- **Environment**: Configurações carregadas via ConfigMap e Secret.
+
+### Service (`service.yaml`)
+
+- **Tipo**: ClusterIP
+- **Porta**: 8065 (TCP)
+
+## Ambientes (`k8s/overlays`)
+
+### Produção (`k8s/overlays/prod`)
+
+A sobreposição de produção personaliza a configuração base para o ambiente produtivo.
+
+- **Namespace**: `vendaweb-prod`
+- **Patches**: Aplica modificações específicas (ex: digest da imagem, configurações específicas de serviço) via `kustomization.yaml`.
+
+## Deploy com ArgoCD (`k8s/argocd`)
+
+O deploy é gerenciado pelo ArgoCD, que sincroniza o estado do cluster com o repositório Git.
+
+### Application (`application-prod.yaml`)
+
+- **Nome**: `vendaweb-api-prod`
+- **Namespace do ArgoCD**: `argocd`
+- **Origem (Source)**:
+  - Repositório: `https://git.simplifiquehc.com.br/simplifique/Vendaweb-api.git`
+  - Revisão: `main`
+  - Path: `k8s/overlays/prod` (Aponta para o overlay de produção)
+- **Destino (Destination)**:
+  - Cluster: `https://kubernetes.default.svc`
+  - Namespace: `vendaweb-api` (Nota: O patch define `vendaweb-prod`, verifique a consistência)
+- **Sync Policy**: Automatizado com `selfHeal` ativado e criação automática de namespace.
+
+---
+
+**Observação**: Certifique-se de que as credenciais do Harbor (`imagePullSecrets`) estejam corretamente configuradas no namespace de destino para permitir o pull da imagem.

WORKFLOWS.md

@@ -0,0 +1,57 @@
+# Documentação dos Workflows (Gitea Actions)
+
+Este documento descreve os fluxos de trabalho de integração contínua (CI) e entrega contínua (CD) configurados no Gitea Actions para o projeto **Vendaweb-api**.
+
+## Visão Geral
+
+Os workflows estão definidos no diretório `.gitea/workflows/`. O principal workflow configurado é o deploy da API.
+
+## Workflow: Deploy NestJS API
+
+**Arquivo**: `.gitea/workflows/deploy-api.yaml`
+
+### Gatilhos (Triggers)
+
+Este workflow é acionado automaticamente no evento:
+
+- `push`: Em qualquer branch (configuração atual `on: [push]`).
+
+### Jobs
+
+#### `build-and-push-deploy`
+
+Este job é responsável por construir a imagem Docker e enviá-la para o registry privado (Harbor).
+
+- **Ambiente de Execução**: `ubuntu-latest` (Runner)
+
+#### Passos (Steps):
+
+1. **Checkout**
+   - Utiliza `actions/checkout@v3` para clonar o código fonte do repositório.
+
+2. **Login no Harbor**
+   - Realiza autenticação no registry Docker privado.
+   - **Registry**: `172.35.0.216`
+   - **Segredos Utilizados**:
+     - `HARBOR_USERNAME`: Nome de usuário do Harbor.
+     - `HARBOR_PASSWORD`: Senha do usuário do Harbor.
+
+3. **Build e Push**
+   - Constrói a imagem Docker da aplicação.
+   - Tags geradas:
+     - `172.35.0.216/library/vendaweb-api:$TAG` (onde `$TAG` é o SHA do commit do Gitea `gitea.sha`)
+     - `172.35.0.216/library/vendaweb-api:latest`
+   - Envia ambas as tags para o registry.
+
+## Variáveis e Segredos (Secrets)
+
+Para que o workflow funcione corretamente, as seguintes secrets devem estar configuradas nas configurações do repositório no Gitea:
+
+| Secret            | Descrição                                                     |
+| ----------------- | ------------------------------------------------------------- |
+| `HARBOR_USERNAME` | Usuário com permissão de push no projeto `library` do Harbor. |
+| `HARBOR_PASSWORD` | Senha ou token de acesso do usuário do Harbor.                |
+
+## Integração com Kubernetes
+
+Após o push da imagem com a tag `latest` (e o SHA específico), o ArgoCD (configurado conforme `KUBERNETES.md`) detectará as mudanças se houver alteração nos manifestos ou se estiver configurado para pollar a imagem `latest` (dependendo da política de `imagePullPolicy` e configuração do ArgoCD Image Updater, se houver).

docker-compose.yml

@@ -1,14 +1,18 @@
 version: '3.8'
 
 services:
-  vendaweb:
-    image: link70/vendaweb
-    deploy:
-      replicas: 20
-      resources:
-        limits:
-          cpus: '0.5'
-          memory: 512M
+  vendaweb-api:
+    image: 172.35.0.216/library/vendaweb-api:latest
     ports:
       - "8065:8065"
-    restart: always 
+    networks:
+      - simplifique-network
+    deploy:
+      replicas: 4
+      update_config:
+        order: start-first 
+        parallelism: 1
+
+networks:
+  simplifique-network:
+    external: true

k8s/argocd/application-prod.yaml

@@ -0,0 +1,19 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: vendaweb-api-prod
+  namespace: argocd
+spec:
+  project: default
+  source:
+    repoURL: https://git.simplifiquehc.com.br/simplifique/Vendaweb-api.git
+    targetRevision: main
+    path: k8s/overlays/prod
+  destination:
+    server: https://kubernetes.default.svc
+    namespace: vendaweb-api
+  syncPolicy:
+    automated:
+      selfHeal: true
+    syncOptions:
+      - CreateNamespace=true

k8s/base/configmap.yaml

@@ -0,0 +1,10 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: vendaweb-api-config
+data:
+  REDIS_HOST: '172.35.0.250'
+  REDIS_PORT: '6379'
+  DB_HOST: '172.35.0.250'
+  DB_PORT: '1521'
+  DB_SERVICE_NAME: 'ORCL'

k8s/base/deployment.yaml

@@ -0,0 +1,62 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: vendaweb-api
+  labels:
+    app: vendaweb-api
+spec:
+  replicas: 15
+  selector:
+    matchLabels:
+      app: vendaweb-api
+  template:
+    metadata:
+      labels:
+        app: vendaweb-api
+    spec:
+      imagePullSecrets:
+        - name: harbor-secret
+      containers:
+        - name: api
+          image: 172.35.0.216/library/vendaweb-api:latest
+          imagePullPolicy: IfNotPresent
+          ports:
+            - name: http
+              containerPort: 8067
+              protocol: TCP
+          envFrom:
+            - configMapRef:
+                name: vendaweb-api-config
+            - secretRef:
+                name: vendaweb-api-secrets
+          livenessProbe:
+            httpGet:
+              path: /v1/health
+              port: http
+            initialDelaySeconds: 20
+            periodSeconds: 10
+            timeoutSeconds: 2
+            failureThreshold: 6
+          readinessProbe:
+            httpGet:
+              path: /v1/health
+              port: http
+            initialDelaySeconds: 10
+            periodSeconds: 10
+            timeoutSeconds: 2
+            failureThreshold: 6
+          startupProbe:
+            httpGet:
+              path: /v1/health
+              port: http
+            initialDelaySeconds: 5
+            periodSeconds: 5
+            timeoutSeconds: 2
+            failureThreshold: 24
+          resources:
+            requests:
+              cpu: 100m
+              memory: 256Mi
+            limits:
+              cpu: 500m
+              memory: 512Mi

k8s/base/kustomization.yaml

@@ -0,0 +1,7 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - deployment.yaml
+  - service.yaml
+  - configmap.yaml

k8s/base/secret.yaml

@@ -0,0 +1,8 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: vendaweb-api-secrets
+type: Opaque
+stringData:
+  DB_USERNAME: 'simplifique'
+  DB_PASSWORD: 'simplifique'

k8s/base/service.yaml

@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: vendaweb-api
+  labels:
+    app: vendaweb-api
+spec:
+  type: ClusterIP
+  selector:
+    app: vendaweb-api
+  ports:
+    - name: http
+      port: 8067
+      targetPort: 8067
+      protocol: TCP

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

@@ -0,0 +1,10 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: vendaweb-api
+spec:
+  template:
+    spec:
+      containers:
+        - name: api
+          image: 172.35.0.216/library/vendaweb-api@sha256:aac490fcb4ef7baa95f1df01fa50d2d44bdb4ed12b235e5dd89e1d7dc3cd0a3a

k8s/overlays/prod/kustomization.yaml

@@ -0,0 +1,11 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+namespace: vendaweb-prod
+
+resources:
+  - ../../base
+
+patches:
+  - path: deployment-image-digest-patch.yaml
+  - path: service-patch.yaml

k8s/overlays/prod/service-patch.yaml

@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: vendaweb-api
+spec:
+  type: NodePort
+  ports:
+    - name: http
+      port: 8067
+      targetPort: 8067
+      nodePort: 30001

src/Auth/services/user.service.ts

@@ -93,7 +93,7 @@ export class UserService {
         ' WHERE PCEMPR.CODFILIAL = PCFILIAL.CODIGO (+)' +
         '   AND PCPARAMFILIAL.CODFILIAL = \'99\' ' +
         '   AND PCPARAMFILIAL.NOME      = \'CON_CODSETORGERENTELOJA\' ' +
-        '   AND PCEMPR.EMAIL = :username AND PCEMPR.SENHABD = CRYPT(:password, USUARIOBD)';
+        '   AND PCEMPR.USUARIOBD = :username AND PCEMPR.SENHABD = CRYPT(:password, USUARIOBD)';
 
       const users = await queryRunner.manager
         .query(sql, [user.email, user.password]);

src/app.controller.ts

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

src/configs/typeorm.config.ts

@@ -1,18 +1,17 @@
 import { TypeOrmModuleOptions } from '@nestjs/typeorm';
 import { ConnectionOptions } from 'typeorm';
+import 'dotenv/config';
 
 export const typeOrmConfig: TypeOrmModuleOptions = {
   type: "oracle",
-  //  host: "192.168.100.40", 
-  //  username: "LIVIA",  
-  //  password: "LIVIA", 
-  host: "10.1.1.241",
-  username: "SEVEN",
-  password: "USR54SEV",
-  // username: "API", 
-  // password: "E05H5KIEQV3YKDJR", 
+  host: "172.35.0.250",
+  username: process.env.DB_USERNAME || "simplifique",
+  password: process.env.DB_PASSWORD || "simplifique",
+  connectString:
+    process.env.DB_CONNECT_STRING ||
+    '(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=172.35.0.250)(PORT=1521))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=ORCL)))',
   port: 1521,
-  sid: "WINT",
+  sid: "ORCL",
   synchronize: false,
   logging: false,
   entities: [__dirname + '/../**/*.entity.{js,ts}'],
@@ -21,11 +20,14 @@ export const typeOrmConfig: TypeOrmModuleOptions = {
 
 export const connectionOptions: ConnectionOptions = {
   type: "oracle",
-  host: "10.1.1.241",
-  username: "SEVEN",
-  password: "USR54SEV",
+  host: "172.35.0.250",
+  username: process.env.DB_USERNAME || "simplifique",
+  password: process.env.DB_PASSWORD || "simplifique",
+  connectString:
+    process.env.DB_CONNECT_STRING ||
+    '(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=172.35.0.250)(PORT=1521))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=ORCL)))',
   port: 1521,
-  sid: "WINT",
+  sid: "ORCL",
   synchronize: false,
   logging: false,
   entities: [__dirname + '/../**/*.entity.{js,ts}'],

src/domain/entity/tables/pcclient.entity.ts

@@ -1622,8 +1622,8 @@ export class Pcclient {
   @Column({ name: 'CODCONDCOMERCIAL' })
   codcondcomercial: string;
 
-  @Column({ name: 'MEIOCOMUNICACAO' })
-  meiocomunicacao: string;
+  // @Column({ name: 'MEIOCOMUNICACAO' })
+  // meiocomunicacao: string;
 
   @Column({ name: 'CODGRUPOCOMERCIALMED' })
   codgrupocomercialmed: number;

src/main.ts

@@ -20,6 +20,6 @@ async function bootstrap() {
     .build();
   const document = SwaggerModule.createDocument(app, options);
   SwaggerModule.setup("docs", app, document);
-  await app.listen(8065);
+  await app.listen(8067);
 }
 bootstrap();

src/redis/redis.providers.ts

@@ -1,12 +1,23 @@
 import { Provider } from '@nestjs/common';
+
 import Redis = require('ioredis');
 
+
+
 export const redisProvider: Provider = {
+
   provide: 'REDIS_CLIENT',
+
   useFactory: () => {
+
     return new Redis({
-      host: '10.1.1.109',
+
+      host: '172.35.0.217',
+
       port: 6379,
+
     });
+
   },
+
 };

src/sales/customer/customer.service.ts

@@ -44,7 +44,7 @@ export class CustomerService {
                 '        ,pccidade.codibge   as "ibgeCode" ' +
                 '        ,pcclient.dtnasc    as "birthdate" ' +
                 '        ,pcclient.codatv1   as "ramoId" ' +
-                '        ,pcclient.meiocomunicacao   as "communicate" ' +
+                //                '        ,pcclient.meiocomunicacao   as "communicate" ' +
                 '        ,pcclient.latitude        as "latitude" ' +
                 '        ,pcclient.longitude       as "longitude" ' +
                 '        ,pcclient.codmunicipio    as "ibgeCode"  ' +
@@ -102,14 +102,14 @@ export class CustomerService {
                 '        ,pcclient.telent    as "phone" ' +
                 '        ,pcclient.telcelent as "cellPhone" ' +
                 '        ,pcclient.ieent     as "numberState" ' +
-                '        ,pcclient.codcategoria as "categoryId" ' +
-                '        ,pcclient.codsubcategoria as "subCategoryId" ' +
+                // '        ,pcclient.codcategoria as "categoryId" ' +
+                // '        ,pcclient.codsubcategoria as "subCategoryId" ' +
                 '        ,pcclient.codpraca  as "placeId" ' +
                 '        ,pcclient.codusur1  as "sellerId" ' +
                 '        ,pccidade.codibge   as "ibgeCode" ' +
                 '        ,pcclient.dtnasc    as "birthdate" ' +
                 '        ,pcclient.codatv1   as "ramoId" ' +
-                '        ,pcclient.meiocomunicacao   as "communicate" ' +
+                //                '        ,pcclient.meiocomunicacao   as "communicate" ' +
                 '        ,pcclient.latitude        as "latitude" ' +
                 '        ,pcclient.longitude       as "longitude" ' +
                 '        ,pcclient.codmunicipio    as "ibgeCode"  ' +
@@ -158,7 +158,7 @@ export class CustomerService {
                 '        ,pccidade.codibge   as "ibgeCode" ' +
                 '        ,pcclient.dtnasc    as "birthdate" ' +
                 '        ,pcclient.codatv1   as "ramoId" ' +
-                '        ,pcclient.meiocomunicacao   as "communicate" ' +
+                //'        ,pcclient.meiocomunicacao   as "communicate" ' +
                 '        ,pcclient.latitude        as "latitude" ' +
                 '        ,pcclient.longitude       as "longitude" ' +
                 '        ,pcclient.codmunicipio    as "ibgeCode"  ' +
@@ -317,7 +317,7 @@ export class CustomerService {
             newCustomer.codmunicipio = Number.parseInt(customer.ibgeCode);
             newCustomer.codcidadecom = newCustomer.codcidade;
             newCustomer.dtnasc = customer.birthdate;
-            newCustomer.meiocomunicacao = customer.communicate;
+            //     newCustomer.meiocomunicacao = customer.communicate;
             newCustomer.codfunccad = customer.idUser;
             newCustomer.codfunccadastro = customer.idUser;
             newCustomer.codfuncultalter = customer.idUser;
@@ -341,7 +341,7 @@ export class CustomerService {
                     city: customer.city, state: customer.state,
                     allowMessage: customer.allowMessage, cellPhone: customer.cellPhone,
                     category: customer.category, subCategory: customer.subCategory,
-                    place: customer.place, ramo: customer.ramo, meiocomunicacao: customer.communicate,
+                    place: customer.place, ramo: customer.ramo, /*meiocomunicacao: customer.communicate,*/
                     latitude: customer.latitude, longitude: customer.longitude, ibgeCode: customer.ibgeCode,
                     addressType: customer.addressType,
                 };
@@ -361,7 +361,7 @@ export class CustomerService {
                     city: customer.city, state: customer.state,
                     allowMessage: customer.allowMessage, cellPhone: customer.cellPhone,
                     category: customer.category, subCategory: customer.subCategory,
-                    place: customer.place, meiocomunicacao: customer.communicate,
+                    place: customer.place, /*meiocomunicacao: customer.communicate,*/
                     ramo: customer.ramo, latitude: customer.latitude, longitude: customer.longitude,
                     ibgeCode: customer.ibgeCode, addressType: customer.addressType,
                 };
@@ -378,7 +378,7 @@ export class CustomerService {
         await queryRunner.connect();
         await queryRunner.startTransaction();
         try {
-            console.log("MEIO DE COMUNICACAO: " + client.meiocomunicacao);
+            //console.log("MEIO DE COMUNICACAO: " + client.meiocomunicacao);
             await queryRunner.manager
                 .createQueryBuilder()
                 .update(Pcclient)
@@ -419,7 +419,7 @@ export class CustomerService {
                     codcidadecom: client.codcidade,
                     dtnasc: client.dtnasc,
                     codatv1: client.codatv1,
-                    meiocomunicacao: client.meiocomunicacao,   
+                    //    meiocomunicacao: client.meiocomunicacao,   
                     codfuncultalter: client.codfuncultalter,
                     dtultalter: client.dtultalter,
                     latitude: client.latitude,

src/sales/sales/sales.service.ts

@@ -1211,15 +1211,15 @@ export class SalesService {
         const lockKey = 'departments_lock';
         const lockTimeout = 30;
 
-        try {
-          const cachedDepartments = await this.redisClient.get(cacheKey);
-          if (cachedDepartments) {
-            console.log('Buscando departamentos no Redis');
-            return JSON.parse(cachedDepartments);
-          }
-        } catch (err) {
-          console.error('Erro ao acessar o Redis (cache):', err);
-        }
+        // try {
+        //     const cachedDepartments = await this.redisClient.get(cacheKey);
+        //     if (cachedDepartments) {
+        //         console.log('Buscando departamentos no Redis');
+        //         return JSON.parse(cachedDepartments);
+        //     }
+        // } catch (err) {
+        //     console.error('Erro ao acessar o Redis (cache):', err);
+        // }
         const lockValue = Date.now() + lockTimeout * 1000 + 1;
         const acquiredLock = await this.redisClient.set(lockKey, lockValue, 'NX', 'EX', lockTimeout);
 
@@ -1234,7 +1234,7 @@ export class SalesService {
                     .getRepository(Esvdepartamento)
                     .createQueryBuilder('Esvdepartamento')
                     .innerJoinAndSelect('Esvdepartamento.secoes', 'secoes')
-              .innerJoinAndSelect('secoes.categorias', 'categorias')
+                    .leftJoinAndSelect('secoes.categorias', 'categorias')
                     .where('"Esvdepartamento".tituloecommerce is not null')
                     .orderBy('"Esvdepartamento".tituloecommerce, "secoes".tituloecommerce, "categorias".tituloecommerce')
                     .getMany();