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]);
@@ -141,8 +141,8 @@ export class UserService {
       const noDeliveryDays = await queryRunner.manager
         .query(sqlDiasSemEntrega, [Number.parseInt(users[0].deliveryTime)]);
 
-      const days = Number.parseInt(deliveryDays2[0].days) + 
-            ( noDeliveryDays.length > 0  ? Number.parseInt(noDeliveryDays[0].daysNoDelivery) : 0 );
+      const days = Number.parseInt(deliveryDays2[0].days) +
+        (noDeliveryDays.length > 0 ? Number.parseInt(noDeliveryDays[0].daysNoDelivery) : 0);
 
       const userDb = users[0];
       console.log(userDb);

src/app.controller.ts

@@ -12,9 +12,9 @@ export class AppController {
   }
 
   @Get('health')
-@ApiOperation({ summary: 'Health check' })
-healthCheck() {
-  return { status: 'ok' };
-}
+  @ApiOperation({ summary: 'Health check' })
+  healthCheck() {
+    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

@@ -1355,7 +1355,7 @@ export class Pcclient {
   @Column({ name: 'ORGAOPUBMUNICIPAL' })
   orgaopubmunicipal: string;
 
-   @Column({ name: 'CODCIDADECOM' })
+  @Column({ name: 'CODCIDADECOM' })
   codcidadecom: number;
 
   @Column({ name: 'CODPROMOCAOMED' })
@@ -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;
@@ -1645,5 +1645,5 @@ export class Pcclient {
 
   @OneToMany(() => Pcpedc, pedidos => pedidos.pcclient)
   pedidos: Pcpedc[];
-  
+
 }

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,16 +102,16 @@ 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.longitude       as "longitude" ' +
                 '        ,pcclient.codmunicipio    as "ibgeCode"  ' +
                 '        ,pcclient.codcidade       as "cityId"  ' +
                 '        ,pcclient.tipoendereco as "addressType"  ' +
@@ -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"  ' +
@@ -173,7 +173,7 @@ export class CustomerService {
                                                      FROM PCPRACA
                                                     WHERE PCPRACA.CODPRACA = ${customer[0].placeId}`);
 
-            return {...customer[0], place: place[0]};
+            return { ...customer[0], place: place[0] };
         } catch (error) {
             console.log(error);
             throw error;
@@ -267,16 +267,16 @@ export class CustomerService {
             newCustomer.telcelent = customer.cellPhone;
             newCustomer.celularwhatsapp = customer.cellPhone;
             newCustomer.codusur1 = customer.sellerId;
-            newCustomer.codatv1 = ( customer.ramo != null && customer.ramo.id > 0 ) ? customer.ramo.id : newCustomer.codatv1;
+            newCustomer.codatv1 = (customer.ramo != null && customer.ramo.id > 0) ? customer.ramo.id : newCustomer.codatv1;
             //Endereço de entrega
             newCustomer.cepent = customer.zipCode;
             newCustomer.enderent = customer.address.toUpperCase();
             newCustomer.numeroent = customer.addressNumber;
-            if ( customer.complement !== null && customer.complement.length > 80 ) {
-                newCustomer.complementoent = customer.complement.substring(0, 80 ).toUpperCase();
+            if (customer.complement !== null && customer.complement.length > 80) {
+                newCustomer.complementoent = customer.complement.substring(0, 80).toUpperCase();
             } else {
-                if ( customer.complement != null ) {
-                    newCustomer.complementoent =  customer.complement.toUpperCase();
+                if (customer.complement != null) {
+                    newCustomer.complementoent = customer.complement.toUpperCase();
                 }
             }
             newCustomer.bairroent = customer.neighborhood.toUpperCase();
@@ -286,10 +286,10 @@ export class CustomerService {
             newCustomer.cepcom = customer.zipCode;
             newCustomer.endercom = customer.address.toUpperCase();
             newCustomer.numerocom = customer.addressNumber.toUpperCase();
-            if ( customer.complement !== null && customer.complement.length > 80 ) {
-                newCustomer.complementocom = customer.complement.substring(0, 80 ).toUpperCase();
+            if (customer.complement !== null && customer.complement.length > 80) {
+                newCustomer.complementocom = customer.complement.substring(0, 80).toUpperCase();
             } else {
-                if ( customer.complement != null ) {
+                if (customer.complement != null) {
                     newCustomer.complementocom = customer.complement.toUpperCase();
                 }
             }
@@ -300,12 +300,12 @@ export class CustomerService {
             newCustomer.cepcob = customer.zipCode;
             newCustomer.endercob = customer.address.toUpperCase();
             newCustomer.numerocob = customer.addressNumber;
-            if ( customer.complement !== null && customer.complement.length > 80 ) {
-                newCustomer.complementocob = customer.complement.substring(0, 80 ).toUpperCase();
+            if (customer.complement !== null && customer.complement.length > 80) {
+                newCustomer.complementocob = customer.complement.substring(0, 80).toUpperCase();
             } else {
-                if ( customer.complement ) {
+                if (customer.complement) {
                     newCustomer.complementocob = customer.complement.toUpperCase();
-                }                
+                }
             }
             newCustomer.bairrocob = customer.neighborhood.toUpperCase();
             newCustomer.municcob = customer.city.toUpperCase();
@@ -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,8 +361,8 @@ 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,
-                    ramo: customer.ramo, latitude: customer.latitude, longitude: customer.longitude, 
+                    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)
@@ -418,13 +418,13 @@ export class CustomerService {
                     codmunicipio: client.codmunicipio,
                     codcidadecom: client.codcidade,
                     dtnasc: client.dtnasc,
-                    codatv1: client.codatv1,     
-                    meiocomunicacao: client.meiocomunicacao,   
+                    codatv1: client.codatv1,
+                    //    meiocomunicacao: client.meiocomunicacao,   
                     codfuncultalter: client.codfuncultalter,
-                    dtultalter: client.dtultalter,  
+                    dtultalter: client.dtultalter,
                     latitude: client.latitude,
-                    longitude: client.longitude,  
-                    tipoendereco: client.tipoendereco        
+                    longitude: client.longitude,
+                    tipoendereco: client.tipoendereco
                 })
                 .where({ codcli: client.codcli })
                 .execute();
@@ -434,7 +434,7 @@ export class CustomerService {
             await queryRunner.rollbackTransaction();
             throw err;
         } finally {
-            if ( queryRunner.isTransactionActive) {
+            if (queryRunner.isTransactionActive) {
                 await queryRunner.rollbackTransaction();
             }
             await queryRunner.release();
@@ -532,13 +532,13 @@ export class CustomerService {
         const connection = new Connection(connectionOptions);
         const queryRunner = connection.createQueryRunner();
         try {
-           
-        await connection.connect();
-       
-        await queryRunner.connect();
 
-        // lets now open a new transaction:
-        await queryRunner.startTransaction();
+            await connection.connect();
+
+            await queryRunner.connect();
+
+            // lets now open a new transaction:
+            await queryRunner.startTransaction();
 
 
             let sql = `SELECT PROXNUMCLI as "proxnumcli" FROM PCCONSUM WHERE 1 = 1 FOR UPDATE`;
@@ -566,14 +566,14 @@ export class CustomerService {
 
         } catch (err) {
             // since we have errors let's rollback changes we made
-            if ( queryRunner.isTransactionActive) {
+            if (queryRunner.isTransactionActive) {
                 await queryRunner.rollbackTransaction();
             }
             console.log(err);
             return -1;
 
         } finally {
-            if ( queryRunner.isTransactionActive) {
+            if (queryRunner.isTransactionActive) {
                 await queryRunner.rollbackTransaction();
             }
             // you need to release query runner which is manually created:
@@ -603,7 +603,7 @@ export class CustomerService {
             console.log(err);
             throw err;
         } finally {
-            if ( queryRunner.isTransactionActive) {
+            if (queryRunner.isTransactionActive) {
                 await queryRunner.rollbackTransaction();
             }
             await queryRunner.release();

src/sales/sales/sales.service.ts

@@ -20,10 +20,10 @@ import Redis = require('ioredis');
 @Injectable()
 export class SalesService {
 
-  constructor(
-    @Inject('REDIS_CLIENT') private readonly redisClient: Redis.Redis,
-     private readonly customerService: CustomerService
-  ) {}
+    constructor(
+        @Inject('REDIS_CLIENT') private readonly redisClient: Redis.Redis,
+        private readonly customerService: CustomerService
+    ) { }
 
 
     async GetProducts2(store: string, pageSize: number, pageNumber: number, filter: FilterProduct = null,) {
@@ -86,7 +86,7 @@ export class SalesService {
             if (filter && filter.text.length > 0) {
                 const description = filter.text.toUpperCase();
                 console.log('consultando por codigo de fabrica');
-                
+
                 let products = await queryRunner.manager
                     .getRepository(SalesProduct)
                     .createQueryBuilder('esvlistaprodutos')
@@ -367,92 +367,92 @@ export class SalesService {
         pageSize: number,
         pageNumber: number,
         urlDepartment: string
-      ): Promise<any> {
+    ): Promise<any> {
         const cacheKey =
-          'searchByDepartment:' +
-          store +
-          '_' +
-          pageSize +
-          '_' +
-          pageNumber +
-          '_' +
-          urlDepartment;
+            'searchByDepartment:' +
+            store +
+            '_' +
+            pageSize +
+            '_' +
+            pageNumber +
+            '_' +
+            urlDepartment;
         const lockKey = 'lock:' + cacheKey;
         const lockTimeout = 30; // lock expira em 30 segundos
-      
+
         try {
-          const cachedResult = await this.redisClient.get(cacheKey);
-          if (cachedResult) {
-            console.log('Retornando resultado do cache (searchByDepartment)');
-            return JSON.parse(cachedResult);
-          }
+            const cachedResult = await this.redisClient.get(cacheKey);
+            if (cachedResult) {
+                console.log('Retornando resultado do cache (searchByDepartment)');
+                return JSON.parse(cachedResult);
+            }
         } catch (err) {
-          console.error('Erro ao acessar o Redis no searchByDepartment:', err?.message || err);
+            console.error('Erro ao acessar o Redis no searchByDepartment:', err?.message || err);
         }
-      
+
         const lockValue = Date.now() + lockTimeout * 1000 + 1;
         let acquiredLock: string | null = null;
         try {
-          acquiredLock = await this.redisClient.set(lockKey, lockValue, 'NX', 'EX', lockTimeout);
+            acquiredLock = await this.redisClient.set(lockKey, lockValue, 'NX', 'EX', lockTimeout);
         } catch (err) {
-          console.error('Erro ao adquirir lock no Redis (searchByDepartment):', err?.message || err);
+            console.error('Erro ao adquirir lock no Redis (searchByDepartment):', err?.message || err);
         }
-      
+
         if (acquiredLock === 'OK') {
-          const connectionDb = new Connection(connectionOptions);
-          await connectionDb.connect();
-          const queryRunner = connectionDb.createQueryRunner();
-          await queryRunner.connect();
-          try {
-            if (pageSize === 0) pageSize = 50;
-            if (pageNumber === 0) pageNumber = 1;
-            const offSet = (pageNumber - 1) * pageSize;
-      
-            let products = await queryRunner.manager
-              .getRepository(SalesProduct)
-              .createQueryBuilder('esvlistaprodutos')
-              .where('"esvlistaprodutos".urldepartamento = :urlDepartment', { urlDepartment })
-              .andWhere('("esvlistaprodutos".codfilial = :codfilial OR :codfilial = \'99\')', { codfilial: store })
-              .limit(pageSize)
-              .offset(offSet)
-              .orderBy('"esvlistaprodutos".DESCRICAO', 'ASC')
-              .getMany();
-      
-            products = this.createListImages(products);
-      
+            const connectionDb = new Connection(connectionOptions);
+            await connectionDb.connect();
+            const queryRunner = connectionDb.createQueryRunner();
+            await queryRunner.connect();
             try {
-              await this.redisClient.set(cacheKey, JSON.stringify(products), 'EX', 3600);
-            } catch (cacheErr) {
-              console.error('Erro ao salvar o resultado no cache (searchByDepartment):', cacheErr?.message || cacheErr);
+                if (pageSize === 0) pageSize = 50;
+                if (pageNumber === 0) pageNumber = 1;
+                const offSet = (pageNumber - 1) * pageSize;
+
+                let products = await queryRunner.manager
+                    .getRepository(SalesProduct)
+                    .createQueryBuilder('esvlistaprodutos')
+                    .where('"esvlistaprodutos".urldepartamento = :urlDepartment', { urlDepartment })
+                    .andWhere('("esvlistaprodutos".codfilial = :codfilial OR :codfilial = \'99\')', { codfilial: store })
+                    .limit(pageSize)
+                    .offset(offSet)
+                    .orderBy('"esvlistaprodutos".DESCRICAO', 'ASC')
+                    .getMany();
+
+                products = this.createListImages(products);
+
+                try {
+                    await this.redisClient.set(cacheKey, JSON.stringify(products), 'EX', 3600);
+                } catch (cacheErr) {
+                    console.error('Erro ao salvar o resultado no cache (searchByDepartment):', cacheErr?.message || cacheErr);
+                }
+
+                return products;
+            } catch (error) {
+                console.error('Erro ao executar a query no searchByDepartment:', error?.message || error);
+                throw error;
+            } finally {
+                await queryRunner.release();
+                await connectionDb.close();
+
+                try {
+                    const currentLockValue = await this.redisClient.get(lockKey);
+                    if (currentLockValue === lockValue.toString()) {
+                        await this.redisClient.del(lockKey);
+                    }
+                } catch (lockErr) {
+                    console.error('Erro ao liberar o lock do Redis (searchByDepartment):', lockErr?.message || lockErr);
+                }
             }
-      
-            return products;
-          } catch (error) {
-            console.error('Erro ao executar a query no searchByDepartment:', error?.message || error);
-            throw error;
-          } finally {
-            await queryRunner.release();
-            await connectionDb.close();
-      
-            try {
-              const currentLockValue = await this.redisClient.get(lockKey);
-              if (currentLockValue === lockValue.toString()) {
-                await this.redisClient.del(lockKey);
-              }
-            } catch (lockErr) {
-              console.error('Erro ao liberar o lock do Redis (searchByDepartment):', lockErr?.message || lockErr);
-            }
-          }
         } else {
-          console.log('Lock não adquirido (searchByDepartment), aguardando e tentando novamente...');
-          await this.sleep(1000);
-          return this.searchByDepartment(store, pageSize, pageNumber, urlDepartment);
+            console.log('Lock não adquirido (searchByDepartment), aguardando e tentando novamente...');
+            await this.sleep(1000);
+            return this.searchByDepartment(store, pageSize, pageNumber, urlDepartment);
         }
-      }
-      
-      
-      
-      
+    }
+
+
+
+
 
     async searchBySection(store: string, pageSize: number, pageNumber: number, urlDepartment: string, urlSection: string): Promise<any> {
         const connectionDb = new Connection(connectionOptions);
@@ -620,7 +620,7 @@ export class SalesService {
                         .addSelect("\"esvlistaprodutos\".PRODUTO_COM_REDUCAO_PRECO", "downPrice")
                         .addSelect("\"esvlistaprodutos\".PRODUTO_EM_CAMPANHA", "compaing")
                         .addSelect("\"esvlistaprodutos\".BASETINTOMETRICO", "base")
-                        .addSelect("\"esvlistaprodutos\".QUANTIDADE_ESTOQUE_GERAL", "full_stock")   
+                        .addSelect("\"esvlistaprodutos\".QUANTIDADE_ESTOQUE_GERAL", "full_stock")
                         .addSelect("\"esvlistaprodutos\".TEM_PRODUTO_SIMILAR", "similar")
                         .addSelect("\"esvlistaprodutos\".TIPO_CAMPANHA", "type_campaing")
                         .where("esvlistaprodutos.CODAUXILIAR = :id", { id: numbers })
@@ -671,7 +671,7 @@ export class SalesService {
                     .addSelect("\"esvlistaprodutos\".PRODUTO_COM_REDUCAO_PRECO", "downPrice")
                     .addSelect("\"esvlistaprodutos\".PRODUTO_EM_CAMPANHA", "compaing")
                     .addSelect("\"esvlistaprodutos\".BASETINTOMETRICO", "base")
-                    .addSelect("\"esvlistaprodutos\".QUANTIDADE_ESTOQUE_GERAL", "full_stock")       
+                    .addSelect("\"esvlistaprodutos\".QUANTIDADE_ESTOQUE_GERAL", "full_stock")
                     .addSelect("\"esvlistaprodutos\".TEM_PRODUTO_SIMILAR", "similar")
                     .addSelect("\"esvlistaprodutos\".TIPO_CAMPANHA", "type_campaing")
                     .where("UPPER(esvlistaprodutos.CODFAB) like REPLACE(:description, '@', '%')", { description })
@@ -719,7 +719,7 @@ export class SalesService {
                         .addSelect("\"esvlistaprodutos\".PRODUTO_COM_REDUCAO_PRECO", "downPrice")
                         .addSelect("\"esvlistaprodutos\".PRODUTO_EM_CAMPANHA", "compaing")
                         .addSelect("\"esvlistaprodutos\".BASETINTOMETRICO", "base")
-                        .addSelect("\"esvlistaprodutos\".QUANTIDADE_ESTOQUE_GERAL", "full_stock")   
+                        .addSelect("\"esvlistaprodutos\".QUANTIDADE_ESTOQUE_GERAL", "full_stock")
                         .addSelect("\"esvlistaprodutos\".TEM_PRODUTO_SIMILAR", "similar")
                         .addSelect("\"esvlistaprodutos\".TIPO_CAMPANHA", "type_campaing")
                         .where("UPPER(esvlistaprodutos.DESCRICAO) like REPLACE(:description, '@', '%')", { description })
@@ -790,7 +790,7 @@ export class SalesService {
                 .addSelect("\"esvlistaprodutos\".PRODUTO_COM_REDUCAO_PRECO", "downPrice")
                 .addSelect("\"esvlistaprodutos\".PRODUTO_EM_CAMPANHA", "compaing")
                 .addSelect("\"esvlistaprodutos\".BASETINTOMETRICO", "base")
-                .addSelect("\"esvlistaprodutos\".QUANTIDADE_ESTOQUE_GERAL", "full_stock")       
+                .addSelect("\"esvlistaprodutos\".QUANTIDADE_ESTOQUE_GERAL", "full_stock")
                 .addSelect("\"esvlistaprodutos\".TEM_PRODUTO_SIMILAR", "similar")
                 .addSelect("\"esvlistaprodutos\".TIPO_CAMPANHA", "type_campaing")
                 .where("esvlistaprodutos.idProduct = :id", { id: id })
@@ -958,9 +958,9 @@ export class SalesService {
                             WHERE ESVESTOQUEVENDA.CODPROD = ${id}
                               AND ESVESTOQUEVENDA.CODFILIAL = PCFILIAL.CODIGO
                             ORDER BY TO_NUMBER(ESVESTOQUEVENDA.CODFILIAL) `;
-            
-            const stock = await queryRunner.query(sql); 
-            
+
+            const stock = await queryRunner.query(sql);
+
             // return await queryRunner.manager
             //     .getRepository(Stock)
             //     .createQueryBuilder('esvestoquevenda')
@@ -1210,71 +1210,71 @@ export class SalesService {
         const cacheKey = 'departments';
         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);
-        }
-              const lockValue = Date.now() + lockTimeout * 1000 + 1;
+
+        // 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);
-        
+
         if (acquiredLock === 'OK') {
-          const connectionDb = new Connection(connectionOptions);
-          await connectionDb.connect();
-          const queryRunner = connectionDb.createQueryRunner();
-          await queryRunner.connect();
-      
-          try {
-            const departments = await queryRunner.manager
-              .getRepository(Esvdepartamento)
-              .createQueryBuilder('Esvdepartamento')
-              .innerJoinAndSelect('Esvdepartamento.secoes', 'secoes')
-              .innerJoinAndSelect('secoes.categorias', 'categorias')
-              .where('"Esvdepartamento".tituloecommerce is not null')
-              .orderBy('"Esvdepartamento".tituloecommerce, "secoes".tituloecommerce, "categorias".tituloecommerce')
-              .getMany();
-      
+            const connectionDb = new Connection(connectionOptions);
+            await connectionDb.connect();
+            const queryRunner = connectionDb.createQueryRunner();
+            await queryRunner.connect();
+
             try {
-              await this.redisClient.set(cacheKey, JSON.stringify(departments), 'EX', 3600);
-            } catch (cacheErr) {
-              console.error('Erro ao armazenar dados no Redis:', cacheErr);
+                const departments = await queryRunner.manager
+                    .getRepository(Esvdepartamento)
+                    .createQueryBuilder('Esvdepartamento')
+                    .innerJoinAndSelect('Esvdepartamento.secoes', 'secoes')
+                    .leftJoinAndSelect('secoes.categorias', 'categorias')
+                    .where('"Esvdepartamento".tituloecommerce is not null')
+                    .orderBy('"Esvdepartamento".tituloecommerce, "secoes".tituloecommerce, "categorias".tituloecommerce')
+                    .getMany();
+
+                try {
+                    await this.redisClient.set(cacheKey, JSON.stringify(departments), 'EX', 3600);
+                } catch (cacheErr) {
+                    console.error('Erro ao armazenar dados no Redis:', cacheErr);
+                }
+
+                return departments;
+            } catch (dbErr) {
+                console.error('Erro na consulta ao banco de dados:', dbErr);
+                throw dbErr;
+            } finally {
+                await queryRunner.release();
+                await connectionDb.close();
+
+                // Libera o lock somente se ainda for o proprietário
+                try {
+                    const currentLockValue = await this.redisClient.get(lockKey);
+                    if (currentLockValue === lockValue.toString()) {
+                        await this.redisClient.del(lockKey);
+                    }
+                } catch (lockErr) {
+                    console.error('Erro ao liberar o lock do Redis:', lockErr);
+                }
             }
-      
-            return departments;
-          } catch (dbErr) {
-            console.error('Erro na consulta ao banco de dados:', dbErr);
-            throw dbErr;
-          } finally {
-            await queryRunner.release();
-            await connectionDb.close();
-      
-            // Libera o lock somente se ainda for o proprietário
-            try {
-              const currentLockValue = await this.redisClient.get(lockKey);
-              if (currentLockValue === lockValue.toString()) {
-                await this.redisClient.del(lockKey);
-              }
-            } catch (lockErr) {
-              console.error('Erro ao liberar o lock do Redis:', lockErr);
-            }
-          }
         } else {
-          console.log('Lock não adquirido, aguardando a liberação...');
-          await this.sleep(1000); // aguarda 1 segundo
-          return this.getDepartments();
+            console.log('Lock não adquirido, aguardando a liberação...');
+            await this.sleep(1000); // aguarda 1 segundo
+            return this.getDepartments();
         }
-      }
-            private sleep(ms: number): Promise<void> {
+    }
+    private sleep(ms: number): Promise<void> {
         return new Promise(resolve => setTimeout(resolve, ms));
-      }
-      
-      
-    
+    }
+
+
+
 
 
     async getCategory() {
@@ -1301,15 +1301,15 @@ export class SalesService {
 
     async searchProduct2(store: string, pageSize: number, pageNumber: number, filter: FilterProduct) {
         console.log('searchProduct2');
-    
+
         const cacheKey = `searchProduct2:${store}:${pageSize}:${pageNumber}:${JSON.stringify(filter)}`;
-    
+
         const cachedProducts = await this.redisClient.get(cacheKey);
         if (cachedProducts) {
             console.log('Retornando produtos do cache');
             return JSON.parse(cachedProducts);
         }
-    
+
         const sql = 'SELECT  esvlistaprodutos.CODPROD "idProduct" ' +
             `       ,esvlistaprodutos.SEQ "seq"  ` +
             '       ,esvlistaprodutos.DESCRICAO "smallDescription" ' +
@@ -1352,8 +1352,8 @@ export class SalesService {
             '       ,esvlistaprodutos.TEM_PRODUTO_SIMILAR   "similar" ' +
             '       ,esvlistaprodutos.TIPO_CAMPANHA   "type_campaing" ' +
             '  FROM esvlistaprodutos ' +
-            ' WHERE 1 = 1 ';            
-    
+            ' WHERE 1 = 1 ';
+
         let where = "";
         if (filter.text != null) {
             where += ` AND ( ESF_REMOVE_ACENTUACAO(UPPER(esvlistaprodutos.descricao)) LIKE ` +
@@ -1373,7 +1373,7 @@ export class SalesService {
         where += ` AND (esvlistaprodutos.produto_em_campanha = '${(filter.offers ? 'D' : 'N')}' OR '${(filter.offers ? 'S' : 'N')}' = 'N') `;
         where += ` AND (esvlistaprodutos.produto_em_campanha = '${(filter.oportunity ? 'O' : 'N')}' OR '${(filter.oportunity ? 'O' : 'N')}' = 'N') `;
         where += ` AND (esvlistaprodutos.produto_em_promocao = '${(filter.promotion ? 'S' : 'N')}' OR '${(filter.promotion ? 'S' : 'N')}' = 'N') `;
-    
+
         if (filter.onlyWithStock) {
             if (filter.storeStock == '' || filter.storeStock == null) {
                 where += ` AND EXISTS( SELECT P.CODPROD FROM ESVLISTAPRODUTOS P ` +
@@ -1385,15 +1385,15 @@ export class SalesService {
                     `                AND P.ESTOQUE_DISP_LOJA > 0 ) `;
             }
         }
-    
+
         if (filter.percentOffMin > 0) {
             where += ` AND esvlistaprodutos.PERCENTUALDESCONTO >= ${filter.percentOffMin}`;
         }
-    
+
         if (filter.percentOffMax > 0) {
             where += ` AND esvlistaprodutos.PERCENTUALDESCONTO <= ${filter.percentOffMax}`;
         }
-    
+
         let xbrands = '';
         if (filter && filter.brands && filter.brands.length > 0) {
             const brands = filter.brands;
@@ -1406,24 +1406,24 @@ export class SalesService {
             });
             where += ` AND esvlistaprodutos.nomemarca in ( ${xbrands} )`;
         }
-    
+
         const orderBy = `ORDER BY esvlistaprodutos.${(filter.orderBy == null) ? 'DESCRICAO' : filter.orderBy}`;
-    
+
         const skipReg = ((pageNumber - 1) * pageSize);
         const pagination = ` OFFSET ${skipReg} ROWS FETCH NEXT ${pageSize} ROWS ONLY`;
-    
+
         const connectionDb = new Connection(connectionOptions);
         await connectionDb.connect();
         const queryRunner = connectionDb.createQueryRunner();
         await queryRunner.connect();
-    
+
         try {
             let products = await queryRunner.manager.query(sql + where + orderBy + pagination) as SalesProduct[];
             products = this.createListImages(products);
             console.log("Total de produtos: " + products.length);
-    
+
             await this.redisClient.set(cacheKey, JSON.stringify(products), 'EX', 3600);
-    
+
             return products;
         } catch (err) {
             console.log(err);
@@ -1433,7 +1433,7 @@ export class SalesService {
             await connectionDb.close();
         }
     }
-    
+
 
 
     async calculateDeliveryTax(cartId: string, ibgeCode: string) {
@@ -1488,7 +1488,7 @@ export class SalesService {
                             WHERE ID = '${cartId}'`;
 
             await queryRunner.manager
-                  .query(sql);
+                .query(sql);
             await queryRunner.commitTransaction();
         } catch (err) {
             await queryRunner.rollbackTransaction();
@@ -1543,26 +1543,26 @@ export class SalesService {
             await queryRunner.release();
             await connectionDb.close();
         }
-        
+
     }
 
-    
+
     async getPlacesInterior() {
         const connectionDb = new Connection(connectionOptions);
         await connectionDb.connect();
         const queryRunner = connectionDb.createQueryRunner();
         await queryRunner.connect();
-    
+
         try {
             const sql = `
                 SELECT DISTINCT ESTPREVENTREGAPRACA.CODPRACA, PCPRACA.PRACA 
                 FROM ESTPREVENTREGAPRACA, PCPRACA
                 WHERE ESTPREVENTREGAPRACA.CODPRACA = PCPRACA.CODPRACA
             `;
-    
+
             const places = await queryRunner.query(sql);
-    
-         
+
+
             return places;
         } catch (err) {
             throw err;
@@ -1571,7 +1571,7 @@ export class SalesService {
             await connectionDb.close();
         }
     }
-    
+
 
     async getDeliveryTime(saleDate: string, invoiceStoreId: string, placeId: string, cartId: string) {
         const connection = new Connection(connectionOptions);
@@ -1580,7 +1580,7 @@ export class SalesService {
         await queryRunner.connect();
         try {
             const sql = `SELECT ESF_CALCULAR_PRAZO_ENTREGA_PROGRAMADA(TO_DATE('${saleDate}', 'DD-MM-YYYY'), ${invoiceStoreId}, ${placeId}, '${cartId}') AS "days" FROM DUAL`;
-           // const sql = `SELECT ESF_CALCULAR_PRAZO_ENTREGA(TO_DATE('${saleDate}', 'DD-MM-YYYY')) AS "days" FROM DUAL`;
+            // const sql = `SELECT ESF_CALCULAR_PRAZO_ENTREGA(TO_DATE('${saleDate}', 'DD-MM-YYYY')) AS "days" FROM DUAL`;
             const timeDays = await queryRunner.query(sql);
 
             const sqlRetiraPosterior = `SELECT ( PROXIMO_DIA_UTIL(TO_DATE('${saleDate}', 'DD-MM-YYYY'), '4') - TRUNC(SYSDATE) ) AS "days" FROM DUAL`;