Compare commits

41 Commits

Author SHA1 Message Date
Gitea Action
35ea219c11 chore: update image tag to 90f2c2e [skip ci] 2026-02-19 13:01:57 +00:00
Luis Eduardo Estevao
90f2c2efee Merge branch 'main' of https://git.simplifiquehc.com.br/simplifique/Vendaweb-api
All checks were successful
Build (develop) / Promote (main) / build-and-push-deploy (push) Successful in 1m19s
2026-02-19 10:00:35 -03:00
Luis Eduardo Estevao
366d6d1f4d feat: Add backoffice list controller and service for various data lookups and new sales customer, order, and pre-order services. Add parameter customerId para find payment plans 2026-02-19 10:00:29 -03:00
Gitea Action
1187693df8 chore: update image tag to 2095866 [skip ci] 2026-02-19 12:05:20 +00:00
Luis Eduardo Estevao
2095866d97 Merge branch 'main' of https://git.simplifiquehc.com.br/simplifique/Vendaweb-api
All checks were successful
Build (develop) / Promote (main) / build-and-push-deploy (push) Successful in 1m19s
2026-02-19 09:03:46 -03:00
Luis Eduardo Estevao
1228970b0d feat: implement SalesService for managing product sales, stock, and related data queries. 2026-02-19 09:03:39 -03:00
Gitea Action
e31226b46a chore: update image tag to 3aa9673 [skip ci] 2026-02-18 16:32:39 +00:00
Luis Eduardo Estevao
3aa967352f Merge branch 'main' of https://git.simplifiquehc.com.br/simplifique/Vendaweb-api
All checks were successful
Build (develop) / Promote (main) / build-and-push-deploy (push) Successful in 1m17s
2026-02-18 13:31:09 -03:00
Luis Eduardo Estevao
175a1b9ccd feat: add ShippingService with methods for retrieving customer shippings, shop collections, customer collections, and delivery schedules. 2026-02-18 13:31:03 -03:00
Gitea Action
5665c4e71d chore: update image tag to c088c38 [skip ci] 2026-02-12 21:10:06 +00:00
c088c38a05 chore: update registry and repository URLs to use internal IP address
All checks were successful
Build (develop) / Promote (main) / build-and-push-deploy (push) Successful in 1m38s
2026-02-12 18:08:05 -03:00
d6d70400ac Merge branch 'main' of http://172.35.0.216:3000/simplifique/Vendaweb-api
Some checks failed
Build (develop) / Promote (main) / build-and-push-deploy (push) Has been cancelled
2026-02-12 18:00:14 -03:00
599a916257 fix: update health check status message to reflect new version 2026-02-12 17:36:55 -03:00
Gitea Action
fa7f05e47b chore: update image tag to e2a36da [skip ci] 2026-02-12 20:34:35 +00:00
Luis Eduardo Estevao
e2a36da1b8 Merge branch 'main' of https://git.simplifiquehc.com.br/simplifique/Vendaweb-api
All checks were successful
Build (develop) / Promote (main) / build-and-push-deploy (push) Successful in 1m22s
2026-02-12 12:59:14 -03:00
Luis Eduardo Estevao
7785f0d0b0 feat: implement sales service with product retrieval and filtering capabilities 2026-02-12 12:59:08 -03:00
Gitea Action
caba86fe3a chore: update image tag to 03519ae [skip ci] 2026-02-11 18:35:37 +00:00
Luis Eduardo Estevao
03519ae299 Merge branch 'main' of https://git.simplifiquehc.com.br/simplifique/Vendaweb-api
All checks were successful
Build (develop) / Promote (main) / build-and-push-deploy (push) Successful in 1m24s
2026-02-11 15:28:13 -03:00
Luis Eduardo Estevao
33f0271a0e feat: implement order creation and cancellation functionality with new entities for city, sales order items, and temporary order items. 2026-02-11 15:28:05 -03:00
Gitea Action
bd47e51262 chore: update image tag to f0ef3dd [skip ci] 2026-02-11 13:52:19 +00:00
Luis Eduardo Estevao
f0ef3dd21c feat: Add new sales and shopping cart management module.
All checks were successful
Build (develop) / Promote (main) / build-and-push-deploy (push) Successful in 1m45s
2026-02-11 10:49:17 -03:00
Gitea Action
f2b2572a35 chore: update image tag to e5dc346 [skip ci] 2026-01-29 23:02:51 +00:00
e5dc346b96 fix: persist shipping fee and refresh k8s docs
All checks were successful
Build (develop) / Promote (main) / build-and-push-deploy (push) Successful in 1m14s
2026-01-29 19:54:47 -03:00
Gitea Action
16882046cf chore: update image tag to fd17be5 [skip ci] 2026-01-29 18:23:08 +00:00
fd17be5408 fix: harden GitOps deploy and rollback
All checks were successful
Build (develop) / Promote (main) / build-and-push-deploy (push) Successful in 1m22s
2026-01-29 15:21:09 -03:00
Gitea Action
ecd298442b chore: update image tag to 589fa29 [skip ci] 2026-01-29 17:59:46 +00:00
589fa2913c fix: correct pipeline to update k8s manifest
All checks were successful
Build (develop) / Promote (main) / build-and-push-deploy (push) Successful in 1m21s
2026-01-29 14:58:20 -03:00
587d097d9b ci: restrict workflow triggers to main branch only
Some checks failed
Build (develop) / Promote (main) / build-and-push-deploy (push) Failing after 1m15s
2026-01-29 14:52:27 -03:00
a694af97c6 feat: add app controller with version and health check endpoints
All checks were successful
Build (develop) / Promote (main) / build-and-push-deploy (push) Successful in 1m33s
2026-01-29 14:48:57 -03:00
6523c5f520 feat: Add API endpoints for application version and health checks.
All checks were successful
Build (develop) / Promote (main) / build-and-push-deploy (push) Successful in 1m21s
2026-01-29 14:31:33 -03:00
0c09ee795e feat: migrate registry to gitea and simplify workflow
All checks were successful
Build (develop) / Promote (main) / build-and-push-deploy (push) Successful in 1m24s
2026-01-29 14:23:24 -03:00
09396e334d feat: migrate registry to gitea and simplify workflow
All checks were successful
Build (develop) / Promote (main) / build-and-push-deploy (push) Successful in 1m25s
2026-01-29 14:20:09 -03:00
605d68b4b0 feat: migrate registry to gitea and simplify workflow
All checks were successful
Build (develop) / Promote (main) / build-and-push-deploy (push) Successful in 7m16s
2026-01-29 14:06:35 -03:00
c707d4a065 feat: migrate registry to gitea and simplify workflow
Some checks failed
Build (develop) / Promote (main) / build-and-push-deploy (push) Has been cancelled
2026-01-29 13:50:01 -03:00
0b28379145 feat: migrate registry to gitea and simplify workflow
Some checks failed
Build (develop) / Promote (main) / build-and-push-deploy (push) Failing after 6s
2026-01-29 13:47:26 -03:00
ca43de8756 fix: use harbor domain instead of ip to fix ssl error
Some checks failed
Build (develop) / Promote (main) / build-and-push-deploy (push) Failing after 20s
2026-01-29 13:31:20 -03:00
bb21ca33e4 fix: update registry url to oci.simplifiquehc.com.br
Some checks failed
Build (develop) / Promote (main) / build-and-push-deploy (push) Failing after 22s
2026-01-29 13:26:13 -03:00
48d6e64ada fix: update registry url to oci.simplifiquehc.com.br
Some checks failed
Build (develop) / Promote (main) / build-and-push-deploy (push) Failing after 24s
2026-01-29 13:24:58 -03:00
e0731db836 fix: update registry url to oci.simplifiquehc.com.br
Some checks failed
Build (develop) / Promote (main) / build-and-push-deploy (push) Failing after 34s
2026-01-29 13:17:15 -03:00
d2265390bd chore: organize project and update service
Some checks failed
Build (develop) / Promote (main) / build-and-push-deploy (push) Failing after 23s
2026-01-29 12:55:15 -03:00
a34c7c415c fix: update workflow to support homolog branch
Some checks failed
Build (develop) / Promote (main) / build-and-push-deploy (push) Failing after 25s
2026-01-29 12:50:47 -03:00
24 changed files with 718 additions and 623 deletions

