fix: resolve merge conflict in calculateDeliveryTaxOrder

.gitea/workflows/deploy-api.yaml

@@ -0,0 +1,30 @@
+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 10.1.1.124:8082 -u ${{ secrets.HARBOR_USERNAME }} --password-stdin
+
+      - name: Build e Push
+        run: |
+          # Usando o short SHA para uma tag mais limpa
+          TAG=$(echo ${{ gitea.sha }} | cut -c1-7)
+          IMAGE_NAME="10.1.1.124:8082/library/vendaweb-api"
+          
+          docker build -t $IMAGE_NAME:$TAG .
+          docker tag $IMAGE_NAME:$TAG $IMAGE_NAME:latest
+          
+          docker push $IMAGE_NAME:$TAG
+          docker push $IMAGE_NAME:latest
+          
+      - name: Notificar Portainer via Webhook
+        run: |
+          # O segredo PORTAINER_WEBHOOK_VENDAWEBAPI deve conter a URL completa gerada na Stack
+          curl -f -X POST "${{ secrets.PORTAINER_WEBHOOK_VENDAWEBAPI }}"

.gitignore

@@ -33,3 +33,5 @@ lerna-debug.log*
 !.vscode/launch.json
 !.vscode/extensions.json
 
+postgres-data/
+.env

Dockerfile

@@ -1,32 +1,24 @@
-FROM node:16
+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
+RUN apt-get update && apt-get install -y libaio1 unzip wget && mkdir -p /opt/oracle
 
-RUN apt-get update && apt-get install -y \
+RUN wget https://download.oracle.com/otn_software/linux/instantclient/instantclient-basic-linuxx64.zip -O /opt/oracle/client.zip && \
-    apt-transport-https \
+    unzip /opt/oracle/client.zip -d /opt/oracle && \
-    ca-certificates \
+    rm /opt/oracle/client.zip && \
-    libaio1 \
+    ln -s /opt/oracle/instantclient_* /opt/oracle/instantclient
-    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
-
 
+ENV LD_LIBRARY_PATH=/opt/oracle/instantclient
 WORKDIR /app
 
+COPY --from=builder /app/dist ./dist
+COPY --from=builder /app/package*.json ./
+COPY --from=builder /app/node_modules ./node_modules
 
-COPY package*.json ./
+EXPOSE 8068
-
-
-RUN npm install  --legacy-peer-deps
-
-COPY . .
-
-
 CMD ["npm", "run", "start:prod"]

docker-compose.yml

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

src/app.controller.ts

@@ -1,5 +1,5 @@
 import { Controller, Get } from '@nestjs/common';
-import { ApiTags, ApiOperation } from '@nestjs/swagger';
+import { ApiOperation, ApiTags } from '@nestjs/swagger';
 import { APP_VERSION } from './version';
 
 @ApiTags('Main')
@@ -11,10 +11,10 @@ export class AppController {
      return { version: APP_VERSION };
   }
 
-  @Get('health')
+@Get('health')
 @ApiOperation({ summary: 'Health check' })
 healthCheck() {
-  return { status: 'ok' };
+  return { status: 'TESTE COM Felipe2 ' };
 }
 
 }

src/configs/typeorm.config.ts

@@ -2,17 +2,17 @@ import { TypeOrmModuleOptions } from '@nestjs/typeorm';
 import { ConnectionOptions } from 'typeorm';
 
 export const typeOrmConfig: TypeOrmModuleOptions = {
-  type: 'oracle',
+  type: "oracle",
   //  host: "192.168.100.40", 
   //  username: "LIVIA",  
   //  password: "LIVIA", 
-  host: '10.1.1.241',
+  host: "10.1.1.241",
-  username: 'SEVEN',
+  username: "SEVEN",
-  password: 'USR54SEV',
+  password: "USR54SEV",
   // username: "API", 
   // password: "E05H5KIEQV3YKDJR", 
   port: 1521,
-  serviceName: 'WINT',
+  sid: "WINT",
   synchronize: false,
   logging: false,
   entities: [__dirname + '/../**/*.entity.{js,ts}'],
@@ -20,12 +20,12 @@ export const typeOrmConfig: TypeOrmModuleOptions = {
 };
 
 export const connectionOptions: ConnectionOptions = {
-  type: 'oracle',
+  type: "oracle",
-  host: '10.1.1.241',
+  host: "10.1.1.241",
-  username: 'SEVEN',
+  username: "SEVEN",
-  password: 'USR54SEV',
+  password: "USR54SEV",
   port: 1521,
-  serviceName: 'WINT',
+  sid: "WINT",
   synchronize: false,
   logging: false,
   entities: [__dirname + '/../**/*.entity.{js,ts}'],

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(8068, '0.0.0.0');}
-}
+console.log('API rodando na porta 8065 test 4');
 bootstrap();

src/sales/customer/customer.controller.ts

@@ -132,17 +132,15 @@ export class CustomerController {
   }
 
     @Post('create')