View File

@@ -1,7 +1,7 @@
name: Build (develop) / Promote (main) name: Build (develop) / Promote (main)
on: on:
push: push:
branches: [main, develop, homolog] branches: [main]
jobs: jobs:
build-and-push-deploy: build-and-push-deploy:
@@ -12,109 +12,30 @@ jobs:
with: with:
fetch-depth: 0 fetch-depth: 0
- name: Free disk space - name: Build and Push
run: | run: |
df -h REGISTRY="172.35.0.216:3000"
sudo rm -rf /usr/share/dotnet /usr/local/lib/android /opt/ghc || true IMAGE_NAME="$REGISTRY/simplifique/vendaweb-api"
sudo apt-get clean || true SHA_TAG=$(echo ${{ gitea.sha }} | cut -c1-7)
docker system prune -af --volumes || true
df -h echo "${{ secrets.K8S }}" | docker login "$REGISTRY" -u "${{ gitea.actor }}" --password-stdin
- name: Build (develop) / Promote (main)
env: docker build -t "$IMAGE_NAME:$SHA_TAG" -t "$IMAGE_NAME:latest" .
REGISTRY: harbor.jurunense.com docker push "$IMAGE_NAME:$SHA_TAG"
DEV_PROJECT: vendaweb-dev docker push "$IMAGE_NAME:latest"
PROD_PROJECT: vendaweb-prod
IMAGE_REPO: vendaweb-api - name: Update Manifest and Push to Git
PROMOTE_LEGACY: 'false'
HARBOR_USERNAME: ${{ secrets.HARBOR_USERNAME }}
HARBOR_PASSWORD: ${{ secrets.HARBOR_PASSWORD }}
HARBOR_DEV_USERNAME: ${{ secrets.HARBOR_DEV_USERNAME }}
HARBOR_DEV_PASSWORD: ${{ secrets.HARBOR_DEV_PASSWORD }}
HARBOR_PROD_USERNAME: ${{ secrets.HARBOR_PROD_USERNAME }}
HARBOR_PROD_PASSWORD: ${{ secrets.HARBOR_PROD_PASSWORD }}
HARBOR_LEGACY_USERNAME: ${{ secrets.HARBOR_LEGACY_USERNAME }}
HARBOR_LEGACY_PASSWORD: ${{ secrets.HARBOR_LEGACY_PASSWORD }}
run: | run: |
set -euo pipefail SHA_TAG=$(echo ${{ gitea.sha }} | cut -c1-7)
IMAGE_NAME="172.35.0.216:3000/simplifique/vendaweb-api"
BRANCH="${GITHUB_REF_NAME:-${GITEA_REF_NAME:-}}" MANIFEST_FILE="k8s/overlays/prod/deployment-image-digest-patch.yaml"
if [ -z "$BRANCH" ] && [ -n "${GITHUB_REF:-}" ]; then
BRANCH="${GITHUB_REF#refs/heads/}"
fi
DEV_IMAGE="$REGISTRY/$DEV_PROJECT/$IMAGE_REPO" sed -i "s|image: $IMAGE_NAME:.*|image: $IMAGE_NAME:$SHA_TAG|g" "$MANIFEST_FILE"
PROD_IMAGE="$REGISTRY/$PROD_PROJECT/$IMAGE_REPO"
LEGACY_IMAGE="$REGISTRY/library/$IMAGE_REPO"
DEV_USER="${HARBOR_DEV_USERNAME:-$HARBOR_USERNAME}" git config user.name "Gitea Action"
DEV_PASS="${HARBOR_DEV_PASSWORD:-$HARBOR_PASSWORD}" git config user.email "actions@simplifiquehc.com.br"
PROD_USER="${HARBOR_PROD_USERNAME:-$HARBOR_USERNAME}"
PROD_PASS="${HARBOR_PROD_PASSWORD:-$HARBOR_PASSWORD}"
LEGACY_USER="${HARBOR_LEGACY_USERNAME:-$PROD_USER}"
LEGACY_PASS="${HARBOR_LEGACY_PASSWORD:-$PROD_PASS}"
if [ "$BRANCH" = "develop" ]; then git add "$MANIFEST_FILE"
TAG=$(echo ${{ gitea.sha }} | cut -c1-7) git commit -m "chore: update image tag to $SHA_TAG [skip ci]"
git push origin main
echo "$DEV_PASS" | docker login "$REGISTRY" -u "$DEV_USER" --password-stdin
docker build -t "$DEV_IMAGE:$TAG" -f ./Dockerfile .
docker push "$DEV_IMAGE:$TAG"
docker tag "$DEV_IMAGE:$TAG" "$DEV_IMAGE:develop"
docker push "$DEV_IMAGE:develop"
exit 0
fi
if [ "$BRANCH" = "main" ]; then
sudo apt-get update -y
sudo apt-get install -y skopeo
if [ -z "${DEV_USER:-}" ] || [ -z "${DEV_PASS:-}" ]; then
echo "Missing Harbor DEV credentials (HARBOR_DEV_USERNAME/HARBOR_DEV_PASSWORD or HARBOR_USERNAME/HARBOR_PASSWORD)." >&2
exit 1
fi
if [ -z "${PROD_USER:-}" ] || [ -z "${PROD_PASS:-}" ]; then
echo "Missing Harbor PROD credentials (HARBOR_PROD_USERNAME/HARBOR_PROD_PASSWORD or HARBOR_USERNAME/HARBOR_PASSWORD)." >&2
exit 1
fi
# Merge commit: HEAD has 2 parents; HEAD^2 is the merged branch tip.
PARENTS="$(git rev-list --parents -n 1 HEAD)"
set -- $PARENTS
SOURCE_SHA="${3:-${1:-}}"
if [ -z "$SOURCE_SHA" ]; then
SOURCE_SHA="${{ gitea.sha }}"
fi
TAG="$(echo "$SOURCE_SHA" | cut -c1-7)"
# Promote the exact artifact built on develop into prod (no rebuild).
skopeo inspect --creds "$DEV_USER:$DEV_PASS" "docker://$DEV_IMAGE:$TAG" >/dev/null
# Validate destination repository exists and auth works.
# Using list-tags avoids assuming a specific tag exists.
skopeo list-tags --creds "$PROD_USER:$PROD_PASS" "docker://$PROD_IMAGE" >/dev/null
skopeo copy --all \
--src-creds "$DEV_USER:$DEV_PASS" \
--dest-creds "$PROD_USER:$PROD_PASS" \
"docker://$DEV_IMAGE:$TAG" \
"docker://$PROD_IMAGE:$TAG"
# Optional: keep legacy tags working during migration.
if [ "${PROMOTE_LEGACY:-false}" = "true" ]; then
skopeo copy --all \
--src-creds "$DEV_USER:$DEV_PASS" \
--dest-creds "$LEGACY_USER:$LEGACY_PASS" \
"docker://$DEV_IMAGE:$TAG" \
"docker://$LEGACY_IMAGE:$TAG"
skopeo copy --all \
--src-creds "$DEV_USER:$DEV_PASS" \
--dest-creds "$LEGACY_USER:$LEGACY_PASS" \
"docker://$DEV_IMAGE:$TAG" \
"docker://$LEGACY_IMAGE:latest"
fi
exit 0
fi
echo "Unsupported branch: $BRANCH" >&2
exit 1

View File

@@ -1,39 +1,55 @@
# Estágio 1: Build ARG NODE_VERSION=16.20
FROM node:16-bullseye-slim AS builder ARG DEBIAN_VARIANT=bullseye
FROM node:${NODE_VERSION}-${DEBIAN_VARIANT} AS builder
WORKDIR /app WORKDIR /app
COPY package*.json ./
RUN npm install --legacy-peer-deps
COPY . .
RUN npm run build
FROM node:16-bullseye-slim ARG INSTANTCLIENT_ZIP_URL=https://download.oracle.com/otn_software/linux/instantclient/instantclient-basiclite-linuxx64.zip
# Instalar dependências do Oracle RUN apt-get update \
RUN apt-get update && apt-get install -y \ && apt-get install -y --no-install-recommends ca-certificates wget unzip libaio1 libnsl2 \
libaio1 \ && rm -rf /var/lib/apt/lists/* \
unzip \ && mkdir -p /opt/oracle \
wget \ && wget -q "${INSTANTCLIENT_ZIP_URL}" -O /opt/oracle/instantclient.zip \
&& mkdir -p /opt/oracle && 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 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 WORKDIR /app
# Copiar apenas o necessário do estágio anterior ENV NODE_ENV=production
COPY --from=builder /app/dist ./dist 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/package*.json ./
COPY --from=builder /app/node_modules ./node_modules COPY --from=builder /app/node_modules ./node_modules
COPY --from=builder /app/dist ./dist
# Variáveis de ambiente padrão para o driver oracledb EXPOSE 8065
ENV OCI_LIB_DIR=/opt/oracle/instantclient
ENV OCI_INC_DIR=/opt/oracle/instantclient/sdk/include
CMD ["npm", "run", "start:prod"] CMD ["node", "dist/main"]

View File

@@ -1,76 +0,0 @@
# 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.

View File

@@ -14,7 +14,7 @@ Os workflows estão definidos no diretório `.gitea/workflows/`. O principal wor
Este workflow é acionado automaticamente no evento: Este workflow é acionado automaticamente no evento:
- `push`: Em qualquer branch (configuração atual `on: [push]`). - `push`: Na branch `main`.
### Jobs ### Jobs
@@ -39,10 +39,13 @@ Este job é responsável por construir a imagem Docker e enviá-la para o regist
3. **Build e Push** 3. **Build e Push**
- Constrói a imagem Docker da aplicação. - Constrói a imagem Docker da aplicação.
- Tags geradas: - Tags geradas:
- `172.35.0.216/library/vendaweb-api:$TAG` (onde `$TAG` é o SHA do commit do Gitea `gitea.sha`) - `git.simplifiquehc.com.br/simplifique/vendaweb-api:$TAG` (onde `$TAG` é o SHA curto do commit)
- `172.35.0.216/library/vendaweb-api:latest` - `git.simplifiquehc.com.br/simplifique/vendaweb-api:latest`
- Envia ambas as tags para o registry. - Envia ambas as tags para o registry.
4. **Atualizar Manifest e Push no Git**
- Atualiza `k8s/overlays/prod/deployment-image-digest-patch.yaml` para apontar para a tag `$TAG`.
## Variáveis e Segredos (Secrets) ## 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: Para que o workflow funcione corretamente, as seguintes secrets devem estar configuradas nas configurações do repositório no Gitea:

156
k8s/README.md Normal file
View File

@@ -0,0 +1,156 @@
# Kubernetes Infra (k8s) - vendaweb-api
Este diretorio contem os manifests Kubernetes do `vendaweb-api` usando Kustomize (base + overlays).
## Visao geral
- App: `vendaweb-api` (Deployment + Service)
- Porta HTTP do container/Service: `8067`
- Healthcheck usado pelos probes: `GET /v1/health`
- Config via `ConfigMap` + `Secret` (injetados com `envFrom`)
- Overlay prod:
- Namespace: `vendaweb-prod`
- Service: `NodePort` (porta externa `30001`)
- Replicas: `15`
## Estrutura
- `k8s/base/`
- `deployment.yaml`: deployment padrao (replicas 3), porta 8067, probes `/v1/health`, `imagePullSecrets: gitea-auth`
- `service.yaml`: `ClusterIP` expondo 8067
- `configmap.yaml`: variaveis nao sensiveis (ex.: Redis/DB host/port)
- `secret.yaml`: variaveis sensiveis (ex.: usuario/senha do DB)
- `kustomization.yaml`: agrega os recursos do base
- `k8s/overlays/prod/`
- `kustomization.yaml`: aplica patches e define `namespace: vendaweb-prod`
- `service-patch.yaml`: muda Service para `NodePort` e fixa `nodePort: 30001`
- `deployment-prod-patch.yaml`: ajusta `replicas: 15`
- `deployment-image-digest-patch.yaml`: sobrescreve a `image:` do container
- `k8s/argocd/application-prod.yaml`
- Aplica o overlay `k8s/overlays/prod` via Argo CD
- Sync automatizado com `selfHeal` e `prune`
## Portas e acesso
- Dentro do cluster: Service `vendaweb-api:8067`
- Overlay prod (NodePort): porta externa `30001` (mapeia para `8067`)
Notas:
- O processo Node/Nest escuta em `8067` (ver `src/main.ts`).
- A variavel `PORT` em `.env` nao e usada pelo bootstrap atual; o k8s esta configurado para 8067.
## Deploy com kubectl/kustomize
Gerar o YAML final (sem aplicar):
```bash
kubectl kustomize k8s/overlays/prod
```
Aplicar o overlay prod:
```bash
kubectl apply -k k8s/overlays/prod
```
Validar o que sera aplicado (dry-run):
```bash
kubectl apply -k k8s/overlays/prod --dry-run=server
```
Ver diffs (se seu kubectl suportar):
```bash
kubectl diff -k k8s/overlays/prod
```
## Argo CD (prod)
O Argo CD esta configurado em `k8s/argocd/application-prod.yaml` para:
- `path: k8s/overlays/prod`
- `targetRevision: main`
- `destination.namespace: vendaweb-prod` (com `CreateNamespace=true`)
Se voce esta usando Argo CD, o fluxo recomendado e:
- atualizar manifests no Git (overlay prod)
- deixar o Argo CD sincronizar automaticamente
## Configuracao (ConfigMap/Secret)
- `k8s/base/configmap.yaml` (`vendaweb-api-config`)
- `REDIS_HOST`, `REDIS_PORT`, `DB_HOST`, `DB_PORT`, `DB_SERVICE_NAME`
- `k8s/base/secret.yaml` (`vendaweb-api-secrets`)
- `DB_USERNAME`, `DB_PASSWORD`
Importante:
- O `Secret` esta em `stringData` no repositorio (texto puro). Para ambiente real, prefira um gerenciador de segredos (ExternalSecrets, SOPS, Vault etc.) e nao commite credenciais.
## Imagem e pipeline
O workflow `.gitea/workflows/deploy-api.yaml`:
- builda e publica `git.simplifiquehc.com.br/simplifique/vendaweb-api:<sha7>` e `:latest`
- atualiza `k8s/overlays/prod/deployment-image-digest-patch.yaml` para apontar para o tag do commit
Isso e pensado para o Argo CD detectar a alteracao no Git e aplicar.
## Comandos uteis (day-2)
Assumindo namespace `vendaweb-prod`:
```bash
kubectl -n vendaweb-prod get all
kubectl -n vendaweb-prod get pods -l app=vendaweb-api -o wide
kubectl -n vendaweb-prod describe deploy/vendaweb-api
kubectl -n vendaweb-prod describe pod -l app=vendaweb-api
```
Logs:
```bash
kubectl -n vendaweb-prod logs deploy/vendaweb-api --tail=200
kubectl -n vendaweb-prod logs -l app=vendaweb-api --tail=200 --all-containers
kubectl -n vendaweb-prod logs -l app=vendaweb-api -f
```
Rollout:
```bash
kubectl -n vendaweb-prod rollout status deploy/vendaweb-api
kubectl -n vendaweb-prod rollout history deploy/vendaweb-api
kubectl -n vendaweb-prod rollout restart deploy/vendaweb-api
```
Exec/Debug:
```bash
kubectl -n vendaweb-prod exec -it deploy/vendaweb-api -- sh
kubectl -n vendaweb-prod port-forward svc/vendaweb-api 8067:8067
```
## Troubleshooting rapido
- `ImagePullBackOff`:
- conferir `imagePullSecrets: gitea-auth` no namespace (`kubectl -n vendaweb-prod get secret gitea-auth`)
- conferir o valor de `image:` no overlay prod
- `CrashLoopBackOff`:
- ver logs do pod e eventos (`kubectl -n vendaweb-prod describe pod ...`)
- validar variaveis do `ConfigMap`/`Secret`
- Probes falhando:
- garantir que a rota `/v1/health` responde 200 e que a app esta ouvindo em `8067`
## Mudancas comuns
- Alterar porta externa (NodePort): `k8s/overlays/prod/service-patch.yaml`
- Alterar replicas em prod: `k8s/overlays/prod/deployment-prod-patch.yaml`
- Alterar imagem/tag em prod: `k8s/overlays/prod/deployment-image-digest-patch.yaml`
- Alterar envs: `k8s/base/configmap.yaml` e `k8s/base/secret.yaml`

View File

@@ -6,14 +6,22 @@ metadata:
spec: spec:
project: default project: default
source: source:
repoURL: https://git.simplifiquehc.com.br/simplifique/Vendaweb-api.git repoURL: http://172.35.0.216:3000/simplifique/Vendaweb-api.git
targetRevision: main targetRevision: main
path: k8s/overlays/prod path: k8s/overlays/prod
destination: destination:
server: https://kubernetes.default.svc server: https://kubernetes.default.svc
namespace: vendaweb-api namespace: vendaweb-prod
syncPolicy: syncPolicy:
automated: automated:
selfHeal: true selfHeal: true
prune: true
retry:
limit: 2
backoff:
duration: 5s
factor: 2
maxDuration: 3m
syncOptions: syncOptions:
- CreateNamespace=true - CreateNamespace=true
- PruneLast=true

View File

@@ -5,7 +5,15 @@ metadata:
labels: labels:
app: vendaweb-api app: vendaweb-api
spec: spec:
replicas: 15 replicas: 3
revisionHistoryLimit: 5
minReadySeconds: 10
progressDeadlineSeconds: 600
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
maxUnavailable: 0
selector: selector:
matchLabels: matchLabels:
app: vendaweb-api app: vendaweb-api
@@ -15,10 +23,11 @@ spec:
app: vendaweb-api app: vendaweb-api
spec: spec:
imagePullSecrets: imagePullSecrets:
- name: harbor-secret - name: gitea-auth
terminationGracePeriodSeconds: 30
containers: containers:
- name: api - name: api
image: 172.35.0.216/library/vendaweb-api:latest image: 172.35.0.216:3000/simplifique/vendaweb-api:589fa29
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
ports: ports:
- name: http - name: http

View File

@@ -7,4 +7,4 @@ spec:
spec: spec:
containers: containers:
- name: api - name: api
image: 172.35.0.216/library/vendaweb-api@sha256:aac490fcb4ef7baa95f1df01fa50d2d44bdb4ed12b235e5dd89e1d7dc3cd0a3a image: 172.35.0.216:3000/simplifique/vendaweb-api:90f2c2e

View File

@@ -0,0 +1,6 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: vendaweb-api
spec:
replicas: 15

View File

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

View File

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

View File

@@ -44,9 +44,9 @@ export class ListsController {
/** /**
* Consulta tabela de plano de pagamento para pedido de venda * Consulta tabela de plano de pagamento para pedido de venda
*/ */
@Get('paymentplan/:billindid') @Get('paymentplan/:billindid/:customerId')
async getPaymentPlan(@Param('billindid') billingId: string) { async getPaymentPlan(@Param('billindid') billingId: string, @Param('customerId') customerId: string) {
return this.listsServices.GetPaymentPlan(billingId); return this.listsServices.GetPaymentPlan(billingId, customerId);
} }
/** /**

View File

@@ -102,20 +102,24 @@ export class ListsService {
} }
} }
async GetPaymentPlan(billingId: string){ async GetPaymentPlan(billingId: string, clientId: string) {
const connection = new Connection(connectionOptions); const connection = new Connection(connectionOptions);
await connection.connect(); await connection.connect();
const queryRunner = connection.createQueryRunner(); const queryRunner = connection.createQueryRunner();
await queryRunner.connect(); await queryRunner.connect();
try { try {
const sql = ' SELECT PCPLPAG.CODPLPAG as "codplpag", PCPLPAG.DESCRICAO as "descricao", ' + const sql = `SELECT PCPLPAG.CODPLPAG as "codplpag", PCPLPAG.DESCRICAO as "descricao",
' NVL(PCPLPAG.NUMDIAS,0) as "numdias" ' + NVL(PCPLPAG.NUMDIAS,0) as "numdias"
' FROM PCPLPAG ' + FROM PCPLPAG, PCCLIENT, PCPLPAG PLANO_CLI
' WHERE EXISTS(SELECT PCCOBPLPAG.CODCOB FROM PCCOBPLPAG ' + WHERE PCCLIENT.CODCLI = :CODCLI
' WHERE PCCOBPLPAG.CODPLPAG = PCPLPAG.CODPLPAG ' + AND PCCLIENT.CODPLPAG = PLANO_CLI.CODPLPAG (+)
' AND PCCOBPLPAG.CODCOB = :CODCOB ) ' AND PCPLPAG.NUMDIAS <= NVL(PLANO_CLI.NUMDIAS,9999)
' ORDER BY PCPAG.DESCRICAO '; AND EXISTS(SELECT PCCOBPLPAG.CODCOB FROM PCCOBPLPAG
const paymentPlans = await queryRunner.query(sql, [billingId]); WHERE PCCOBPLPAG.CODPLPAG = PCPLPAG.CODPLPAG
AND PCCOBPLPAG.CODCOB = :CODCOB )
ORDER BY PCPLPAG.DESCRICAO`;
const paymentPlans = await queryRunner.query(sql, [clientId, billingId]);
return paymentPlans; return paymentPlans;
} catch (error) { } catch (error) {
throw error; throw error;
@@ -135,7 +139,7 @@ export class ListsService {
' FROM PCCOB ' + ' FROM PCCOB ' +
' WHERE NVL(PCCOB.enviacobrancafv, \'N\') = \'S\' ' + ' WHERE NVL(PCCOB.enviacobrancafv, \'N\') = \'S\' ' +
' AND ( ( NOT EXISTS(SELECT PCCOBCLI.CODCOB FROM PCCOBCLI WHERE PCCOBCLI.CODCLI = :CODCLI ) AND ' + ' AND ( ( NOT EXISTS(SELECT PCCOBCLI.CODCOB FROM PCCOBCLI WHERE PCCOBCLI.CODCLI = :CODCLI ) AND ' +
' ( PCCOB.NIVELVENDA <= ( SELECT C.NIVELVENDA FROM PCCLIENT, PCCOB C ' + ' ( PCCOB.NIVELVENDA >= ( SELECT C.NIVELVENDA FROM PCCLIENT, PCCOB C ' +
' WHERE PCCLIENT.CODCLI = :CODCLI AND PCCLIENT.CODCOB = C.CODCOB ) ) ) OR ' + ' WHERE PCCLIENT.CODCLI = :CODCLI AND PCCLIENT.CODCOB = C.CODCOB ) ) ) OR ' +
' EXISTS(SELECT PCCOBCLI.CODCOB FROM PCCOBCLI WHERE PCCOBCLI.CODCLI = :CODCLI AND PCCOBCLI.CODCOB = PCCOB.CODCOB ) ) ' + ' EXISTS(SELECT PCCOBCLI.CODCOB FROM PCCOBCLI WHERE PCCOBCLI.CODCLI = :CODCLI AND PCCOBCLI.CODCOB = PCCOB.CODCOB ) ) ' +
' ORDER BY PCCOB.CODCOB'; ' ORDER BY PCCOB.CODCOB';

View File

@@ -169,13 +169,13 @@ export class ShippingService {
const sql = `SELECT PCDIASUTEIS.DATA as "dateDelivery", const sql = `SELECT PCDIASUTEIS.DATA as "dateDelivery",
NVL (PCDIASUTEIS.DIAROTA, 'N') as "delivery", NVL (PCDIASUTEIS.DIAROTA, 'N') as "delivery",
CASE WHEN NVL (PCDIASUTEIS.DIAROTA, 'N') = 'N' THEN 0 CASE WHEN NVL (PCDIASUTEIS.DIAROTA, 'N') = 'N' THEN 0
ELSE (PARAMFILIAL.OBTERCOMONUMBER ('CAPACIDADE_LOGISTICA', 12)) END as "deliverySize", ELSE (PARAMFILIAL.OBTERCOMONUMBER ('CAPACIDADE_LOGISTICA', 1)) END as "deliverySize",
ROUND ( (NVL (VENDAS.TOTPESO, 0) / 1000), 3) as "saleWeigth", ROUND ( (NVL (VENDAS.TOTPESO, 0) / 1000), 3) as "saleWeigth",
CASE WHEN NVL (PCDIASUTEIS.DIAROTA, 'N') = 'N' THEN 0 CASE WHEN NVL (PCDIASUTEIS.DIAROTA, 'N') = 'N' THEN 0
ELSE ROUND ( ELSE ROUND (
GREATEST ( GREATEST (
( ( PARAMFILIAL.OBTERCOMONUMBER ('CAPACIDADE_LOGISTICA', ( ( PARAMFILIAL.OBTERCOMONUMBER ('CAPACIDADE_LOGISTICA',
12) 1)
* 1000) * 1000)
- NVL (VENDAS.TOTPESO, 0)) - NVL (VENDAS.TOTPESO, 0))
/ 1000, / 1000,
@@ -186,7 +186,9 @@ export class ShippingService {
FROM PCPEDC FROM PCPEDC
WHERE PCPEDC.POSICAO IN ('L', 'M') WHERE PCPEDC.POSICAO IN ('L', 'M')
AND PCPEDC.CONDVENDA = 8 AND PCPEDC.CONDVENDA = 8
AND PCPEDC.CODFILIAL IN (12, 13, 4, 6) AND EXISTS(SELECT 1 FROM PCPEDI
WHERE PCPEDI.NUMPED = PCPEDC.NUMPED
AND PCPEDI.CODFILIALRETIRA IN (1) )
AND EXISTS AND EXISTS
(SELECT TV7.NUMPED (SELECT TV7.NUMPED
FROM PCPEDC TV7 FROM PCPEDC TV7
@@ -194,15 +196,15 @@ export class ShippingService {
AND TV7.POSICAO = 'F') AND TV7.POSICAO = 'F')
AND PCPEDC.DTENTREGA >= TRUNC (SYSDATE) + 3 AND PCPEDC.DTENTREGA >= TRUNC (SYSDATE) + 3
GROUP BY PCPEDC.DTENTREGA) VENDAS GROUP BY PCPEDC.DTENTREGA) VENDAS
WHERE PCDIASUTEIS.CODFILIAL = 12 AND PCDIASUTEIS.DATA BETWEEN TRUNC (SYSDATE) + 3 AND TRUNC(SYSDATE) + 20 --AND NVL(PCDIASUTEIS.DIAROTA,'N') = 'S' WHERE PCDIASUTEIS.CODFILIAL = 1 AND PCDIASUTEIS.DATA BETWEEN TRUNC (SYSDATE) + 3 AND TRUNC(SYSDATE) + 20 --AND NVL(PCDIASUTEIS.DIAROTA,'N') = 'S'
AND PCDIASUTEIS.DATA = VENDAS.DTENTREGA(+) AND PCDIASUTEIS.DATA = VENDAS.DTENTREGA(+)
ORDER BY PCDIASUTEIS.DATA `; ORDER BY PCDIASUTEIS.DATA `;
const data = await queryRunner.query(sql); const data = await queryRunner.query(sql);
const sqlDeliveryDate = `SELECT TRUNC(SYSDATE) + esf_calcular_prazo_entrega_programada(TRUNC(SYSDATE), const sqlDeliveryDate = `SELECT TRUNC(SYSDATE) + esf_calcular_prazo_entrega_programada(TRUNC(SYSDATE),
'12', '1',
129, '', 0, 500) as "date" 169, '', 0, 500) as "date"
FROM DUAL`; FROM DUAL`;
const dataDeliveryDate = await queryRunner.query(sqlDeliveryDate); const dataDeliveryDate = await queryRunner.query(sqlDeliveryDate);

View File

@@ -26,9 +26,6 @@ export class Pccidade {
@Column({ name: 'CODMUNSIAFI' }) @Column({ name: 'CODMUNSIAFI' })
codmunsiafi: number; codmunsiafi: number;
@Column({ name: 'DTMXSALTER' })
dtmxsalter: Date;
@Column({ name: 'LATITUDE' }) @Column({ name: 'LATITUDE' })
latitude: string; latitude: string;

View File

@@ -89,7 +89,4 @@ export class Pcorcavendai {
@Column({ name: 'AMBIENTE' }) @Column({ name: 'AMBIENTE' })
ambiente: string; ambiente: string;
@Column({name: 'RETIRAPOSTERIOR_IMEDIATA'})
rp_imediata: string;
} }

View File

@@ -162,8 +162,6 @@ codfilial: string;
@Column({ name: 'CODCLIPARTILHA' }) @Column({ name: 'CODCLIPARTILHA' })
codclipartilha: number; codclipartilha: number;
@Column({name: 'RETIRAPOSTERIOR_IMEDIATA'})
rp_imediata: string;
} }

View File

@@ -6,20 +6,25 @@ import 'reflect-metadata';
import { CustomLoggerService } from './services/custom-logger.service'; import { CustomLoggerService } from './services/custom-logger.service';
async function bootstrap() { async function bootstrap() {
const app = await NestFactory.create(AppModule, { cors: true, logger: new CustomLoggerService()}); const app = await NestFactory.create(AppModule, {
cors: true,
logger: new CustomLoggerService(),
});
app.enableCors(); app.enableCors();
app.use(compression()); app.use(compression());
const options = new DocumentBuilder() const options = new DocumentBuilder()
.setTitle('API Venda web') .setTitle('API Venda web')
.setDescription(`API criada para realizar todo processo da venda assistida, como criação de oraçamento de venda, pedido de venda .setDescription(
`API criada para realizar todo processo da venda assistida, como criação de oraçamento de venda, pedido de venda
cadastro de novos clientes, novos endereços. A API também fornece dados para o portal de parceiros como a manutenção cadastro de novos clientes, novos endereços. A API também fornece dados para o portal de parceiros como a manutenção
do cadastro de parceiros, consulta de venda de movimentação e pagamentos, e fechamento das comissões dos parceiros.`) 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") .setVersion('2023.1.2')
.addTag("Auth") .addTag('VendaWeb')
.addTag('Auth')
.build(); .build();
const document = SwaggerModule.createDocument(app, options); const document = SwaggerModule.createDocument(app, options);
SwaggerModule.setup("docs", app, document); SwaggerModule.setup('docs', app, document);
await app.listen(8066); await app.listen(8067);
} }
bootstrap(); bootstrap();

View File

@@ -469,9 +469,9 @@ export class CustomerService {
async InitializeCustomer() { async InitializeCustomer() {
const cliente = new Pcclient(); const cliente = new Pcclient();
cliente.codusur1 = 1; cliente.codusur1 = 1;
cliente.codplpag = 10; cliente.codplpag = 18;
cliente.codpraca = 119; cliente.codpraca = 169;
cliente.codcob = "D"; cliente.codcob = "CAR";
cliente.dtcadastro = new Date(); cliente.dtcadastro = new Date();
cliente.codcontab = "1"; cliente.codcontab = "1";
cliente.aceitavendafracao = "N"; cliente.aceitavendafracao = "N";
@@ -502,7 +502,7 @@ export class CustomerService {
cliente.tv10usacustoproduto = "N"; cliente.tv10usacustoproduto = "N";
cliente.inscestadual = "ISENTO"; cliente.inscestadual = "ISENTO";
cliente.codpais = 1058; //Brasil cliente.codpais = 1058; //Brasil
cliente.observacao = "Importado do E-Commerce"; cliente.observacao = "Cadastrado Venda Web";
cliente.aceitachterceiros = "S"; cliente.aceitachterceiros = "S";
cliente.agregarvalorstdescfin = "N"; cliente.agregarvalorstdescfin = "N";
cliente.anvisa = "N"; cliente.anvisa = "N";

View File

@@ -527,6 +527,7 @@ export class OrderService {
preOrder.esc_ajustarfinanceiro = "N"; preOrder.esc_ajustarfinanceiro = "N";
preOrder.esc_obternsu = "N"; preOrder.esc_obternsu = "N";
preOrder.esc_vloutrasdespweb = 0; preOrder.esc_vloutrasdespweb = 0;
preOrder.vloutrasdesp = cart.shippingValue;
preOrder.pedidopagoecommerce = "S"; preOrder.pedidopagoecommerce = "S";
preOrder.numpedmktplace = ""; preOrder.numpedmktplace = "";
preOrder.numitens = cart.itens.length; preOrder.numitens = cart.itens.length;
@@ -585,7 +586,7 @@ export class OrderService {
itemOrder.codauxiliar = componente.ean; itemOrder.codauxiliar = componente.ean;
itemOrder.codfilialretira = item.idStock; itemOrder.codfilialretira = item.idStock;
itemOrder.tipoentrega = (item.deliveryMethod == 'RA') ? "RP" : item.deliveryMethod; itemOrder.tipoentrega = (item.deliveryMethod == 'RA') ? "RP" : item.deliveryMethod;
itemOrder.rp_imediata = (item.deliveryMethod == 'RA') ? "S" : "N"; // itemOrder.rp_imediata = (item.deliveryMethod == 'RA') ? "S" : "N";
if (item.deliveryMethod == 'RA') { if (item.deliveryMethod == 'RA') {
preOrder.dtentrega = new Date(); preOrder.dtentrega = new Date();
} }
@@ -618,7 +619,7 @@ export class OrderService {
itemOrder.codauxiliar = item.ean; itemOrder.codauxiliar = item.ean;
itemOrder.codfilialretira = item.idStock; itemOrder.codfilialretira = item.idStock;
itemOrder.tipoentrega = (item.deliveryMethod == 'RA') ? "RP" : item.deliveryMethod; itemOrder.tipoentrega = (item.deliveryMethod == 'RA') ? "RP" : item.deliveryMethod;
itemOrder.rp_imediata = (item.deliveryMethod == 'RA') ? "S" : "N"; //itemOrder.rp_imediata = (item.deliveryMethod == 'RA') ? "S" : "N";
if (item.deliveryMethod == 'RA') { if (item.deliveryMethod == 'RA') {
preOrder.dtentrega = new Date(); preOrder.dtentrega = new Date();
} }
@@ -643,34 +644,34 @@ export class OrderService {
//#endregion //#endregion
if (cart.shippingValue > 0) { // if (cart.shippingValue > 0) {
const itemOrder = new Pcpeditemp(); // const itemOrder = new Pcpeditemp();
itemOrder.tipointegracao = "W"; // itemOrder.tipointegracao = "W";
itemOrder.integradora = 10; // itemOrder.integradora = 10;
itemOrder.numpedrca = idPreOrder; // itemOrder.numpedrca = idPreOrder;
itemOrder.numpedweb = idPreOrder; // itemOrder.numpedweb = idPreOrder;
itemOrder.codcli = cart.idCustomer; // itemOrder.codcli = cart.idCustomer;
itemOrder.codusur = idSellerPreorder; //cart.idSeller; // itemOrder.codusur = idSellerPreorder; //cart.idSeller;
itemOrder.numseq = numeroSeq; // itemOrder.numseq = numeroSeq;
itemOrder.codprod = 48500; // itemOrder.codprod = 48500;
itemOrder.codauxiliar = 48500; // itemOrder.codauxiliar = 48500;
itemOrder.codfilialretira = '12'; // itemOrder.codfilialretira = '12';
itemOrder.tipoentrega = 'EF'; // itemOrder.tipoentrega = 'EF';
itemOrder.ptabela = Number.parseFloat(cart.shippingValue.toString()); // itemOrder.ptabela = Number.parseFloat(cart.shippingValue.toString());
itemOrder.pvenda = Number.parseFloat(cart.shippingValue.toString()); // itemOrder.pvenda = Number.parseFloat(cart.shippingValue.toString());
itemOrder.qt = 1; // itemOrder.qt = 1;
itemOrder.data = new Date(); // itemOrder.data = new Date();
await queryRunner.manager // await queryRunner.manager
.createQueryBuilder() // .createQueryBuilder()
.insert() // .insert()
.into(Pcpeditemp) // .into(Pcpeditemp)
.values(itemOrder) // .values(itemOrder)
.execute(); // .execute();
numeroSeq = numeroSeq + 1; // numeroSeq = numeroSeq + 1;
} // }
// execute some operations on this transaction: // execute some operations on this transaction:
await queryRunner.manager await queryRunner.manager
@@ -953,7 +954,7 @@ export class OrderService {
const partners = await this.listsService.GetPartners(); const partners = await this.listsService.GetPartners();
const address = await this.addressCustomerService.getAddress(order[0].customerId, order[0].addressId); const address = await this.addressCustomerService.getAddress(order[0].customerId, order[0].addressId);
const billing = billinds.find(data => data.codcob === order[0].billindId); const billing = billinds.find(data => data.codcob === order[0].billindId);
const paymentPlans = await this.listsService.GetPaymentPlan(billing.codcob); const paymentPlans = await this.listsService.GetPaymentPlan(billing.codcob, order[0].customerId);
const paymentPlan = paymentPlans.find(data => data.codplpag === order[0].paymentPlanId); const paymentPlan = paymentPlans.find(data => data.codplpag === order[0].paymentPlanId);
const partner = partners.find(data => data.id === order[0].partnerId); const partner = partners.find(data => data.id === order[0].partnerId);

View File

@@ -120,7 +120,7 @@ export class PreOrderService {
itemPreOrder.pvenda1 = 0; itemPreOrder.pvenda1 = 0;
itemPreOrder.tipoentrega = item.deliveryMethod; itemPreOrder.tipoentrega = item.deliveryMethod;
// eslint-disable-next-line @typescript-eslint/camelcase // eslint-disable-next-line @typescript-eslint/camelcase
itemPreOrder.rp_imediata = (item.deliveryMethod == "RA") ? "S" : "N"; // itemPreOrder.rp_imediata = (item.deliveryMethod == "RA") ? "S" : "N";
itemPreOrder.complemento = item.descriptionAux; itemPreOrder.complemento = item.descriptionAux;
itemPreOrder.ambiente = item.environment; itemPreOrder.ambiente = item.environment;
@@ -425,7 +425,7 @@ export class PreOrderService {
} }
// const address = await this.addressCustomerService.getAddress(preOrder[0].customerId, preOrder[0].addressId); // const address = await this.addressCustomerService.getAddress(preOrder[0].customerId, preOrder[0].addressId);
const billing = billinds.find(data => data.codcob === preOrder[0].billindId); const billing = billinds.find(data => data.codcob === preOrder[0].billindId);
const paymentPlans = await this.listsService.GetPaymentPlan((billing !== null && billing !== undefined) ? billing.codcob : '9999'); const paymentPlans = await this.listsService.GetPaymentPlan((billing !== null && billing !== undefined) ? billing.codcob : '9999', preOrder[0].customerId);
const paymentPlan = paymentPlans.find(data => data.codplpag === preOrder[0].paymentPlanId); const paymentPlan = paymentPlans.find(data => data.codplpag === preOrder[0].paymentPlanId);
const partner = partners.find(data => data.id === preOrder[0].partnerId); const partner = partners.find(data => data.id === preOrder[0].partnerId);

View File

@@ -125,7 +125,7 @@ export class SalesService {
.addSelect("\"esvlistaprodutos\".PRODUTO_COM_REDUCAO_PRECO", "downPrice") .addSelect("\"esvlistaprodutos\".PRODUTO_COM_REDUCAO_PRECO", "downPrice")
.addSelect("\"esvlistaprodutos\".PRODUTO_EM_CAMPANHA", "compaing") .addSelect("\"esvlistaprodutos\".PRODUTO_EM_CAMPANHA", "compaing")
.addSelect("\"esvlistaprodutos\".BASETINTOMETRICO", "base") .addSelect("\"esvlistaprodutos\".BASETINTOMETRICO", "base")
.addSelect("\"esvlistaprodutos\".LETRATINTOMETRICO", "letter") .addSelect("\"esvlistaprodutos\".LETRABASETINTOMETRICO", "letter")
.addSelect("\"esvlistaprodutos\".LINHATINTOMETRICO", "line") .addSelect("\"esvlistaprodutos\".LINHATINTOMETRICO", "line")
.addSelect("\"esvlistaprodutos\".LITRAGEM", "can") .addSelect("\"esvlistaprodutos\".LITRAGEM", "can")
.addSelect("\"esvlistaprodutos\".QUANTIDADE_ESTOQUE_GERAL", "full_stock") .addSelect("\"esvlistaprodutos\".QUANTIDADE_ESTOQUE_GERAL", "full_stock")
@@ -184,7 +184,7 @@ export class SalesService {
.addSelect("\"esvlistaprodutos\".PRODUTO_COM_REDUCAO_PRECO", "downPrice") .addSelect("\"esvlistaprodutos\".PRODUTO_COM_REDUCAO_PRECO", "downPrice")
.addSelect("\"esvlistaprodutos\".PRODUTO_EM_CAMPANHA", "compaing") .addSelect("\"esvlistaprodutos\".PRODUTO_EM_CAMPANHA", "compaing")
.addSelect("\"esvlistaprodutos\".BASETINTOMETRICO", "base") .addSelect("\"esvlistaprodutos\".BASETINTOMETRICO", "base")
.addSelect("\"esvlistaprodutos\".LETRATINTOMETRICO", "letter") .addSelect("\"esvlistaprodutos\".LETRABASETINTOMETRICO", "letter")
.addSelect("\"esvlistaprodutos\".LINHATINTOMETRICO", "line") .addSelect("\"esvlistaprodutos\".LINHATINTOMETRICO", "line")
.addSelect("\"esvlistaprodutos\".LITRAGEM", "can") .addSelect("\"esvlistaprodutos\".LITRAGEM", "can")
.addSelect("\"esvlistaprodutos\".QUANTIDADE_ESTOQUE_GERAL", "full_stock") .addSelect("\"esvlistaprodutos\".QUANTIDADE_ESTOQUE_GERAL", "full_stock")
@@ -262,7 +262,7 @@ export class SalesService {
.addSelect("\"esvlistaprodutos\".PRODUTO_COM_REDUCAO_PRECO", "downPrice") .addSelect("\"esvlistaprodutos\".PRODUTO_COM_REDUCAO_PRECO", "downPrice")
.addSelect("\"esvlistaprodutos\".PRODUTO_EM_CAMPANHA", "compaing") .addSelect("\"esvlistaprodutos\".PRODUTO_EM_CAMPANHA", "compaing")
.addSelect("\"esvlistaprodutos\".BASETINTOMETRICO", "base") .addSelect("\"esvlistaprodutos\".BASETINTOMETRICO", "base")
.addSelect("\"esvlistaprodutos\".LETRATINTOMETRICO", "letter") .addSelect("\"esvlistaprodutos\".LETRABASETINTOMETRICO", "letter")
.addSelect("\"esvlistaprodutos\".LINHATINTOMETRICO", "line") .addSelect("\"esvlistaprodutos\".LINHATINTOMETRICO", "line")
.addSelect("\"esvlistaprodutos\".LITRAGEM", "can") .addSelect("\"esvlistaprodutos\".LITRAGEM", "can")
.addSelect("\"esvlistaprodutos\".QUANTIDADE_ESTOQUE_GERAL", "full_stock") .addSelect("\"esvlistaprodutos\".QUANTIDADE_ESTOQUE_GERAL", "full_stock")
@@ -328,7 +328,7 @@ export class SalesService {
.addSelect("\"esvlistaprodutos\".PRODUTO_COM_REDUCAO_PRECO", "downPrice") .addSelect("\"esvlistaprodutos\".PRODUTO_COM_REDUCAO_PRECO", "downPrice")
.addSelect("\"esvlistaprodutos\".PRODUTO_EM_CAMPANHA", "compaing") .addSelect("\"esvlistaprodutos\".PRODUTO_EM_CAMPANHA", "compaing")
.addSelect("\"esvlistaprodutos\".BASETINTOMETRICO", "base") .addSelect("\"esvlistaprodutos\".BASETINTOMETRICO", "base")
.addSelect("\"esvlistaprodutos\".LETRATINTOMETRICO", "letter") .addSelect("\"esvlistaprodutos\".LETRABASETINTOMETRICO", "letter")
.addSelect("\"esvlistaprodutos\".LINHATINTOMETRICO", "line") .addSelect("\"esvlistaprodutos\".LINHATINTOMETRICO", "line")
.addSelect("\"esvlistaprodutos\".LITRAGEM", "can") .addSelect("\"esvlistaprodutos\".LITRAGEM", "can")
.addSelect("\"esvlistaprodutos\".QUANTIDADE_ESTOQUE_GERAL", "full_stock") .addSelect("\"esvlistaprodutos\".QUANTIDADE_ESTOQUE_GERAL", "full_stock")
@@ -957,6 +957,9 @@ export class SalesService {
FROM ESVESTOQUEVENDA, PCFILIAL FROM ESVESTOQUEVENDA, PCFILIAL
WHERE ESVESTOQUEVENDA.CODPROD = ${id} WHERE ESVESTOQUEVENDA.CODPROD = ${id}
AND ESVESTOQUEVENDA.CODFILIAL = PCFILIAL.CODIGO AND ESVESTOQUEVENDA.CODFILIAL = PCFILIAL.CODIGO
AND EXISTS(SELECT 1 FROM PCFILIALRETIRA R
WHERE R.CODFILIALVENDA = '${storeId}'
AND R.CODFILIALRETIRA = ESVESTOQUEVENDA.CODFILIAL)
ORDER BY TO_NUMBER(ESVESTOQUEVENDA.CODFILIAL) `; ORDER BY TO_NUMBER(ESVESTOQUEVENDA.CODFILIAL) `;
const stock = await queryRunner.query(sql); const stock = await queryRunner.query(sql);
@@ -1613,7 +1616,7 @@ export class SalesService {
// 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 timeDays = await queryRunner.query(sql);
const sqlRetiraPosterior = `SELECT ( PROXIMO_DIA_UTIL(TO_DATE('${saleDate}', 'DD-MM-YYYY'), '4') - TRUNC(SYSDATE) ) AS "days" FROM DUAL`; const sqlRetiraPosterior = `SELECT ( PROXIMO_DIA_UTIL(TO_DATE('${saleDate}', 'DD-MM-YYYY'), '1') - TRUNC(SYSDATE) ) AS "days" FROM DUAL`;
const timeDaysRetiraPosterior = await queryRunner.query(sqlRetiraPosterior); const timeDaysRetiraPosterior = await queryRunner.query(sqlRetiraPosterior);
return { deliveryDays: timeDays[0].days, retiraPosteriorDays: timeDaysRetiraPosterior[0].days }; return { deliveryDays: timeDays[0].days, retiraPosteriorDays: timeDaysRetiraPosterior[0].days };

View File

@@ -6,6 +6,7 @@ import { OrderDiscount } from 'src/domain/models/order-discount.model';
import { OrderTaxDelivery } from 'src/domain/models/order-taxdelivery.model'; import { OrderTaxDelivery } from 'src/domain/models/order-taxdelivery.model';
import { LogOrder } from 'src/domain/models/log-order.model'; import { LogOrder } from 'src/domain/models/log-order.model';
import { ApiTags } from '@nestjs/swagger'; import { ApiTags } from '@nestjs/swagger';
import { Cart } from 'src/domain/models/cart.model';
@ApiTags('Shopping') @ApiTags('Shopping')
@Controller('api/v1/shopping') @Controller('api/v1/shopping')
@@ -39,6 +40,15 @@ export class ShoppingController {
} }
} }
@Put('cart')
async updateCart(@Body() cart: Cart) {
try {
return await this.shoppingService.updateShopping(cart);
} catch (error) {
throw new HttpException(error.message, HttpStatus.BAD_REQUEST);
}
}
@Get('cart/:idcart/item/:idProduct/tipoentrega/:deliveryType') @Get('cart/:idcart/item/:idProduct/tipoentrega/:deliveryType')
async getItemCart(@Req() request, @Param('idCart') idCart: string, async getItemCart(@Req() request, @Param('idCart') idCart: string,
@Param('idProduct') idProduct: string, @Param('deliveryType') deliveryType: string) { @Param('idProduct') idProduct: string, @Param('deliveryType') deliveryType: string) {

View File

@@ -8,6 +8,7 @@ import { Shopping } from 'src/domain/entity/tables/estprevendac.entity';
import { OrderTaxDelivery } from 'src/domain/models/order-taxdelivery.model'; import { OrderTaxDelivery } from 'src/domain/models/order-taxdelivery.model';
import { connectionOptions } from 'src/configs/typeorm.config'; import { connectionOptions } from 'src/configs/typeorm.config';
import { LogOrder } from 'src/domain/models/log-order.model'; import { LogOrder } from 'src/domain/models/log-order.model';
import { Cart } from 'src/domain/models/cart.model';
@Injectable() @Injectable()
export class ShoppingService { export class ShoppingService {
@@ -605,6 +606,39 @@ export class ShoppingService {
} }
} }
async updateShopping(shopping: any) {
const connection = new Connection(connectionOptions);
await connection.connect();
const queryRunner = connection.createQueryRunner();
await queryRunner.connect();
try {
console.log(JSON.stringify(shopping));
const sql = `UPDATE ESTPREVENDAC
SET ESTPREVENDAC.CODCLI = :codcli
,ESTPREVENDAC.codendentcli = :codendentcli
,ESTPREVENDAC.codplpag = :codplpag
,ESTPREVENDAC.codcob = :codcob
,ESTPREVENDAC.codfilial = :codfilial
WHERE ID = :id `;
await queryRunner.query(sql, [
shopping.codcli,
shopping.codendentcli,
shopping.codplpag,
shopping.codcob,
shopping.saleStore,
shopping.id
]);
return shopping;
} catch (error) {
throw error;
} finally {
await queryRunner.release();
await connection.close();
}
}
async updatePriceShopping(idCart: string, idPaymentPlan: number) { async updatePriceShopping(idCart: string, idPaymentPlan: number) {
const connection = new Connection(connectionOptions); const connection = new Connection(connectionOptions);
await connection.connect(); await connection.connect();