-  async createCustomer(@Body() customer: Customer) {
+    async createCustomer(@Body() customer: Customer){
-    try {
+        try{
             console.log(customer);
             const result = await this.customerService.createCustomer(customer);
             return new ResultModel(true, null, result, null);
             //return new ResultModel(true, null, id, null);
-    } catch (err) {
+        } catch(err){
-      throw new HttpException(
+            throw new HttpException(new ResultModel(false, 'Erro ao cadastrar cliente.', {}, err),
-        new ResultModel(false, 'Erro ao cadastrar cliente.', {}, err),
+                 HttpStatus.INTERNAL_SERVER_ERROR);
-        HttpStatus.INTERNAL_SERVER_ERROR,
-      );
         }
     }
 }

src/sales/customer/customer.service.ts

@@ -367,66 +367,37 @@ export class CustomerService {
                 await this.updateCustomer(newCustomer);
                 return {
                     customerId: oldCustomer.customerId,
-          company: customer.company,
+                    company: customer.company, name: customer.name, sexo: customer.gender,
-          name: customer.name,
+                    cpfCnpj: customer.cpfCnpj, numberState: customer.numberState,
-          sexo: customer.gender,
+                    email: customer.email, zipCode: customer.zipCode, address: customer.address,
-          cpfCnpj: customer.cpfCnpj,
+                    addressNumber: customer.addressNumber, complement: customer.complement,
-          numberState: customer.numberState,
-          email: customer.email,
-          zipCode: customer.zipCode,
-          address: customer.address,
-          addressNumber: customer.addressNumber,
-          complement: customer.complement,
                     neighborhood: customer.neighborhood,
-          city: customer.city,
+                    city: customer.city, state: customer.state,
-          state: customer.state,
+                    allowMessage: customer.allowMessage, cellPhone: customer.cellPhone,
-          allowMessage: customer.allowMessage,
+                    category: customer.category, subCategory: customer.subCategory,
-          cellPhone: customer.cellPhone,
+                    place: customer.place, ramo: customer.ramo, meiocomunicacao: customer.communicate,
-          category: customer.category,
+                    latitude: customer.latitude, longitude: customer.longitude, ibgeCode: customer.ibgeCode,
-          subCategory: customer.subCategory,
-          place: customer.place,
-          ramo: customer.ramo,
-          meiocomunicacao: customer.communicate,
-          latitude: customer.latitude,
-          longitude: customer.longitude,
-          ibgeCode: customer.ibgeCode,
                     addressType: customer.addressType,
                 };
             } else {
                 const idCustomer = await this.generateIdCustomer();
                 if (idCustomer == -1)
-          return new HttpException(
+                    return new HttpException("Erro ao gerar númeração de cliente.", HttpStatus.INTERNAL_SERVER_ERROR);
-            'Erro ao gerar númeração de cliente.',
-            HttpStatus.INTERNAL_SERVER_ERROR,
-          );
                 newCustomer.codcli = idCustomer;
                 await this.insertCustomer(newCustomer);
                 return {
                     customerId: idCustomer,
-          company: customer.company,
+                    company: customer.company, name: customer.name,
-          name: customer.name,
+                    cpfCnpj: customer.cpfCnpj, gender: customer.gender, numberState: customer.numberState,
-          cpfCnpj: customer.cpfCnpj,
+                    email: customer.email, zipCode: customer.zipCode, address: customer.address,
-          gender: customer.gender,
+                    addressNumber: customer.addressNumber, complement: customer.complement,
-          numberState: customer.numberState,
-          email: customer.email,
-          zipCode: customer.zipCode,
-          address: customer.address,
-          addressNumber: customer.addressNumber,
-          complement: customer.complement,
                     neighborhood: customer.neighborhood,
-          city: customer.city,
+                    city: customer.city, state: customer.state,
-          state: customer.state,
+                    allowMessage: customer.allowMessage, cellPhone: customer.cellPhone,
-          allowMessage: customer.allowMessage,
+                    category: customer.category, subCategory: customer.subCategory,
-          cellPhone: customer.cellPhone,
+                    place: customer.place, meiocomunicacao: customer.communicate,
-          category: customer.category,
+                    ramo: customer.ramo, latitude: customer.latitude, longitude: customer.longitude, 
-          subCategory: customer.subCategory,
+                    ibgeCode: customer.ibgeCode, addressType: customer.addressType,
-          place: customer.place,
-          meiocomunicacao: customer.communicate,
-          ramo: customer.ramo,
-          latitude: customer.latitude,
-          longitude: customer.longitude,
-          ibgeCode: customer.ibgeCode,
-          addressType: customer.addressType,
                 };
             }
         } catch (error) {

src/sales/sales/sales.service.ts

@@ -1506,12 +1506,6 @@ export class SalesService {
 
     async calculateDeliveryTaxOrder(dataDeliveryTax: any) {
         console.log("json dataDeliveryTax", dataDeliveryTax);
-        /*const dataDeliveryTax = {
-              cartId: cartId,
-              cityId: cityId,
-              ibgeCode: ibgeCode,
-              priorityDelivery: priorityDelivery,
-            };*/
 
         let cityId = 0;
         if (dataDeliveryTax.ibgeCode) {