mirror of
https://github.com/dadosfera/maestro.git
synced 2026-09-07 21:24:49 +00:00
Compare commits
267
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
110021ac24 | ||
|
|
84218c128a | ||
|
|
d642a8d823 | ||
|
|
740540d4dc | ||
|
|
94c9ab7939 | ||
|
|
a211b8593e | ||
|
|
25661613d5 | ||
|
|
3d8ea3576d | ||
|
|
e3a2eba5c3 | ||
|
|
81c446354b | ||
|
|
bf0314f5b1 | ||
|
|
c97180ac95 | ||
|
|
cac36f2c60 | ||
|
|
cd21fd0b7b | ||
|
|
a5a685ee3f | ||
|
|
a16fefe691 | ||
|
|
9c57485031 | ||
|
|
7051b21d86 | ||
|
|
0c4888ccdb | ||
|
|
e1b0e88bd8 | ||
|
|
cef1184908 | ||
|
|
31dda867d1 | ||
|
|
8a92da470c | ||
|
|
b89909ad66 | ||
|
|
2bb280e8de | ||
|
|
00cbadbb45 | ||
|
|
47ad527d38 | ||
|
|
51044a23b3 | ||
|
|
bb29d126c1 | ||
|
|
9d0f449eeb | ||
|
|
0eafa67e6f | ||
|
|
c3937472ec | ||
|
|
84d64424ca | ||
|
|
f0bfc5c94b | ||
|
|
ad86a6a698 | ||
|
|
af3b11ad54 | ||
|
|
d54f381998 | ||
|
|
3fd586753e | ||
|
|
9b3894f9e4 | ||
|
|
4a5f8f679a | ||
|
|
a444f5e5ec | ||
|
|
0d30c1cf83 | ||
|
|
15860519e1 | ||
|
|
cffda86eab | ||
|
|
a93fbfbbd9 | ||
|
|
e1cfc6e1a8 | ||
|
|
1e63df6536 | ||
|
|
8eb7fd0169 | ||
|
|
f8c6a8b747 | ||
|
|
8a9d6c2f9c | ||
|
|
bcb2a0b7cb | ||
|
|
2e181e70af | ||
|
|
ef615adb8e | ||
|
|
e03900811b | ||
|
|
5bc5fb0977 | ||
|
|
011032e3d4 | ||
|
|
17363e74f4 | ||
|
|
63efff6adf | ||
|
|
b5f569e522 | ||
|
|
5c77577992 | ||
|
|
4b9e113185 | ||
|
|
06d505c50a | ||
|
|
c70abfc826 | ||
|
|
db2c7d6c02 | ||
|
|
0a99ce1aa4 | ||
|
|
39c66f030a | ||
|
|
1223e21ac4 | ||
|
|
2177f6725c | ||
|
|
65ab16236f | ||
|
|
b4cc8151d7 | ||
|
|
e8b982998f | ||
|
|
ccd4159c59 | ||
|
|
9e49abb40d | ||
|
|
21a82b64f3 | ||
|
|
2414fcf21e | ||
|
|
94fbdb2226 | ||
|
|
985170d7ae | ||
|
|
b38b8f51e2 | ||
|
|
ea16e62d6b | ||
|
|
6182705410 | ||
|
|
a5d78a97ae | ||
|
|
2b33c22149 | ||
|
|
e32787baff | ||
|
|
f449d8ebd9 | ||
|
|
02627d023a | ||
|
|
cf94c73648 | ||
|
|
6b3241281b | ||
|
|
fe1caa003e | ||
|
|
e980c58507 | ||
|
|
ff5f8672e2 | ||
|
|
d51456ecf7 | ||
|
|
0cb9da13d0 | ||
|
|
f198449c16 | ||
|
|
0d627b0451 | ||
|
|
ff8eb3197d | ||
|
|
abd4e6f90a | ||
|
|
901518d26c | ||
|
|
17a4c0ef82 | ||
|
|
4ab8147149 | ||
|
|
0086528d51 | ||
|
|
bf12598915 | ||
|
|
efb0b58648 | ||
|
|
8a9b58b612 | ||
|
|
837a9d7265 | ||
|
|
d0122a9c20 | ||
|
|
968f75b688 | ||
|
|
877cb9d281 | ||
|
|
59efdb6272 | ||
|
|
7b1049224c | ||
|
|
0369f10b5c | ||
|
|
ecca9106f0 | ||
|
|
efc1f49d92 | ||
|
|
2d46ac3213 | ||
|
|
271174176b | ||
|
|
dcf7aed51c | ||
|
|
7fbce8b5be | ||
|
|
049eca9700 | ||
|
|
3bcd78bb32 | ||
|
|
f603b64679 | ||
|
|
b640465624 | ||
|
|
98282471a9 | ||
|
|
8983430889 | ||
|
|
d3aeca12cd | ||
|
|
ce619942a3 | ||
|
|
71b3f278a5 | ||
|
|
c92542ed90 | ||
|
|
69a9d78642 | ||
|
|
bf4f3cfd8c | ||
|
|
01afa69fcb | ||
|
|
80f3913fd2 | ||
|
|
10293ad6a9 | ||
|
|
e4d0c9c3e6 | ||
|
|
21c57e5620 | ||
|
|
959210e354 | ||
|
|
f10953e949 | ||
|
|
13903b9bb9 | ||
|
|
2e3a13d421 | ||
|
|
fa17fc3001 | ||
|
|
b7171556b8 | ||
|
|
254a638392 | ||
|
|
74b3bd6b46 | ||
|
|
9a29ef5401 | ||
|
|
3f21faaa66 | ||
|
|
bf19d29a1d | ||
|
|
6523f707e3 | ||
|
|
8b0bf84d34 | ||
|
|
9ef4c51ba1 | ||
|
|
19521489fa | ||
|
|
2ce9aad005 | ||
|
|
051fb6e4dd | ||
|
|
2125884c6c | ||
|
|
e3099aa2b2 | ||
|
|
f4c9226ef9 | ||
|
|
12c61d9b5d | ||
|
|
ff3999a6aa | ||
|
|
209470482a | ||
|
|
99c2a9ecf5 | ||
|
|
c0f75d241f | ||
|
|
1e0fb78dff | ||
|
|
c26194554c | ||
|
|
b70d37423d | ||
|
|
4ddd5edcfd | ||
|
|
3bcbba9581 | ||
|
|
67d47a9642 | ||
|
|
6f9c967c96 | ||
|
|
b8bdc5beea | ||
|
|
269f70b309 | ||
|
|
93f452ae05 | ||
|
|
e39378229f | ||
|
|
61a4f724ef | ||
|
|
38a9e21f5f | ||
|
|
1a2153d62f | ||
|
|
d25bfd147c | ||
|
|
d4ba45fd03 | ||
|
|
82f1035a5e | ||
|
|
6c57bac235 | ||
|
|
cf8eed35a3 | ||
|
|
55fc85c544 | ||
|
|
72ed637640 | ||
|
|
890364f597 | ||
|
|
30eec733b2 | ||
|
|
30a41ba144 | ||
|
|
2dc032e7e7 | ||
|
|
7f5981731f | ||
|
|
66309c7bbe | ||
|
|
15048eaf8a | ||
|
|
0e169a3cbc | ||
|
|
b5d933eaf3 | ||
|
|
6fa9bf861a | ||
|
|
9a217dff57 | ||
|
|
e08734c97f | ||
|
|
cd4382c1ff | ||
|
|
54b75ce11b | ||
|
|
0e038d0b12 | ||
|
|
85234fe0dd | ||
|
|
c97a02cb17 | ||
|
|
878ec977b8 | ||
|
|
8006867bc2 | ||
|
|
784b0ef090 | ||
|
|
b736cddf07 | ||
|
|
3d6328fb0b | ||
|
|
4246c7495e | ||
|
|
3d40746ccb | ||
|
|
3ab2f8f27d | ||
|
|
b44d23552c | ||
|
|
8e63757738 | ||
|
|
3b84409003 | ||
|
|
0ce3822300 | ||
|
|
a2c7ce00db | ||
|
|
121e30ce45 | ||
|
|
85c8a4937d | ||
|
|
53920f2f3f | ||
|
|
8c34914806 | ||
|
|
1881d07c4a | ||
|
|
3b8310fdca | ||
|
|
52bda8ebe2 | ||
|
|
275a53dbd1 | ||
|
|
9cefdb226d | ||
|
|
007f3911ff | ||
|
|
8ac0a8a79f | ||
|
|
285de97375 | ||
|
|
e2a7d2b92b | ||
|
|
da23ad76db | ||
|
|
55b0961b82 | ||
|
|
d3c5c0fa63 | ||
|
|
5dbc644d1d | ||
|
|
8eddb9e1bf | ||
|
|
76485f929d | ||
|
|
8e0182aa50 | ||
|
|
a18bdccc09 | ||
|
|
b27298501d | ||
|
|
33ebc91826 | ||
|
|
6948156693 | ||
|
|
0aaa4384c3 | ||
|
|
1f9d0c29ec | ||
|
|
039c652b28 | ||
|
|
653d4f53b5 | ||
|
|
31f8c2c1a6 | ||
|
|
8b93d4e97b | ||
|
|
adeb022818 | ||
|
|
e326cab44d | ||
|
|
61109f8ae9 | ||
|
|
3f8dc5cabe | ||
|
|
7f5d157739 | ||
|
|
bce73fb11f | ||
|
|
9473e65deb | ||
|
|
77b9acd2d0 | ||
|
|
e99306adba | ||
|
|
96b947ebdc | ||
|
|
6f7436f33f | ||
|
|
865140e681 | ||
|
|
c4a664572a | ||
|
|
7a10f88113 | ||
|
|
466f8fb8cc | ||
|
|
5989822263 | ||
|
|
64a3e2652e | ||
|
|
ea44a1cbb6 | ||
|
|
fc9c0b0991 | ||
|
|
a4b5a44e44 | ||
|
|
d99a6aa322 | ||
|
|
3f910f851a | ||
|
|
bd231382eb | ||
|
|
9c1979e17a | ||
|
|
fcf7fb054e | ||
|
|
288aaeabc0 | ||
|
|
918c3d7416 | ||
|
|
e7f410831f |
@@ -0,0 +1,12 @@
|
|||||||
|
node_modules
|
||||||
|
dist
|
||||||
|
.git
|
||||||
|
*.log
|
||||||
|
npm-debug.log*
|
||||||
|
.DS_Store
|
||||||
|
.env
|
||||||
|
.env.*
|
||||||
|
coverage
|
||||||
|
.nyc_output
|
||||||
|
*.tgz
|
||||||
|
!protospack.tgz
|
||||||
@@ -71,6 +71,11 @@ jobs:
|
|||||||
sudo mv helmfile /usr/local/bin/
|
sudo mv helmfile /usr/local/bin/
|
||||||
helmfile --version
|
helmfile --version
|
||||||
|
|
||||||
|
- name: Install Helm Diff plugin
|
||||||
|
run: |
|
||||||
|
helm plugin install https://github.com/databus23/helm-diff --version v3.9.3
|
||||||
|
helm diff version
|
||||||
|
|
||||||
- name: Debug Helm env
|
- name: Debug Helm env
|
||||||
run: |
|
run: |
|
||||||
helm env
|
helm env
|
||||||
@@ -102,4 +107,5 @@ jobs:
|
|||||||
- name: Run Helmfile Diff
|
- name: Run Helmfile Diff
|
||||||
env:
|
env:
|
||||||
ENV: ${{ needs.extract_environment.outputs.environment }}
|
ENV: ${{ needs.extract_environment.outputs.environment }}
|
||||||
|
HELM_PLUGINS: /home/runner/.local/share/helm/plugins
|
||||||
run: helmfile -f deploy/helmfiles/${ENV}.yaml diff
|
run: helmfile -f deploy/helmfiles/${ENV}.yaml diff
|
||||||
|
|||||||
+4
-3
@@ -1,4 +1,5 @@
|
|||||||
FROM node:18.17-alpine AS base_image
|
FROM node:20-alpine AS base_image
|
||||||
|
RUN npm install -g npm@10.8.2
|
||||||
|
|
||||||
FROM base_image AS build_base
|
FROM base_image AS build_base
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
@@ -21,7 +22,7 @@ ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true \
|
|||||||
# run aws cli without mounting secret, because CI already has AWS credentials
|
# run aws cli without mounting secret, because CI already has AWS credentials
|
||||||
FROM build_base AS ci_image
|
FROM build_base AS ci_image
|
||||||
RUN aws codeartifact login --tool npm --namespace @dadosfera --repository dadosfera-npm --domain dadosfera --domain-owner 611330257153 --region us-east-1
|
RUN aws codeartifact login --tool npm --namespace @dadosfera --repository dadosfera-npm --domain dadosfera --domain-owner 611330257153 --region us-east-1
|
||||||
RUN npm ci
|
RUN npm ci --ignore-scripts
|
||||||
COPY . .
|
COPY . .
|
||||||
|
|
||||||
|
|
||||||
@@ -36,7 +37,7 @@ FROM build_base AS dev
|
|||||||
RUN --mount=type=secret,id=aws,target=/root/.aws/credentials \
|
RUN --mount=type=secret,id=aws,target=/root/.aws/credentials \
|
||||||
aws codeartifact login --tool npm --namespace @dadosfera --repository dadosfera-npm --domain dadosfera --domain-owner 611330257153 --region us-east-1
|
aws codeartifact login --tool npm --namespace @dadosfera --repository dadosfera-npm --domain dadosfera --domain-owner 611330257153 --region us-east-1
|
||||||
# flag --build-from-source is required to force-build sqlite3
|
# flag --build-from-source is required to force-build sqlite3
|
||||||
RUN npm ci
|
RUN npm ci --ignore-scripts
|
||||||
COPY . .
|
COPY . .
|
||||||
ENTRYPOINT npm run start:dev
|
ENTRYPOINT npm run start:dev
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,47 @@
|
|||||||
|
FROM node:22-alpine AS base_image
|
||||||
|
RUN npm install -g npm@latest
|
||||||
|
|
||||||
|
FROM base_image AS build_base
|
||||||
|
WORKDIR /app
|
||||||
|
RUN apk update
|
||||||
|
RUN apk add --no-cache \
|
||||||
|
aws-cli \
|
||||||
|
chromium \
|
||||||
|
nss \
|
||||||
|
freetype \
|
||||||
|
harfbuzz \
|
||||||
|
ca-certificates \
|
||||||
|
ttf-freefont
|
||||||
|
COPY package*.json ./
|
||||||
|
|
||||||
|
ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true \
|
||||||
|
PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium-browser
|
||||||
|
|
||||||
|
|
||||||
|
# Local build with secrets
|
||||||
|
FROM build_base AS build
|
||||||
|
RUN --mount=type=secret,id=aws,target=/root/.aws/credentials \
|
||||||
|
aws codeartifact login --tool npm --namespace @dadosfera --repository dadosfera-npm --domain dadosfera --domain-owner 611330257153 --region us-east-1
|
||||||
|
RUN npm ci --ignore-scripts
|
||||||
|
COPY . .
|
||||||
|
RUN npm run build
|
||||||
|
|
||||||
|
|
||||||
|
FROM base_image
|
||||||
|
WORKDIR /app
|
||||||
|
COPY --from=build /app/dist ./dist
|
||||||
|
COPY --from=build /app/node_modules ./node_modules
|
||||||
|
COPY --from=build /app/package*.json ./
|
||||||
|
RUN apk update
|
||||||
|
RUN apk add --no-cache \
|
||||||
|
chromium \
|
||||||
|
nss \
|
||||||
|
freetype \
|
||||||
|
harfbuzz \
|
||||||
|
ca-certificates \
|
||||||
|
ttf-freefont
|
||||||
|
|
||||||
|
ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true \
|
||||||
|
PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium-browser
|
||||||
|
|
||||||
|
ENTRYPOINT ["npm", "run", "start:prod"]
|
||||||
@@ -4,6 +4,7 @@
|
|||||||
|
|
||||||
# Maestro
|
# Maestro
|
||||||
|
|
||||||
|
|
||||||
Maestro é a API principal da Dadosfera. É responsável pela comunicação do Frontend com nossos microsserviços.
|
Maestro é a API principal da Dadosfera. É responsável pela comunicação do Frontend com nossos microsserviços.
|
||||||
|
|
||||||
```mermaid
|
```mermaid
|
||||||
|
|||||||
@@ -48,6 +48,9 @@ spec:
|
|||||||
{{- toYaml .Values.resources | nindent 12 }}
|
{{- toYaml .Values.resources | nindent 12 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
env:
|
env:
|
||||||
|
# Auth Provider Configuration (cognito or keycloak)
|
||||||
|
- name: AUTH_PROVIDER
|
||||||
|
value: {{ .Values.maestro.auth_provider | default "cognito" | quote }}
|
||||||
- name: AWS_IDENTITY_POOL_ID
|
- name: AWS_IDENTITY_POOL_ID
|
||||||
value: {{ .Values.maestro.aws_identity_pool_id }}
|
value: {{ .Values.maestro.aws_identity_pool_id }}
|
||||||
- name: AWS_REGION
|
- name: AWS_REGION
|
||||||
@@ -108,6 +111,12 @@ spec:
|
|||||||
value: "{{ .Values.maestro.redis_tls }}"
|
value: "{{ .Values.maestro.redis_tls }}"
|
||||||
- name: PLATFORM_API_URL
|
- name: PLATFORM_API_URL
|
||||||
value: {{ .Values.maestro.platform_api_url }}
|
value: {{ .Values.maestro.platform_api_url }}
|
||||||
|
- name: CONNECTIONS_API_URL
|
||||||
|
value: {{ .Values.maestro.connections_api_url | default "" | quote }}
|
||||||
|
- name: STORAGE_EXPLORER_API_URL
|
||||||
|
value: {{ .Values.maestro.storage_explorer_api_url | quote }}
|
||||||
|
- name: FIREBASE_BASE_URL
|
||||||
|
value: {{ .Values.maestro.firebase_base_url }}
|
||||||
- name: JWT_PRIVATE_KEY
|
- name: JWT_PRIVATE_KEY
|
||||||
valueFrom:
|
valueFrom:
|
||||||
secretKeyRef:
|
secretKeyRef:
|
||||||
|
|||||||
@@ -9,6 +9,9 @@ maestro:
|
|||||||
cookie_secret: "ff7bc13823edb2ae50d248e5780bddc9d4b31c36"
|
cookie_secret: "ff7bc13823edb2ae50d248e5780bddc9d4b31c36"
|
||||||
redis_database: "1"
|
redis_database: "1"
|
||||||
platform_api_url: https://xs2hkhq07k.execute-api.us-east-1.amazonaws.com
|
platform_api_url: https://xs2hkhq07k.execute-api.us-east-1.amazonaws.com
|
||||||
|
connections_api_url: https://iy40eans64.execute-api.us-east-1.amazonaws.com
|
||||||
|
storage_explorer_api_url: "http://storage-explorer-{customer}.data-apps.svc.cluster.local:8000/api"
|
||||||
|
firebase_base_url: https://feature-flag-25bf6-default-rtdb.firebaseio.com/stg
|
||||||
|
|
||||||
hostname: maestro.stg.dadosfera.ai
|
hostname: maestro.stg.dadosfera.ai
|
||||||
|
|
||||||
|
|||||||
@@ -27,6 +27,9 @@ resources:
|
|||||||
cpu: 2000m
|
cpu: 2000m
|
||||||
memory: 2Gi
|
memory: 2Gi
|
||||||
maestro:
|
maestro:
|
||||||
|
# Auth provider: "cognito" (default) or "keycloak"
|
||||||
|
# Note: maestro doesn't connect to Keycloak directly, only duc does
|
||||||
|
auth_provider: "cognito"
|
||||||
aws_identity_pool_id: "us-east-1_Mrezsw9Sn"
|
aws_identity_pool_id: "us-east-1_Mrezsw9Sn"
|
||||||
duc_url: duc.dadosfera.ai
|
duc_url: duc.dadosfera.ai
|
||||||
in_factory_url: in-factory.dadosfera.ai
|
in_factory_url: in-factory.dadosfera.ai
|
||||||
@@ -44,6 +47,7 @@ maestro:
|
|||||||
open_customer_id: f239718a-a271-4ef9-ae7e-02a2f0f3aa6e
|
open_customer_id: f239718a-a271-4ef9-ae7e-02a2f0f3aa6e
|
||||||
open_group_id: 401573bb-334f-44b2-b30e-88d4cea31ae9
|
open_group_id: 401573bb-334f-44b2-b30e-88d4cea31ae9
|
||||||
platform_api_url: https://oz8v2zid1e.execute-api.us-east-1.amazonaws.com
|
platform_api_url: https://oz8v2zid1e.execute-api.us-east-1.amazonaws.com
|
||||||
|
storage_explorer_api_url: "https://storage-explorer-{customer}.dadosfera.ai/api"
|
||||||
dedicated_proxy: ""
|
dedicated_proxy: ""
|
||||||
restricted_ip: ""
|
restricted_ip: ""
|
||||||
redis_host: "aaapzppmlyamkocqwstpo7zvopczyyiyuy6xzm2g6c5k4mq3a66be4a-0.redis.sa-saopaulo-1.oci.oraclecloud.com"
|
redis_host: "aaapzppmlyamkocqwstpo7zvopczyyiyuy6xzm2g6c5k4mq3a66be4a-0.redis.sa-saopaulo-1.oci.oraclecloud.com"
|
||||||
@@ -51,6 +55,9 @@ maestro:
|
|||||||
redis_database: "0"
|
redis_database: "0"
|
||||||
redis_tls: "true"
|
redis_tls: "true"
|
||||||
cookie_secret: "13cc5e136d3074bcc05bec8697092ec1f5f376bf"
|
cookie_secret: "13cc5e136d3074bcc05bec8697092ec1f5f376bf"
|
||||||
|
firebase_base_url: https://feature-flag-25bf6-default-rtdb.firebaseio.com/prd
|
||||||
|
connections_api_url: https://wv6fw7ayj4.execute-api.us-east-1.amazonaws.com
|
||||||
|
|
||||||
autoscaling:
|
autoscaling:
|
||||||
enabled: false
|
enabled: false
|
||||||
minReplicas: 1
|
minReplicas: 1
|
||||||
|
|||||||
+2617
-1235
File diff suppressed because it is too large
Load Diff
@@ -11,6 +11,7 @@ const config: Config.InitialOptions = {
|
|||||||
'<rootDir>/node_modules/',
|
'<rootDir>/node_modules/',
|
||||||
'.*\\.module\\.[jt]s$',
|
'.*\\.module\\.[jt]s$',
|
||||||
],
|
],
|
||||||
|
setupFiles: ['<rootDir>/jest.setup.ts'],
|
||||||
// moduleDirectories: ['node_modules'], // default is already 'node_modules'
|
// moduleDirectories: ['node_modules'], // default is already 'node_modules'
|
||||||
// rootDir: '.', //No need
|
// rootDir: '.', //No need
|
||||||
// testEnvironment: 'node', //Defaults to 'node'
|
// testEnvironment: 'node', //Defaults to 'node'
|
||||||
|
|||||||
@@ -0,0 +1,3 @@
|
|||||||
|
process.env.DUC_URL="duc:50051"
|
||||||
|
process.env.INFACTORY_URL="in-factory:50052"
|
||||||
|
process.env.PIFACTORY_URL="pi-factory:50053"
|
||||||
Generated
+2178
-2974
File diff suppressed because it is too large
Load Diff
+15
-6
@@ -10,7 +10,7 @@
|
|||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"co:login": "aws codeartifact login --tool npm --namespace @dadosfera --repository dadosfera-npm --domain dadosfera --domain-owner 611330257153 --region us-east-1",
|
"co:login": "aws codeartifact login --tool npm --namespace @dadosfera --repository dadosfera-npm --domain dadosfera --domain-owner 611330257153 --region us-east-1",
|
||||||
"proto-update": "npm i @dadosfera/protospack-v2@latest --save-exact",
|
"proto-update": "npm i @dadosfera/protospack-v2@v3.40.0-beta.1 --save-exact",
|
||||||
"prebuild": "rimraf dist",
|
"prebuild": "rimraf dist",
|
||||||
"build": "nest build",
|
"build": "nest build",
|
||||||
"format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
|
"format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
|
||||||
@@ -30,12 +30,11 @@
|
|||||||
"@aws-crypto/sha256-js": "^5.2.0",
|
"@aws-crypto/sha256-js": "^5.2.0",
|
||||||
"@aws-sdk/client-dynamodb": "^3.414.0",
|
"@aws-sdk/client-dynamodb": "^3.414.0",
|
||||||
"@aws-sdk/client-secrets-manager": "^3.414.0",
|
"@aws-sdk/client-secrets-manager": "^3.414.0",
|
||||||
"@aws-sdk/lib-dynamodb": "^3.414.0",
|
|
||||||
"@aws-sdk/credential-provider-node": "^3.940.0",
|
"@aws-sdk/credential-provider-node": "^3.940.0",
|
||||||
|
"@aws-sdk/lib-dynamodb": "^3.414.0",
|
||||||
"@aws-sdk/signature-v4": "^3.370.0",
|
"@aws-sdk/signature-v4": "^3.370.0",
|
||||||
"@dadosfera/dadosfera-logs": "^1.0.0-beta.4",
|
"@dadosfera/dadosfera-logs": "^1.0.0-beta.4",
|
||||||
"@dadosfera/protospack": "2.5.3",
|
"@dadosfera/protospack-v2": "3.40.0",
|
||||||
"@dadosfera/protospack-v2": "3.38.0-beta.16",
|
|
||||||
"@grpc/grpc-js": "^1.9.3",
|
"@grpc/grpc-js": "^1.9.3",
|
||||||
"@grpc/proto-loader": "^0.7.9",
|
"@grpc/proto-loader": "^0.7.9",
|
||||||
"@nestjs/cli": "^9.5.0",
|
"@nestjs/cli": "^9.5.0",
|
||||||
@@ -49,7 +48,7 @@
|
|||||||
"@nestjs/schematics": "^9.2.0",
|
"@nestjs/schematics": "^9.2.0",
|
||||||
"@nestjs/swagger": "^6.3.0",
|
"@nestjs/swagger": "^6.3.0",
|
||||||
"@nestjs/testing": "^9.4.3",
|
"@nestjs/testing": "^9.4.3",
|
||||||
"axios": "^0.27.2",
|
"axios": "0.30.3",
|
||||||
"cache-manager": "^5.1.4",
|
"cache-manager": "^5.1.4",
|
||||||
"cache-manager-ioredis-yet": "^1.1.0",
|
"cache-manager-ioredis-yet": "^1.1.0",
|
||||||
"class-transformer": "^0.5.1",
|
"class-transformer": "^0.5.1",
|
||||||
@@ -65,6 +64,7 @@
|
|||||||
"jwk-to-pem": "^2.0.5",
|
"jwk-to-pem": "^2.0.5",
|
||||||
"mixpanel": "^0.17.0",
|
"mixpanel": "^0.17.0",
|
||||||
"ms": "^3.0.0-canary.1",
|
"ms": "^3.0.0-canary.1",
|
||||||
|
"multer": "^2.0.2",
|
||||||
"openid-client": "^5.7.1",
|
"openid-client": "^5.7.1",
|
||||||
"passport": "^0.6.0",
|
"passport": "^0.6.0",
|
||||||
"passport-facebook": "^3.0.0",
|
"passport-facebook": "^3.0.0",
|
||||||
@@ -80,7 +80,13 @@
|
|||||||
"swagger-ui-express": "^4.6.3"
|
"swagger-ui-express": "^4.6.3"
|
||||||
},
|
},
|
||||||
"overrides": {
|
"overrides": {
|
||||||
"multer": "1.4.5-lts.1"
|
"axios": "0.30.3",
|
||||||
|
"form-data": "^4.0.4",
|
||||||
|
"body-parser": "^1.20.3",
|
||||||
|
"cross-spawn": "^7.0.5",
|
||||||
|
"glob": "^10.5.0",
|
||||||
|
"path-to-regexp": "^3.3.0",
|
||||||
|
"semver": "^7.5.2"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/cache-manager": "^4.0.6",
|
"@types/cache-manager": "^4.0.6",
|
||||||
@@ -111,5 +117,8 @@
|
|||||||
"ts-node": "^10.9.1",
|
"ts-node": "^10.9.1",
|
||||||
"tsconfig-paths": "^3.14.2",
|
"tsconfig-paths": "^3.14.2",
|
||||||
"typescript": "^4.9.5"
|
"typescript": "^4.9.5"
|
||||||
|
},
|
||||||
|
"resolutions": {
|
||||||
|
"axios": "0.30.3"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+5
-2
@@ -17,7 +17,6 @@ import { ConnectionTestModule } from './modules/connection-test/connection-test.
|
|||||||
import { NetworkConfigModule } from './modules/network-config/network-config.module';
|
import { NetworkConfigModule } from './modules/network-config/network-config.module';
|
||||||
import { InputsModule } from './modules/inputs/inputs.module';
|
import { InputsModule } from './modules/inputs/inputs.module';
|
||||||
import { OauthModule } from './modules/oauth/oauth.module';
|
import { OauthModule } from './modules/oauth/oauth.module';
|
||||||
import { PipelinesModule } from './modules/pipelines/pipelines.module';
|
|
||||||
import { TransformationsModule } from './modules/transformations/transformations.module';
|
import { TransformationsModule } from './modules/transformations/transformations.module';
|
||||||
import { HealthModule } from './modules/health/health.module';
|
import { HealthModule } from './modules/health/health.module';
|
||||||
import { CatalogModule } from './modules/catalog/catalog.module';
|
import { CatalogModule } from './modules/catalog/catalog.module';
|
||||||
@@ -34,6 +33,9 @@ import { AssignModule } from './modules/assign/assign.module';
|
|||||||
import { ShareMetadataModule } from './modules/share-metadata/share-metadata.module';
|
import { ShareMetadataModule } from './modules/share-metadata/share-metadata.module';
|
||||||
import { ApiKeyModule } from './modules/api-key/api-key.module';
|
import { ApiKeyModule } from './modules/api-key/api-key.module';
|
||||||
import { PlatformApiModule } from './modules/platform-api/platform-api.module';
|
import { PlatformApiModule } from './modules/platform-api/platform-api.module';
|
||||||
|
import { StorageExplorerModule } from './modules/storage-explorer/storage-explorer.module';
|
||||||
|
import { ReleaseNoteModule } from './modules/release_note/release_note.module';
|
||||||
|
|
||||||
|
|
||||||
@Module({
|
@Module({
|
||||||
providers: [
|
providers: [
|
||||||
@@ -57,7 +59,6 @@ import { PlatformApiModule } from './modules/platform-api/platform-api.module';
|
|||||||
PermissionsModule,
|
PermissionsModule,
|
||||||
TermsOfUseModule,
|
TermsOfUseModule,
|
||||||
ConnectionTestModule,
|
ConnectionTestModule,
|
||||||
PipelinesModule,
|
|
||||||
TransformationsModule,
|
TransformationsModule,
|
||||||
UsersModule,
|
UsersModule,
|
||||||
RolesModule,
|
RolesModule,
|
||||||
@@ -75,8 +76,10 @@ import { PlatformApiModule } from './modules/platform-api/platform-api.module';
|
|||||||
IdentityProviderModule,
|
IdentityProviderModule,
|
||||||
NetworkPolicyModule,
|
NetworkPolicyModule,
|
||||||
PlatformApiModule,
|
PlatformApiModule,
|
||||||
|
StorageExplorerModule,
|
||||||
//Always leave HealthModule last, so it is on the bottom of swagger
|
//Always leave HealthModule last, so it is on the bottom of swagger
|
||||||
HealthModule,
|
HealthModule,
|
||||||
|
ReleaseNoteModule,
|
||||||
],
|
],
|
||||||
})
|
})
|
||||||
export class AppModule {}
|
export class AppModule {}
|
||||||
|
|||||||
@@ -153,6 +153,7 @@ export class AuthenticationGuard
|
|||||||
user_id: accessTokenPayload.user_id,
|
user_id: accessTokenPayload.user_id,
|
||||||
username: accessTokenPayload.username,
|
username: accessTokenPayload.username,
|
||||||
permissions: accessTokenPayload.permissions,
|
permissions: accessTokenPayload.permissions,
|
||||||
|
roles: accessTokenPayload.roles,
|
||||||
customer_id: accessTokenPayload.customer_id,
|
customer_id: accessTokenPayload.customer_id,
|
||||||
customer_name: accessTokenPayload.customer_name,
|
customer_name: accessTokenPayload.customer_name,
|
||||||
customer_tier: accessTokenPayload.customer_tier,
|
customer_tier: accessTokenPayload.customer_tier,
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ export function extractUserFrom(aRawJwt: string) {
|
|||||||
user_id: payload.user_id,
|
user_id: payload.user_id,
|
||||||
username: payload.username,
|
username: payload.username,
|
||||||
permissions: payload.permissions,
|
permissions: payload.permissions,
|
||||||
|
roles: payload.roles,
|
||||||
customer_id: payload.customer_id,
|
customer_id: payload.customer_id,
|
||||||
customer_name: payload.customer_name,
|
customer_name: payload.customer_name,
|
||||||
customer_tier: payload.customer_tier,
|
customer_tier: payload.customer_tier,
|
||||||
|
|||||||
@@ -357,6 +357,16 @@ export const PERMISSIONS_GROUPS = {
|
|||||||
'es-es': 'Crear y editar atributos en el catálogo',
|
'es-es': 'Crear y editar atributos en el catálogo',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
CERTIFY: {
|
||||||
|
seqid: 53,
|
||||||
|
claim: 'catalog:certify',
|
||||||
|
usage: PermissionUsages.PUBLIC,
|
||||||
|
name: {
|
||||||
|
'pt-br': 'Alterar o status de certificação dos Ativos',
|
||||||
|
'en-us': "Change Assets' certification status",
|
||||||
|
'es-es': 'Cambiar el estado de certificación de los Activos',
|
||||||
|
},
|
||||||
|
},
|
||||||
DELETE: {
|
DELETE: {
|
||||||
seqid: 1,
|
seqid: 1,
|
||||||
claim: 'catalog:delete',
|
claim: 'catalog:delete',
|
||||||
@@ -668,6 +678,35 @@ export const PERMISSIONS_GROUPS = {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
STORAGE_EXPLORER: {
|
||||||
|
title: {
|
||||||
|
'pt-br': 'Storage Explorer',
|
||||||
|
'en-us': 'Storage Explorer',
|
||||||
|
'es-es': 'Storage Explorer',
|
||||||
|
},
|
||||||
|
permissions: {
|
||||||
|
READ: {
|
||||||
|
seqid: 51,
|
||||||
|
claim: 'storage-explorer:read',
|
||||||
|
usage: PermissionUsages.PUBLIC,
|
||||||
|
name: {
|
||||||
|
'pt-br': 'Ler dados do Storage Explorer',
|
||||||
|
'en-us': 'Read Storage Explorer data',
|
||||||
|
'es-es': 'Leer datos del Storage Explorer',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
WRITE: {
|
||||||
|
seqid: 52,
|
||||||
|
claim: 'storage-explorer:write',
|
||||||
|
usage: PermissionUsages.PUBLIC,
|
||||||
|
name: {
|
||||||
|
'pt-br': 'Escrever dados no Storage Explorer',
|
||||||
|
'en-us': 'Write Storage Explorer data',
|
||||||
|
'es-es': 'Escribir datos en Storage Explorer',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
};
|
};
|
||||||
export interface DadosferaModule {
|
export interface DadosferaModule {
|
||||||
name: string;
|
name: string;
|
||||||
@@ -683,6 +722,8 @@ export const DADOSFERA_MODULES_KEYS = {
|
|||||||
PII: 'pii',
|
PII: 'pii',
|
||||||
EMBED: 'embedded-analytics',
|
EMBED: 'embedded-analytics',
|
||||||
EMBED_ASSIGNED: 'embed-assigned',
|
EMBED_ASSIGNED: 'embed-assigned',
|
||||||
|
CATALOG: 'catalog',
|
||||||
|
COLLECT: 'collect',
|
||||||
}
|
}
|
||||||
|
|
||||||
export const DADOSFERA_MODULES: Array<DadosferaModule> = [
|
export const DADOSFERA_MODULES: Array<DadosferaModule> = [
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ export interface RequestUser {
|
|||||||
customer_tier: string;
|
customer_tier: string;
|
||||||
access_token: string;
|
access_token: string;
|
||||||
customer_modules: string[];
|
customer_modules: string[];
|
||||||
|
roles: string[];
|
||||||
}
|
}
|
||||||
|
|
||||||
export const User: (options?: { required?: boolean }) => ParameterDecorator =
|
export const User: (options?: { required?: boolean }) => ParameterDecorator =
|
||||||
|
|||||||
@@ -0,0 +1,65 @@
|
|||||||
|
import {
|
||||||
|
BadRequestException,
|
||||||
|
CanActivate,
|
||||||
|
ExecutionContext,
|
||||||
|
Inject,
|
||||||
|
Injectable,
|
||||||
|
OnModuleInit,
|
||||||
|
} from '@nestjs/common';
|
||||||
|
import { ClientGrpc } from '@nestjs/microservices';
|
||||||
|
import { map, Observable } from 'rxjs';
|
||||||
|
import { PackTheMetadata } from 'src/utils/PackTheMetadata';
|
||||||
|
import {
|
||||||
|
ReadService,
|
||||||
|
ProtoServices,
|
||||||
|
} from '@dadosfera/protospack-v2/dist/lib/PipelineV2';
|
||||||
|
import { PipelinesClientConfiguration } from 'src/modules/pipelinesV2/pipelines-client';
|
||||||
|
import { PlatformApiService } from 'src/modules/platform-api/platform-api.service';
|
||||||
|
import DadosferaLogger from '@dadosfera/dadosfera-logs';
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class PipelineExecutionGuard implements CanActivate {
|
||||||
|
logger: DadosferaLogger;
|
||||||
|
|
||||||
|
constructor(
|
||||||
|
@Inject(DadosferaLogger)
|
||||||
|
dadosferaLogger: DadosferaLogger,
|
||||||
|
private readonly platformApiService: PlatformApiService,
|
||||||
|
) {
|
||||||
|
this.logger = dadosferaLogger.logger;
|
||||||
|
}
|
||||||
|
|
||||||
|
async canActivate(context: ExecutionContext): Promise<boolean> {
|
||||||
|
try {
|
||||||
|
this.logger.info(
|
||||||
|
'PipelineExecutionGuard: Checking if pipeline can be executed...',
|
||||||
|
);
|
||||||
|
const request = context.switchToHttp().getRequest();
|
||||||
|
const pipelineId = request.params.pipelineId;
|
||||||
|
const user = request.user;
|
||||||
|
const idRegex = /[^0-9a-zA-Z_$]+/g;
|
||||||
|
const convertedId = pipelineId.replace(idRegex, '_');
|
||||||
|
|
||||||
|
const status = await this.platformApiService.proxy(
|
||||||
|
'GET',
|
||||||
|
`/pipeline/${convertedId}/pipeline_run`,
|
||||||
|
user,
|
||||||
|
);
|
||||||
|
|
||||||
|
const currentStatus = status[status.length - 1]
|
||||||
|
|
||||||
|
this.logger.info('Pipeline current status response:' + JSON.stringify(currentStatus));
|
||||||
|
|
||||||
|
if (currentStatus.last_status.toLowerCase() === 'running') {
|
||||||
|
this.logger.error('Pipeline is running, cannot update input now');
|
||||||
|
throw new BadRequestException('Pipeline is running, cannot update input now');
|
||||||
|
} else {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
this.logger.error('Error in PipelineExecutionGuard: ' + error.message);
|
||||||
|
throw new BadRequestException('Error checking pipeline status: ' + error.message);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -111,3 +111,4 @@ function configureSwagger(app: INestApplication) {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
bootstrap();
|
bootstrap();
|
||||||
|
|
||||||
|
|||||||
@@ -37,6 +37,7 @@ import {
|
|||||||
RequireAllPermissions,
|
RequireAllPermissions,
|
||||||
} from 'src/decorators/authentication.decorator';
|
} from 'src/decorators/authentication.decorator';
|
||||||
import { AuthClientService } from './auth.service';
|
import { AuthClientService } from './auth.service';
|
||||||
|
import { UserDTO } from './dtos/login';
|
||||||
import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
|
import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
|
||||||
import { GrpcToHttpExceptionFilter } from '../../error/grpc-to-http-exception.filter';
|
import { GrpcToHttpExceptionFilter } from '../../error/grpc-to-http-exception.filter';
|
||||||
import { RequestUser, User } from 'src/decorators/user.decorator';
|
import { RequestUser, User } from 'src/decorators/user.decorator';
|
||||||
@@ -55,6 +56,7 @@ import jwt, { JwtPayload } from 'jsonwebtoken';
|
|||||||
import { LanguageEnum } from 'src/utils/languages.enum';
|
import { LanguageEnum } from 'src/utils/languages.enum';
|
||||||
import { Language } from 'src/decorators/language.decorator';
|
import { Language } from 'src/decorators/language.decorator';
|
||||||
import { ApiInternalOnlyEndpoint } from 'src/decorators/swagger.decorator';
|
import { ApiInternalOnlyEndpoint } from 'src/decorators/swagger.decorator';
|
||||||
|
import { ApiKeyService } from 'src/modules/api-key/api-key.service';
|
||||||
|
|
||||||
type CookiesValues = {
|
type CookiesValues = {
|
||||||
accessToken?: string;
|
accessToken?: string;
|
||||||
@@ -74,6 +76,7 @@ export class AuthController {
|
|||||||
@Inject(DadosferaLogger)
|
@Inject(DadosferaLogger)
|
||||||
dadosferaLogger: DadosferaLogger,
|
dadosferaLogger: DadosferaLogger,
|
||||||
private authClient: AuthClientService,
|
private authClient: AuthClientService,
|
||||||
|
private apiKeyService: ApiKeyService,
|
||||||
) {
|
) {
|
||||||
this.logger = dadosferaLogger.logger;
|
this.logger = dadosferaLogger.logger;
|
||||||
|
|
||||||
@@ -190,13 +193,14 @@ export class AuthController {
|
|||||||
) {
|
) {
|
||||||
this.logger.info('/auth - change-password');
|
this.logger.info('/auth - change-password');
|
||||||
|
|
||||||
const { oldPassword, newPassword } = body;
|
const { oldPassword, newPassword, totpCode } = body;
|
||||||
const { authorization: accessToken } = headers;
|
const { authorization: accessToken } = headers;
|
||||||
|
|
||||||
return this.authClient.changePassword({
|
return this.authClient.changePassword({
|
||||||
accessToken,
|
accessToken,
|
||||||
oldPassword,
|
oldPassword,
|
||||||
newPassword,
|
newPassword,
|
||||||
|
totpCode,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -214,7 +218,8 @@ export class AuthController {
|
|||||||
|
|
||||||
const { username } = body;
|
const { username } = body;
|
||||||
|
|
||||||
return this.authClient.resetPassword({ username }, metadata);
|
await this.authClient.resetPassword({ username }, metadata);
|
||||||
|
return { authProvider: process.env.AUTH_PROVIDER || 'cognito' };
|
||||||
}
|
}
|
||||||
|
|
||||||
@ApiInternalOnlyEndpoint()
|
@ApiInternalOnlyEndpoint()
|
||||||
@@ -474,12 +479,34 @@ export class AuthController {
|
|||||||
@Get('me')
|
@Get('me')
|
||||||
async getMe(@Req() req: Request, @Res() res: Response) {
|
async getMe(@Req() req: Request, @Res() res: Response) {
|
||||||
this.logger.info('GET /auth/me ')
|
this.logger.info('GET /auth/me ')
|
||||||
|
this.logger.info(JSON.stringify(req.headers));
|
||||||
|
|
||||||
|
// Check for API key header first
|
||||||
|
const apiKey = req.get('X-Api-key');
|
||||||
|
if (apiKey) {
|
||||||
|
this.logger.info('Authenticating via X-Api-key header');
|
||||||
|
const { api_key } = await this.apiKeyService.get(apiKey);
|
||||||
|
|
||||||
|
const userDto: UserDTO = {
|
||||||
|
id: api_key.user_id,
|
||||||
|
name: api_key.username,
|
||||||
|
email: api_key.username,
|
||||||
|
customer: {
|
||||||
|
id: api_key.customer_id,
|
||||||
|
name: api_key.customer_name,
|
||||||
|
tier: api_key.customer_tier,
|
||||||
|
},
|
||||||
|
permissions: [],
|
||||||
|
};
|
||||||
|
|
||||||
|
return res.status(200).json(userDto);
|
||||||
|
}
|
||||||
|
|
||||||
// Get token and headers
|
// Get token and headers
|
||||||
const accessToken = req.cookies['ddf-auth'];
|
const accessToken = req.cookies['ddf-auth'];
|
||||||
const refreshToken = req.cookies['ddf-refresh-auth'];
|
const refreshToken = req.cookies['ddf-refresh-auth'];
|
||||||
const userId = req.cookies['ddf-user-id'];
|
const userId = req.cookies['ddf-user-id'];
|
||||||
const resourceHost = req.headers["host"]
|
const resourceHost = req.headers["x-original-url"] as string || "" ;
|
||||||
|
|
||||||
const hasUserSession = Boolean(accessToken) && Boolean(userId);
|
const hasUserSession = Boolean(accessToken) && Boolean(userId);
|
||||||
this.logger.info('Has User Session: ' + hasUserSession);
|
this.logger.info('Has User Session: ' + hasUserSession);
|
||||||
|
|||||||
@@ -8,10 +8,11 @@ import { AuthClientService } from './auth.service';
|
|||||||
import { DucClient } from '../duc/client.config';
|
import { DucClient } from '../duc/client.config';
|
||||||
import { GoogleLoginStrategy } from './passport-strategies/google-strategy';
|
import { GoogleLoginStrategy } from './passport-strategies/google-strategy';
|
||||||
import { getOauthSecrets } from 'src/utils/OauthSecrets';
|
import { getOauthSecrets } from 'src/utils/OauthSecrets';
|
||||||
|
import { ApiKeyModule } from '../api-key/api-key.module';
|
||||||
const client = new DucClient();
|
const client = new DucClient();
|
||||||
|
|
||||||
@Module({
|
@Module({
|
||||||
imports: [ClientsModule.register([client.providerOptions])],
|
imports: [ClientsModule.register([client.providerOptions]), ApiKeyModule],
|
||||||
controllers: [AuthController],
|
controllers: [AuthController],
|
||||||
providers: [
|
providers: [
|
||||||
AuthClientService,
|
AuthClientService,
|
||||||
|
|||||||
@@ -143,6 +143,7 @@ export class AuthClientService implements OnModuleInit {
|
|||||||
accessToken,
|
accessToken,
|
||||||
oldPassword,
|
oldPassword,
|
||||||
newPassword,
|
newPassword,
|
||||||
|
totpCode,
|
||||||
}: AuthChangePasswordRequest) {
|
}: AuthChangePasswordRequest) {
|
||||||
this.logger.info('ChangePassword');
|
this.logger.info('ChangePassword');
|
||||||
|
|
||||||
@@ -151,6 +152,7 @@ export class AuthClientService implements OnModuleInit {
|
|||||||
accessToken,
|
accessToken,
|
||||||
oldPassword,
|
oldPassword,
|
||||||
newPassword,
|
newPassword,
|
||||||
|
totpCode,
|
||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -435,7 +437,8 @@ export class AuthClientService implements OnModuleInit {
|
|||||||
|
|
||||||
const userDto: UserDTO = {
|
const userDto: UserDTO = {
|
||||||
id: user.id,
|
id: user.id,
|
||||||
name: user.username,
|
name: user.name,
|
||||||
|
email: user.email,
|
||||||
jobTitle: user?.jobTitle || null,
|
jobTitle: user?.jobTitle || null,
|
||||||
department: user?.department || null,
|
department: user?.department || null,
|
||||||
hierarchy: user?.hierarchy || null,
|
hierarchy: user?.hierarchy || null,
|
||||||
@@ -444,6 +447,9 @@ export class AuthClientService implements OnModuleInit {
|
|||||||
name: payload.customer_name,
|
name: payload.customer_name,
|
||||||
tier: payload.customer_tier,
|
tier: payload.customer_tier,
|
||||||
},
|
},
|
||||||
|
// Raw permission seqids from the JWT. Consumers own the seqid->meaning
|
||||||
|
// mapping (e.g. Orchest's auth-server); Maestro reports them as-is.
|
||||||
|
permissions: payload.permissions ?? [],
|
||||||
};
|
};
|
||||||
|
|
||||||
return userDto;
|
return userDto;
|
||||||
|
|||||||
@@ -144,6 +144,7 @@ export interface BulkEditResponse {
|
|||||||
export type UserDTO = {
|
export type UserDTO = {
|
||||||
id: string,
|
id: string,
|
||||||
name: string,
|
name: string,
|
||||||
|
email: string,
|
||||||
jobTitle?: string,
|
jobTitle?: string,
|
||||||
department?: string,
|
department?: string,
|
||||||
hierarchy?: string,
|
hierarchy?: string,
|
||||||
@@ -151,5 +152,6 @@ export type UserDTO = {
|
|||||||
id: string,
|
id: string,
|
||||||
name: string,
|
name: string,
|
||||||
tier: string,
|
tier: string,
|
||||||
}
|
},
|
||||||
|
permissions: number[],
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ import {
|
|||||||
HttpStatus,
|
HttpStatus,
|
||||||
Res,
|
Res,
|
||||||
} from '@nestjs/common';
|
} from '@nestjs/common';
|
||||||
|
import { ValidationPipe } from '../../pipes/object-validation.pipe';
|
||||||
import {
|
import {
|
||||||
ApiCreatedResponse,
|
ApiCreatedResponse,
|
||||||
ApiHeaders,
|
ApiHeaders,
|
||||||
@@ -46,6 +47,7 @@ import {
|
|||||||
IMakeAComment,
|
IMakeAComment,
|
||||||
IOneDataAsset,
|
IOneDataAsset,
|
||||||
IPreviewResponse,
|
IPreviewResponse,
|
||||||
|
IUpdateCertificationStatusRequest,
|
||||||
IUpdateDataRequest,
|
IUpdateDataRequest,
|
||||||
TriggerCatalogReq,
|
TriggerCatalogReq,
|
||||||
TriggerCatalogRes,
|
TriggerCatalogRes,
|
||||||
@@ -83,6 +85,9 @@ export class CatalogController {
|
|||||||
PERMISSIONS_GROUPS.CATALOG.permissions.GET,
|
PERMISSIONS_GROUPS.CATALOG.permissions.GET,
|
||||||
PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER,
|
PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER,
|
||||||
)
|
)
|
||||||
|
@RequireModule(
|
||||||
|
DADOSFERA_MODULES_KEYS.CATALOG
|
||||||
|
)
|
||||||
async searchCatalog(
|
async searchCatalog(
|
||||||
@User() user: RequestUser,
|
@User() user: RequestUser,
|
||||||
@Query() query: ICatalogAllRequest,
|
@Query() query: ICatalogAllRequest,
|
||||||
@@ -122,6 +127,9 @@ export class CatalogController {
|
|||||||
PERMISSIONS_GROUPS.CATALOG.permissions.GET,
|
PERMISSIONS_GROUPS.CATALOG.permissions.GET,
|
||||||
PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER,
|
PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER,
|
||||||
)
|
)
|
||||||
|
@RequireModule(
|
||||||
|
DADOSFERA_MODULES_KEYS.CATALOG
|
||||||
|
)
|
||||||
async dowloadAsserts(
|
async dowloadAsserts(
|
||||||
@User() user: RequestUser,
|
@User() user: RequestUser,
|
||||||
@Query() query: ICatalogAllRequest,
|
@Query() query: ICatalogAllRequest,
|
||||||
@@ -165,6 +173,9 @@ export class CatalogController {
|
|||||||
|
|
||||||
@ApiInternalOnlyEndpoint()
|
@ApiInternalOnlyEndpoint()
|
||||||
@Get('data-asset')
|
@Get('data-asset')
|
||||||
|
@RequireModule(
|
||||||
|
DADOSFERA_MODULES_KEYS.CATALOG
|
||||||
|
)
|
||||||
async findByPipelineAndObject(@User() user: RequestUser, @Query() query) {
|
async findByPipelineAndObject(@User() user: RequestUser, @Query() query) {
|
||||||
const { username, user_id, customer_id, customer_name, permissions } = user;
|
const { username, user_id, customer_id, customer_name, permissions } = user;
|
||||||
const { pipeline, object } = query;
|
const { pipeline, object } = query;
|
||||||
@@ -223,6 +234,9 @@ export class CatalogController {
|
|||||||
PERMISSIONS_GROUPS.CATALOG.permissions.GET,
|
PERMISSIONS_GROUPS.CATALOG.permissions.GET,
|
||||||
PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER,
|
PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER,
|
||||||
)
|
)
|
||||||
|
@RequireModule(
|
||||||
|
DADOSFERA_MODULES_KEYS.CATALOG
|
||||||
|
)
|
||||||
async findAllTags(@Body() body) {
|
async findAllTags(@Body() body) {
|
||||||
this.logger.info(`/catalog - ON FIND ALL TAGS ROUTE`, {
|
this.logger.info(`/catalog - ON FIND ALL TAGS ROUTE`, {
|
||||||
user: body.info.user_id,
|
user: body.info.user_id,
|
||||||
@@ -241,11 +255,59 @@ export class CatalogController {
|
|||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Get('schemas')
|
||||||
|
@RequireSomePermission(
|
||||||
|
PERMISSIONS_GROUPS.CATALOG.permissions.GET,
|
||||||
|
PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER,
|
||||||
|
)
|
||||||
|
async findSchemas(@User() user: RequestUser) {
|
||||||
|
const { username, user_id, customer_id, customer_name } = user;
|
||||||
|
this.logger.info(`/catalog - ON FIND SCHEMAS ROUTE`, {
|
||||||
|
username,
|
||||||
|
customer_name,
|
||||||
|
});
|
||||||
|
|
||||||
|
const metadata = PackTheMetadata({
|
||||||
|
username,
|
||||||
|
user_id,
|
||||||
|
customer_id,
|
||||||
|
customer_name,
|
||||||
|
});
|
||||||
|
|
||||||
|
try {
|
||||||
|
const res = await this.catalogService.findSchemas(metadata);
|
||||||
|
return res;
|
||||||
|
} catch (error) {
|
||||||
|
throw new HttpException(error.message, HttpStatus.NOT_FOUND);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Get('custom-properties')
|
||||||
|
@RequireSomePermission(
|
||||||
|
PERMISSIONS_GROUPS.CATALOG.permissions.GET,
|
||||||
|
PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER,
|
||||||
|
)
|
||||||
|
async getCustomPropertyDefinitions(@User() user: RequestUser) {
|
||||||
|
const { customer_id, customer_name, user_id, username } = user;
|
||||||
|
const metadata = PackTheMetadata({
|
||||||
|
customer_id,
|
||||||
|
customer_name,
|
||||||
|
user_id,
|
||||||
|
username,
|
||||||
|
});
|
||||||
|
|
||||||
|
return this.catalogService.getCustomPropertyDefinitions(metadata);
|
||||||
|
}
|
||||||
|
|
||||||
@Get('data-asset/:id')
|
@Get('data-asset/:id')
|
||||||
@RequireSomePermission(
|
@RequireSomePermission(
|
||||||
PERMISSIONS_GROUPS.CATALOG.permissions.GET,
|
PERMISSIONS_GROUPS.CATALOG.permissions.GET,
|
||||||
PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER,
|
PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER,
|
||||||
)
|
)
|
||||||
|
@RequireModule(
|
||||||
|
DADOSFERA_MODULES_KEYS.CATALOG
|
||||||
|
)
|
||||||
async getDataAsset(
|
async getDataAsset(
|
||||||
@User() user: RequestUser,
|
@User() user: RequestUser,
|
||||||
@Param('id') id: string,
|
@Param('id') id: string,
|
||||||
@@ -357,6 +419,9 @@ export class CatalogController {
|
|||||||
PERMISSIONS_GROUPS.CATALOG.permissions.GET,
|
PERMISSIONS_GROUPS.CATALOG.permissions.GET,
|
||||||
PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER,
|
PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER,
|
||||||
)
|
)
|
||||||
|
@RequireModule(
|
||||||
|
DADOSFERA_MODULES_KEYS.CATALOG
|
||||||
|
)
|
||||||
async getDataAssetColumnsMetadata(
|
async getDataAssetColumnsMetadata(
|
||||||
@User() user: RequestUser,
|
@User() user: RequestUser,
|
||||||
@Language() language: LanguageEnum,
|
@Language() language: LanguageEnum,
|
||||||
@@ -388,6 +453,9 @@ export class CatalogController {
|
|||||||
PERMISSIONS_GROUPS.CATALOG.permissions.GET,
|
PERMISSIONS_GROUPS.CATALOG.permissions.GET,
|
||||||
PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER,
|
PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER,
|
||||||
)
|
)
|
||||||
|
@RequireModule(
|
||||||
|
DADOSFERA_MODULES_KEYS.CATALOG
|
||||||
|
)
|
||||||
async getDataAssetPreview(
|
async getDataAssetPreview(
|
||||||
@User() user: RequestUser,
|
@User() user: RequestUser,
|
||||||
@Language() language: LanguageEnum,
|
@Language() language: LanguageEnum,
|
||||||
@@ -419,6 +487,9 @@ export class CatalogController {
|
|||||||
PERMISSIONS_GROUPS.CATALOG.permissions.GET,
|
PERMISSIONS_GROUPS.CATALOG.permissions.GET,
|
||||||
PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER,
|
PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER,
|
||||||
)
|
)
|
||||||
|
@RequireModule(
|
||||||
|
DADOSFERA_MODULES_KEYS.CATALOG
|
||||||
|
)
|
||||||
async getDataAssetDocs(
|
async getDataAssetDocs(
|
||||||
@User() user: RequestUser,
|
@User() user: RequestUser,
|
||||||
@Language() language: LanguageEnum,
|
@Language() language: LanguageEnum,
|
||||||
@@ -450,6 +521,9 @@ export class CatalogController {
|
|||||||
PERMISSIONS_GROUPS.CATALOG.permissions.UPDATE,
|
PERMISSIONS_GROUPS.CATALOG.permissions.UPDATE,
|
||||||
PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER,
|
PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER,
|
||||||
)
|
)
|
||||||
|
@RequireModule(
|
||||||
|
DADOSFERA_MODULES_KEYS.CATALOG
|
||||||
|
)
|
||||||
async updateDataAsset(
|
async updateDataAsset(
|
||||||
@User() user: RequestUser,
|
@User() user: RequestUser,
|
||||||
@Language() language: LanguageEnum,
|
@Language() language: LanguageEnum,
|
||||||
@@ -465,6 +539,8 @@ export class CatalogController {
|
|||||||
language,
|
language,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
delete (body as any).certification_status;
|
||||||
|
|
||||||
const result = await this.catalogService.updateOneDataAsset({
|
const result = await this.catalogService.updateOneDataAsset({
|
||||||
body,
|
body,
|
||||||
data_asset_id,
|
data_asset_id,
|
||||||
@@ -478,11 +554,44 @@ export class CatalogController {
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Put('data-asset/:id/certification-status')
|
||||||
|
@RequireSomePermission(
|
||||||
|
PERMISSIONS_GROUPS.CATALOG.permissions.CERTIFY,
|
||||||
|
PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER,
|
||||||
|
)
|
||||||
|
@RequireModule(
|
||||||
|
DADOSFERA_MODULES_KEYS.CATALOG
|
||||||
|
)
|
||||||
|
async updateDataAssetCertificationStatus(
|
||||||
|
@User() user: RequestUser,
|
||||||
|
@Language() language: LanguageEnum,
|
||||||
|
@Param('id') data_asset_id: string,
|
||||||
|
@Body(new ValidationPipe()) body: IUpdateCertificationStatusRequest,
|
||||||
|
): Promise<IUpdateCertificationStatusRequest> {
|
||||||
|
const { customer_id, customer_name, user_id, username } = user;
|
||||||
|
const metadata = PackTheMetadata({
|
||||||
|
customer_id,
|
||||||
|
customer_name,
|
||||||
|
user_id,
|
||||||
|
username,
|
||||||
|
language,
|
||||||
|
});
|
||||||
|
|
||||||
|
return this.catalogService.updateCertificationStatus({
|
||||||
|
body,
|
||||||
|
data_asset_id,
|
||||||
|
metadata,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
@Post('data-asset/:id/docs')
|
@Post('data-asset/:id/docs')
|
||||||
@RequireSomePermission(
|
@RequireSomePermission(
|
||||||
PERMISSIONS_GROUPS.CATALOG.permissions.UPDATE,
|
PERMISSIONS_GROUPS.CATALOG.permissions.UPDATE,
|
||||||
PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER,
|
PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER,
|
||||||
)
|
)
|
||||||
|
@RequireModule(
|
||||||
|
DADOSFERA_MODULES_KEYS.CATALOG
|
||||||
|
)
|
||||||
async manageDataAssetDocs(
|
async manageDataAssetDocs(
|
||||||
@User() user: RequestUser,
|
@User() user: RequestUser,
|
||||||
@Headers() headers,
|
@Headers() headers,
|
||||||
@@ -520,6 +629,9 @@ export class CatalogController {
|
|||||||
|
|
||||||
@ApiInternalOnlyEndpoint()
|
@ApiInternalOnlyEndpoint()
|
||||||
@Put('data-asset/:id/manage-permissions')
|
@Put('data-asset/:id/manage-permissions')
|
||||||
|
@RequireModule(
|
||||||
|
DADOSFERA_MODULES_KEYS.CATALOG
|
||||||
|
)
|
||||||
async manageDataAssetPermissions(
|
async manageDataAssetPermissions(
|
||||||
@Param('id') id: string,
|
@Param('id') id: string,
|
||||||
@User() user: RequestUser,
|
@User() user: RequestUser,
|
||||||
@@ -542,6 +654,9 @@ export class CatalogController {
|
|||||||
|
|
||||||
@ApiInternalOnlyEndpoint()
|
@ApiInternalOnlyEndpoint()
|
||||||
@Put('data-asset/:id/revoke-permissions')
|
@Put('data-asset/:id/revoke-permissions')
|
||||||
|
@RequireModule(
|
||||||
|
DADOSFERA_MODULES_KEYS.CATALOG
|
||||||
|
)
|
||||||
async revokeDataAssetPermissions(
|
async revokeDataAssetPermissions(
|
||||||
@Param('id') id: string,
|
@Param('id') id: string,
|
||||||
@User() user: RequestUser,
|
@User() user: RequestUser,
|
||||||
@@ -567,6 +682,9 @@ export class CatalogController {
|
|||||||
PERMISSIONS_GROUPS.CATALOG.permissions.CREATE,
|
PERMISSIONS_GROUPS.CATALOG.permissions.CREATE,
|
||||||
PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER,
|
PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER,
|
||||||
)
|
)
|
||||||
|
@RequireModule(
|
||||||
|
DADOSFERA_MODULES_KEYS.CATALOG
|
||||||
|
)
|
||||||
async createDataAsset(
|
async createDataAsset(
|
||||||
@User() user: RequestUser,
|
@User() user: RequestUser,
|
||||||
@Body() body: ICreateDataAsset,
|
@Body() body: ICreateDataAsset,
|
||||||
@@ -591,6 +709,9 @@ export class CatalogController {
|
|||||||
PERMISSIONS_GROUPS.CATALOG.permissions.UPDATE,
|
PERMISSIONS_GROUPS.CATALOG.permissions.UPDATE,
|
||||||
PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER,
|
PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER,
|
||||||
)
|
)
|
||||||
|
@RequireModule(
|
||||||
|
DADOSFERA_MODULES_KEYS.CATALOG
|
||||||
|
)
|
||||||
async commentOnDataAsset(
|
async commentOnDataAsset(
|
||||||
@Param('id') id: string,
|
@Param('id') id: string,
|
||||||
@User() user: RequestUser,
|
@User() user: RequestUser,
|
||||||
@@ -617,6 +738,9 @@ export class CatalogController {
|
|||||||
PERMISSIONS_GROUPS.CATALOG.permissions.DELETE,
|
PERMISSIONS_GROUPS.CATALOG.permissions.DELETE,
|
||||||
PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER,
|
PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER,
|
||||||
)
|
)
|
||||||
|
@RequireModule(
|
||||||
|
DADOSFERA_MODULES_KEYS.CATALOG
|
||||||
|
)
|
||||||
async deleteDataAsset(@Param('id') id: string, @User() user: RequestUser) {
|
async deleteDataAsset(@Param('id') id: string, @User() user: RequestUser) {
|
||||||
const { customer_id, customer_name, user_id, username } = user;
|
const { customer_id, customer_name, user_id, username } = user;
|
||||||
const metadata = PackTheMetadata({
|
const metadata = PackTheMetadata({
|
||||||
@@ -638,6 +762,9 @@ export class CatalogController {
|
|||||||
PERMISSIONS_GROUPS.CATALOG.permissions.UPDATE,
|
PERMISSIONS_GROUPS.CATALOG.permissions.UPDATE,
|
||||||
PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER,
|
PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER,
|
||||||
)
|
)
|
||||||
|
@RequireModule(
|
||||||
|
DADOSFERA_MODULES_KEYS.CATALOG
|
||||||
|
)
|
||||||
async deleteComment(
|
async deleteComment(
|
||||||
@Param('id') id: string,
|
@Param('id') id: string,
|
||||||
@User() user: RequestUser,
|
@User() user: RequestUser,
|
||||||
@@ -791,6 +918,9 @@ export class CatalogController {
|
|||||||
|
|
||||||
@Get('nimbus-dashboards')
|
@Get('nimbus-dashboards')
|
||||||
@RequireAllPermissions(PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER)
|
@RequireAllPermissions(PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER)
|
||||||
|
@RequireModule(
|
||||||
|
DADOSFERA_MODULES_KEYS.CATALOG
|
||||||
|
)
|
||||||
async getNimbusDashboards(
|
async getNimbusDashboards(
|
||||||
@User() user: RequestUser,
|
@User() user: RequestUser,
|
||||||
@Body() body: GetNimbusDashboardsRequest,
|
@Body() body: GetNimbusDashboardsRequest,
|
||||||
|
|||||||
@@ -5,20 +5,17 @@ import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
|
|||||||
import { CatalogController } from './catalog.controller';
|
import { CatalogController } from './catalog.controller';
|
||||||
import { CatalogClientConfiguration } from './catalog-client';
|
import { CatalogClientConfiguration } from './catalog-client';
|
||||||
import { ClientsModule } from '@nestjs/microservices';
|
import { ClientsModule } from '@nestjs/microservices';
|
||||||
import { PipelinesModule as OldPipelineModule } from 'src/modules/pipelines/pipelines.module';
|
|
||||||
import { UsersModule } from '../users/users.module';
|
import { UsersModule } from '../users/users.module';
|
||||||
import { RolesModule } from '../roles/roles.module';
|
import { RolesModule } from '../roles/roles.module';
|
||||||
import { CustomersModule } from '../customers/customers.module';
|
import { CustomersModule } from '../customers/customers.module';
|
||||||
import { ShareModule } from './share/share.module';
|
import { ShareModule } from './share/share.module';
|
||||||
import { CatalogService } from './catalog.service';
|
import { CatalogService } from './catalog.service';
|
||||||
import { MixpanelModule } from '../mixpanel/mixpanel.module';
|
|
||||||
|
|
||||||
const client = new CatalogClientConfiguration();
|
const client = new CatalogClientConfiguration();
|
||||||
|
|
||||||
@Module({
|
@Module({
|
||||||
imports: [
|
imports: [
|
||||||
ClientsModule.register([client.providerOptions]),
|
ClientsModule.register([client.providerOptions]),
|
||||||
OldPipelineModule,
|
|
||||||
UsersModule,
|
UsersModule,
|
||||||
RolesModule,
|
RolesModule,
|
||||||
CustomersModule,
|
CustomersModule,
|
||||||
|
|||||||
@@ -29,6 +29,7 @@ import {
|
|||||||
AssetReporter,
|
AssetReporter,
|
||||||
BatchRemoveRlsRulesRequest,
|
BatchRemoveRlsRulesRequest,
|
||||||
CreateDataDocsDTO,
|
CreateDataDocsDTO,
|
||||||
|
IUpdateCertificationStatusRequest,
|
||||||
IUpdateDataRequest,
|
IUpdateDataRequest,
|
||||||
TriggerCatalogReq,
|
TriggerCatalogReq,
|
||||||
} from './dtos';
|
} from './dtos';
|
||||||
@@ -41,7 +42,6 @@ import {
|
|||||||
import { TypeParser } from 'src/utils/FileParser/parser-types';
|
import { TypeParser } from 'src/utils/FileParser/parser-types';
|
||||||
import { ParserBuilder } from 'src/utils/FileParser/parser.builder';
|
import { ParserBuilder } from 'src/utils/FileParser/parser.builder';
|
||||||
|
|
||||||
|
|
||||||
class CatalogService implements OnModuleInit {
|
class CatalogService implements OnModuleInit {
|
||||||
catalogReadService: ReadService.CatalogReadServices;
|
catalogReadService: ReadService.CatalogReadServices;
|
||||||
catalogWriteService: WriteService.CatalogWriteServices;
|
catalogWriteService: WriteService.CatalogWriteServices;
|
||||||
@@ -58,7 +58,6 @@ class CatalogService implements OnModuleInit {
|
|||||||
this.logger = dadosferaLogger.logger;
|
this.logger = dadosferaLogger.logger;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
onModuleInit() {
|
onModuleInit() {
|
||||||
this.catalogReadService =
|
this.catalogReadService =
|
||||||
this.grpcClient.getService<ReadService.CatalogReadServices>(
|
this.grpcClient.getService<ReadService.CatalogReadServices>(
|
||||||
@@ -74,81 +73,69 @@ class CatalogService implements OnModuleInit {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
_getNimbusUrl(body) {
|
_getNimbusUrl(body) {
|
||||||
this.logger.debug(`Body: ${JSON.stringify(body)}`);
|
this.logger.debug(`Body: ${JSON.stringify(body)}`);
|
||||||
const customer = body.info.customer.toLowerCase();
|
const customer = body.info.customer.toLowerCase();
|
||||||
|
|
||||||
|
|
||||||
if (process.env.ENV === 'prd') {
|
if (process.env.ENV === 'prd') {
|
||||||
return `https://nimbus-${customer}.dadosfera.ai`;
|
return `https://nimbus-${customer}.dadosfera.ai`;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
return `https://nimbus-${customer}.${process.env.ENV.replace(
|
return `https://nimbus-${customer}.${process.env.ENV.replace(
|
||||||
'local',
|
'local',
|
||||||
'stg',
|
'stg',
|
||||||
)}.dadosfera.ai`;
|
)}.dadosfera.ai`;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
async getPiiReporter(metadata: Metadata, type: TypeParser) {
|
async getPiiReporter(metadata: Metadata, type: TypeParser) {
|
||||||
this.logger.info('getPiiReporter: ' + type)
|
this.logger.info('getPiiReporter: ' + type);
|
||||||
try {
|
try {
|
||||||
const {
|
const { data } = await lastValueFrom(
|
||||||
data
|
this.catalogWriteService.GetPiiReporter({}, metadata),
|
||||||
} = await lastValueFrom(
|
);
|
||||||
this.catalogWriteService.GetPiiReporter({}, metadata)
|
this.logger.info('Finish grpc call');
|
||||||
)
|
|
||||||
this.logger.info("Finish grpc call")
|
|
||||||
|
|
||||||
|
|
||||||
const parser = ParserBuilder.build<PiiMetadata>(type);
|
const parser = ParserBuilder.build<PiiMetadata>(type);
|
||||||
|
|
||||||
|
this.logger.info('parser file to: ' + type);
|
||||||
this.logger.info('parser file to: ' + type)
|
const file = await parser.parse(data);
|
||||||
const file = await parser.parse(data)
|
this.logger.info('finish parser');
|
||||||
this.logger.info('finish parser')
|
|
||||||
const mimeTypes: Record<TypeParser, string> = {
|
const mimeTypes: Record<TypeParser, string> = {
|
||||||
'csv': 'text/csv',
|
csv: 'text/csv',
|
||||||
'html': 'text/html',
|
html: 'text/html',
|
||||||
'pdf': 'application/pdf'
|
pdf: 'application/pdf',
|
||||||
}
|
};
|
||||||
|
|
||||||
|
|
||||||
const timestamp = new Date().toISOString().replace(/[:.]/g, '-');
|
const timestamp = new Date().toISOString().replace(/[:.]/g, '-');
|
||||||
const filename = `relatorio-pii-${timestamp}.${type}`;
|
const filename = `relatorio-pii-${timestamp}.${type}`;
|
||||||
|
|
||||||
|
|
||||||
return {
|
return {
|
||||||
file,
|
file,
|
||||||
filename: filename,
|
filename: filename,
|
||||||
type: mimeTypes[type]
|
type: mimeTypes[type],
|
||||||
}
|
};
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
this.logger.error(error.message);
|
this.logger.error(error.message);
|
||||||
throw error;
|
throw error;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async getCustomPropertyDefinitions(metadata: Metadata) {
|
||||||
|
return lastValueFrom(this.catalogReadService.GetCustomPropertyDefinitions({}, metadata));
|
||||||
|
}
|
||||||
|
|
||||||
async createDataAsset(data: Messages.CreateDataAssetRequest, metadata) {
|
async createDataAsset(data: Messages.CreateDataAssetRequest, metadata) {
|
||||||
this.logger.info('CatalogService - Manage Data assets permissions');
|
this.logger.info('CatalogService - Manage Data assets permissions');
|
||||||
if (!data.embed) data.embed = undefined;
|
if (!data.embed) data.embed = undefined;
|
||||||
|
|
||||||
|
|
||||||
return lastValueFrom(
|
return lastValueFrom(
|
||||||
this.catalogWriteService.CreateDataAsset(data, metadata),
|
this.catalogWriteService.CreateDataAsset(data, metadata),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
async managePermissions(data: Messages.ManagePermissionRequest, metadata) {
|
async managePermissions(data: Messages.ManagePermissionRequest, metadata) {
|
||||||
this.logger.info('CatalogService - Manage Data assets permissions');
|
this.logger.info('CatalogService - Manage Data assets permissions');
|
||||||
|
|
||||||
|
|
||||||
return lastValueFrom(
|
return lastValueFrom(
|
||||||
this.catalogWriteService.ManagePermission(data, metadata),
|
this.catalogWriteService.ManagePermission(data, metadata),
|
||||||
).catch((err) => {
|
).catch((err) => {
|
||||||
@@ -159,11 +146,9 @@ class CatalogService implements OnModuleInit {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
async revokePermissions(data: Messages.RevokePermissionRequest, metadata) {
|
async revokePermissions(data: Messages.RevokePermissionRequest, metadata) {
|
||||||
this.logger.info('CatalogService - Manage Data assets permissions');
|
this.logger.info('CatalogService - Manage Data assets permissions');
|
||||||
|
|
||||||
|
|
||||||
return lastValueFrom(
|
return lastValueFrom(
|
||||||
this.catalogWriteService.RevokePermission(data, metadata),
|
this.catalogWriteService.RevokePermission(data, metadata),
|
||||||
).catch((err) => {
|
).catch((err) => {
|
||||||
@@ -174,11 +159,9 @@ class CatalogService implements OnModuleInit {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
async commentOnDataAsset(data: Messages.MakeACommentRequest, metadata) {
|
async commentOnDataAsset(data: Messages.MakeACommentRequest, metadata) {
|
||||||
this.logger.info('CatalogService - Manage Data assets permissions');
|
this.logger.info('CatalogService - Manage Data assets permissions');
|
||||||
|
|
||||||
|
|
||||||
return lastValueFrom(
|
return lastValueFrom(
|
||||||
this.catalogWriteService.MakeAComment(data, metadata),
|
this.catalogWriteService.MakeAComment(data, metadata),
|
||||||
).catch((err) => {
|
).catch((err) => {
|
||||||
@@ -189,11 +172,9 @@ class CatalogService implements OnModuleInit {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
async deleteComment(data: Messages.UpdateACommentRequest, metadata) {
|
async deleteComment(data: Messages.UpdateACommentRequest, metadata) {
|
||||||
this.logger.info('CatalogService - Manage Data assets permissions');
|
this.logger.info('CatalogService - Manage Data assets permissions');
|
||||||
|
|
||||||
|
|
||||||
return lastValueFrom(
|
return lastValueFrom(
|
||||||
this.catalogWriteService.UpdateAComment(data, metadata),
|
this.catalogWriteService.UpdateAComment(data, metadata),
|
||||||
).catch((err) => {
|
).catch((err) => {
|
||||||
@@ -204,11 +185,9 @@ class CatalogService implements OnModuleInit {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
async deleteDataAsset(data: Messages.DeleteDataAssetRequest, metadata) {
|
async deleteDataAsset(data: Messages.DeleteDataAssetRequest, metadata) {
|
||||||
this.logger.info('CatalogService - Manage Data assets permissions');
|
this.logger.info('CatalogService - Manage Data assets permissions');
|
||||||
|
|
||||||
|
|
||||||
return lastValueFrom(
|
return lastValueFrom(
|
||||||
this.catalogWriteService.DeleteDataAsset(data, metadata),
|
this.catalogWriteService.DeleteDataAsset(data, metadata),
|
||||||
).catch((err) => {
|
).catch((err) => {
|
||||||
@@ -219,30 +198,96 @@ class CatalogService implements OnModuleInit {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
async getUserRolesIds(userId: string) {
|
async getUserRolesIds(userId: string) {
|
||||||
const result = await this.userService.findOneById(userId).catch(() => null);
|
const result = await this.userService.findOneById(userId).catch(() => null);
|
||||||
|
|
||||||
|
|
||||||
if (result) {
|
if (result) {
|
||||||
return result.user.roles.map((role) => role.id);
|
return result.user.roles.map((role) => role.id);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
async searchDataAssets(
|
async searchDataAssets(
|
||||||
query: Record<string, any>,
|
query: Record<string, any>,
|
||||||
metadata: Metadata,
|
metadata: Metadata,
|
||||||
customer_id: string,
|
customer_id: string,
|
||||||
) {
|
) {
|
||||||
this.logger.info('CatalogService - searchDataAssets');
|
this.logger.info('CatalogService - searchDataAssets', { query });
|
||||||
|
|
||||||
|
|
||||||
const { search, page, size, sort_by, order, ...filters } = query;
|
const { search, page, size, sort_by, order, ...filters } = query;
|
||||||
|
|
||||||
|
this.logger.debug('Extracted filters:', { filters });
|
||||||
|
|
||||||
|
if (
|
||||||
|
filters.manually !== undefined &&
|
||||||
|
filters.manually !== null &&
|
||||||
|
filters.manually !== ''
|
||||||
|
) {
|
||||||
|
filters.manually = Number(filters.manually); // 1 ou 0
|
||||||
|
} else {
|
||||||
|
delete filters.manually;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (filters.owner) {
|
||||||
|
const { users: customer_users } =
|
||||||
|
await this.userService.findAllUsersByCustomerId(customer_id);
|
||||||
|
|
||||||
|
this.logger.info('Available users in database count:', {
|
||||||
|
count: customer_users.length,
|
||||||
|
});
|
||||||
|
this.logger.info('First 5 users:', {
|
||||||
|
users: customer_users
|
||||||
|
.slice(0, 5)
|
||||||
|
.map((u) => ({ id: u.id, email: u.email, name: u.name })),
|
||||||
|
});
|
||||||
|
|
||||||
|
const ownerValues = Array.isArray(filters.owner)
|
||||||
|
? filters.owner
|
||||||
|
: typeof filters.owner === 'string' && filters.owner.includes(',')
|
||||||
|
? filters.owner.split(',').map((o: string) => o.trim())
|
||||||
|
: [filters.owner];
|
||||||
|
|
||||||
|
this.logger.info('Owner values to convert:', {
|
||||||
|
ownerValues,
|
||||||
|
ownerFiltersOriginal: filters.owner,
|
||||||
|
});
|
||||||
|
|
||||||
|
const ownerIds = ownerValues
|
||||||
|
.map((ownerValue: string) => {
|
||||||
|
const normalizedOwner = ownerValue.replace(/\s/g, '+');
|
||||||
|
const user = customer_users.find((u) => {
|
||||||
|
const isIdMatch = u.id === ownerValue;
|
||||||
|
const isEmailMatch =
|
||||||
|
u.email === ownerValue || u.email === normalizedOwner;
|
||||||
|
const isNameMatch =
|
||||||
|
u.name === ownerValue || u.name === normalizedOwner;
|
||||||
|
this.logger.info('Comparing:', {
|
||||||
|
userId: u.id,
|
||||||
|
userEmail: u.email,
|
||||||
|
userName: u.name,
|
||||||
|
filterValue: ownerValue,
|
||||||
|
normalizedFilter: normalizedOwner,
|
||||||
|
idMatch: isIdMatch,
|
||||||
|
emailMatch: isEmailMatch,
|
||||||
|
nameMatch: isNameMatch,
|
||||||
|
});
|
||||||
|
return isIdMatch || isEmailMatch || isNameMatch;
|
||||||
|
});
|
||||||
|
this.logger.info('Looking for owner result:', {
|
||||||
|
ownerValue,
|
||||||
|
found: !!user,
|
||||||
|
userId: user?.id,
|
||||||
|
});
|
||||||
|
return user?.id || ownerValue;
|
||||||
|
})
|
||||||
|
.filter((id: string) => id);
|
||||||
|
|
||||||
|
if (ownerIds.length > 0) {
|
||||||
|
filters.owner = ownerIds;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
const { data_assets, total } = await lastValueFrom(
|
const { data_assets, total } = await lastValueFrom(
|
||||||
this.catalogReadService.GetAllDataAssets(
|
this.catalogReadService.GetAllDataAssets(
|
||||||
{
|
{
|
||||||
@@ -257,20 +302,18 @@ class CatalogService implements OnModuleInit {
|
|||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
|
||||||
|
console.log('MAESTRO RECEBEU RESPOSTA DO PI-FACTORY');
|
||||||
|
|
||||||
const result = JSON.parse(data_assets);
|
const result = JSON.parse(data_assets);
|
||||||
|
|
||||||
|
|
||||||
const response = await this.getAssetsUsersAndRoles(
|
const response = await this.getAssetsUsersAndRoles(
|
||||||
result.data_assets,
|
result.data_assets,
|
||||||
customer_id,
|
customer_id,
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
||||||
return { data_assets: response, total };
|
return { data_assets: response, total };
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
async downloadAssets(
|
async downloadAssets(
|
||||||
query: Record<string, any>,
|
query: Record<string, any>,
|
||||||
metadata: Metadata,
|
metadata: Metadata,
|
||||||
@@ -278,33 +321,27 @@ class CatalogService implements OnModuleInit {
|
|||||||
) {
|
) {
|
||||||
const data = await this.searchDataAssets(query, metadata, customer_id);
|
const data = await this.searchDataAssets(query, metadata, customer_id);
|
||||||
|
|
||||||
|
const formatData = data.data_assets.map((asset) => ({
|
||||||
const formatData = data.data_assets.map(asset => ({
|
|
||||||
id: asset.id,
|
id: asset.id,
|
||||||
display_name: asset.display_name,
|
display_name: asset.display_name,
|
||||||
data_asset_type: asset.data_asset_type,
|
data_asset_type: asset.data_asset_type,
|
||||||
created_at: asset.created_at,
|
created_at: asset.created_at,
|
||||||
tags: '[' + asset.tags.join(', ') + ']'
|
tags: '[' + asset.tags.join(', ') + ']',
|
||||||
}))
|
}));
|
||||||
|
|
||||||
|
|
||||||
const parser = ParserBuilder.build<AssetReporter>('csv');
|
const parser = ParserBuilder.build<AssetReporter>('csv');
|
||||||
|
|
||||||
|
|
||||||
const file = await parser.parse(formatData);
|
const file = await parser.parse(formatData);
|
||||||
|
|
||||||
|
|
||||||
const timestamp = new Date().toISOString().replace(/[:.]/g, '-');
|
const timestamp = new Date().toISOString().replace(/[:.]/g, '-');
|
||||||
const filename = `dadosfera_assets_${timestamp}.csv`;
|
const filename = `dadosfera_assets_${timestamp}.csv`;
|
||||||
|
|
||||||
|
|
||||||
return {
|
return {
|
||||||
file,
|
file,
|
||||||
filename
|
filename,
|
||||||
}
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
async getOneDataAsset(data: {
|
async getOneDataAsset(data: {
|
||||||
id: string;
|
id: string;
|
||||||
customer_id: string;
|
customer_id: string;
|
||||||
@@ -325,11 +362,9 @@ class CatalogService implements OnModuleInit {
|
|||||||
};
|
};
|
||||||
asset = await this.getAssetsUsersAndRoles([asset], customer_id);
|
asset = await this.getAssetsUsersAndRoles([asset], customer_id);
|
||||||
|
|
||||||
|
|
||||||
return { data_asset: asset[0] };
|
return { data_asset: asset[0] };
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
async getOneDataAssetByPipelineAndObject(data: {
|
async getOneDataAssetByPipelineAndObject(data: {
|
||||||
customer_id: string;
|
customer_id: string;
|
||||||
pipeline: string;
|
pipeline: string;
|
||||||
@@ -351,10 +386,30 @@ class CatalogService implements OnModuleInit {
|
|||||||
};
|
};
|
||||||
asset = await this.getAssetsUsersAndRoles([asset], customer_id);
|
asset = await this.getAssetsUsersAndRoles([asset], customer_id);
|
||||||
|
|
||||||
|
|
||||||
return { data_asset: asset[0] };
|
return { data_asset: asset[0] };
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async updateCertificationStatus(data: {
|
||||||
|
data_asset_id: string;
|
||||||
|
body: IUpdateCertificationStatusRequest;
|
||||||
|
metadata: Metadata;
|
||||||
|
}) {
|
||||||
|
const { body, data_asset_id, metadata } = data;
|
||||||
|
|
||||||
|
await lastValueFrom(
|
||||||
|
this.catalogWriteService.UpdateDataAsset(
|
||||||
|
{
|
||||||
|
id: data_asset_id,
|
||||||
|
changes: JSON.stringify({
|
||||||
|
certification_status: body.certification_status,
|
||||||
|
}),
|
||||||
|
},
|
||||||
|
metadata,
|
||||||
|
),
|
||||||
|
);
|
||||||
|
|
||||||
|
return { certification_status: body.certification_status };
|
||||||
|
}
|
||||||
|
|
||||||
async updateOneDataAsset(data: {
|
async updateOneDataAsset(data: {
|
||||||
data_asset_id: string;
|
data_asset_id: string;
|
||||||
@@ -364,7 +419,6 @@ class CatalogService implements OnModuleInit {
|
|||||||
}) {
|
}) {
|
||||||
const { body, customer_id, data_asset_id, metadata } = data;
|
const { body, customer_id, data_asset_id, metadata } = data;
|
||||||
|
|
||||||
|
|
||||||
const { data_asset } = await lastValueFrom(
|
const { data_asset } = await lastValueFrom(
|
||||||
this.catalogWriteService.UpdateDataAsset(
|
this.catalogWriteService.UpdateDataAsset(
|
||||||
{ id: data_asset_id, changes: JSON.stringify(body) },
|
{ id: data_asset_id, changes: JSON.stringify(body) },
|
||||||
@@ -379,7 +433,6 @@ class CatalogService implements OnModuleInit {
|
|||||||
};
|
};
|
||||||
asset = await this.getAssetsUsersAndRoles([asset], customer_id);
|
asset = await this.getAssetsUsersAndRoles([asset], customer_id);
|
||||||
|
|
||||||
|
|
||||||
return { data_asset: asset[0] };
|
return { data_asset: asset[0] };
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -392,7 +445,6 @@ class CatalogService implements OnModuleInit {
|
|||||||
return docs;
|
return docs;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
async getDatasetPreview(id: string, metadata: Metadata) {
|
async getDatasetPreview(id: string, metadata: Metadata) {
|
||||||
const { preview } = await lastValueFrom(
|
const { preview } = await lastValueFrom(
|
||||||
this.catalogReadService.GetDatasetPreview(
|
this.catalogReadService.GetDatasetPreview(
|
||||||
@@ -404,7 +456,6 @@ class CatalogService implements OnModuleInit {
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
async getDatasetColumnsMetadata(id: string, metadata: Metadata) {
|
async getDatasetColumnsMetadata(id: string, metadata: Metadata) {
|
||||||
const { columns_metadata } = await lastValueFrom(
|
const { columns_metadata } = await lastValueFrom(
|
||||||
this.catalogReadService.GetDatasetColumnsMetadata(
|
this.catalogReadService.GetDatasetColumnsMetadata(
|
||||||
@@ -434,7 +485,6 @@ class CatalogService implements OnModuleInit {
|
|||||||
return data;
|
return data;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private async createDataDocsViaGrpc(body: CreateDataDocsDTO, metadata: Metadata) {
|
private async createDataDocsViaGrpc(body: CreateDataDocsDTO, metadata: Metadata) {
|
||||||
this.logger.info('Creating data docs via gRPC for other asset types');
|
this.logger.info('Creating data docs via gRPC for other asset types');
|
||||||
try {
|
try {
|
||||||
@@ -449,7 +499,6 @@ class CatalogService implements OnModuleInit {
|
|||||||
);
|
);
|
||||||
|
|
||||||
return response;
|
return response;
|
||||||
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
this.logger.error('Error creating data asset docs:', error);
|
this.logger.error('Error creating data asset docs:', error);
|
||||||
throw new HttpException(
|
throw new HttpException(
|
||||||
@@ -462,7 +511,6 @@ class CatalogService implements OnModuleInit {
|
|||||||
async findAllTags(data, metadata) {
|
async findAllTags(data, metadata) {
|
||||||
this.logger.info('CatalogService - findAllCustomerTags');
|
this.logger.info('CatalogService - findAllCustomerTags');
|
||||||
|
|
||||||
|
|
||||||
const response = await lastValueFrom(
|
const response = await lastValueFrom(
|
||||||
this.catalogReadService.GetCustomerTags(data, metadata),
|
this.catalogReadService.GetCustomerTags(data, metadata),
|
||||||
)
|
)
|
||||||
@@ -475,9 +523,25 @@ class CatalogService implements OnModuleInit {
|
|||||||
throw new Error(err);
|
throw new Error(err);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
return response;
|
return response;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async findSchemas(metadata: Metadata) {
|
||||||
|
this.logger.info('CatalogService - findSchemas');
|
||||||
|
|
||||||
|
try {
|
||||||
|
const response = await lastValueFrom(
|
||||||
|
this.catalogReadService.GetSchemas({}, metadata),
|
||||||
|
);
|
||||||
|
|
||||||
|
return response;
|
||||||
|
|
||||||
|
} catch (error) {
|
||||||
|
this.logger.error('Error fetching schemas:', error);
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
async getAssetsUsersAndRoles(data_assets: Array<any>, customer_id: string) {
|
async getAssetsUsersAndRoles(data_assets: Array<any>, customer_id: string) {
|
||||||
const { users: customer_users } =
|
const { users: customer_users } =
|
||||||
await this.userService.findAllUsersByCustomerId(customer_id);
|
await this.userService.findAllUsersByCustomerId(customer_id);
|
||||||
@@ -490,17 +554,15 @@ class CatalogService implements OnModuleInit {
|
|||||||
(u) => u.id === data_asset.owner,
|
(u) => u.id === data_asset.owner,
|
||||||
)?.email;
|
)?.email;
|
||||||
|
|
||||||
|
|
||||||
const roles = [];
|
const roles = [];
|
||||||
const users = [];
|
const users = [];
|
||||||
const data_asset_roles = data_asset?.roles || []
|
const data_asset_roles = data_asset?.roles || [];
|
||||||
for (const role_id of data_asset_roles) {
|
for (const role_id of data_asset_roles) {
|
||||||
const role = customer_roles.find((r) => r.id === role_id);
|
const role = customer_roles.find((r) => r.id === role_id);
|
||||||
if (role) roles.push({ id: role.id, name: role.name });
|
if (role) roles.push({ id: role.id, name: role.name });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const data_asset_users = data_asset?.users || [];
|
||||||
const data_asset_users = data_asset?.users || []
|
|
||||||
for (const user_id of data_asset_users) {
|
for (const user_id of data_asset_users) {
|
||||||
const user = customer_users.find((r) => r.id === user_id);
|
const user = customer_users.find((r) => r.id === user_id);
|
||||||
if (user) users.push({ id: user.id, email: user.email });
|
if (user) users.push({ id: user.id, email: user.email });
|
||||||
@@ -514,7 +576,6 @@ class CatalogService implements OnModuleInit {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
async triggerCatalog(data: TriggerCatalogReq, metadata: Metadata) {
|
async triggerCatalog(data: TriggerCatalogReq, metadata: Metadata) {
|
||||||
const { session } = await lastValueFrom(
|
const { session } = await lastValueFrom(
|
||||||
this.catalogWriteService.TriggerDatasetCataloging(data, metadata),
|
this.catalogWriteService.TriggerDatasetCataloging(data, metadata),
|
||||||
@@ -528,7 +589,6 @@ class CatalogService implements OnModuleInit {
|
|||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
async addRlsRule(data: AddRlsRuleRequest, metadata: Metadata) {
|
async addRlsRule(data: AddRlsRuleRequest, metadata: Metadata) {
|
||||||
const res = await lastValueFrom(
|
const res = await lastValueFrom(
|
||||||
this.catalogWriteService.AddRlsRule(data, metadata),
|
this.catalogWriteService.AddRlsRule(data, metadata),
|
||||||
@@ -536,7 +596,6 @@ class CatalogService implements OnModuleInit {
|
|||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
async removeRlsRule(id: number, metadata: Metadata) {
|
async removeRlsRule(id: number, metadata: Metadata) {
|
||||||
const res = await lastValueFrom(
|
const res = await lastValueFrom(
|
||||||
this.catalogWriteService.RemoveRlsRule({ id }, metadata),
|
this.catalogWriteService.RemoveRlsRule({ id }, metadata),
|
||||||
@@ -544,14 +603,12 @@ class CatalogService implements OnModuleInit {
|
|||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
async batchRemoveRlsRule(
|
async batchRemoveRlsRule(
|
||||||
query: BatchRemoveRlsRulesRequest,
|
query: BatchRemoveRlsRulesRequest,
|
||||||
metadata: Metadata,
|
metadata: Metadata,
|
||||||
) {
|
) {
|
||||||
const { id_rls, nimbus_dashboard_id } = query;
|
const { id_rls, nimbus_dashboard_id } = query;
|
||||||
|
|
||||||
|
|
||||||
if (id_rls && nimbus_dashboard_id) {
|
if (id_rls && nimbus_dashboard_id) {
|
||||||
throw new BadRequestException(
|
throw new BadRequestException(
|
||||||
"You can't delete using both parameters. Choose either 'id_rls' or 'nimbus_dashboard_id'",
|
"You can't delete using both parameters. Choose either 'id_rls' or 'nimbus_dashboard_id'",
|
||||||
@@ -572,7 +629,6 @@ class CatalogService implements OnModuleInit {
|
|||||||
return 'OK';
|
return 'OK';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
async getRlsRules(data: GetRlsRulesRequest, metadata: Metadata) {
|
async getRlsRules(data: GetRlsRulesRequest, metadata: Metadata) {
|
||||||
const res = await lastValueFrom(
|
const res = await lastValueFrom(
|
||||||
this.catalogReadService.GetRlsRules(data, metadata),
|
this.catalogReadService.GetRlsRules(data, metadata),
|
||||||
@@ -580,7 +636,6 @@ class CatalogService implements OnModuleInit {
|
|||||||
return res.rls_rules;
|
return res.rls_rules;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
async getOneRlsRule(id: number, metadata: Metadata) {
|
async getOneRlsRule(id: number, metadata: Metadata) {
|
||||||
const res = await lastValueFrom(
|
const res = await lastValueFrom(
|
||||||
this.catalogReadService.GetOneRlsRule({ id }, metadata),
|
this.catalogReadService.GetOneRlsRule({ id }, metadata),
|
||||||
@@ -588,7 +643,6 @@ class CatalogService implements OnModuleInit {
|
|||||||
return res.rls_rule;
|
return res.rls_rule;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
async getNimbusDashboards(
|
async getNimbusDashboards(
|
||||||
data: GetNimbusDashboardsRequest,
|
data: GetNimbusDashboardsRequest,
|
||||||
metadata: Metadata,
|
metadata: Metadata,
|
||||||
@@ -599,88 +653,99 @@ class CatalogService implements OnModuleInit {
|
|||||||
return res.dashboards;
|
return res.dashboards;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
async createTableMetadata(body: any): Promise<number> {
|
async createTableMetadata(body: any): Promise<number> {
|
||||||
const nimbusUrl = this._getNimbusUrl(body);
|
const nimbusUrl = this._getNimbusUrl(body);
|
||||||
this.logger.info(`Nimbus URL: ${nimbusUrl}`, {...body.logMetadata});
|
this.logger.info(`Nimbus URL: ${nimbusUrl}`, { ...body.logMetadata });
|
||||||
|
|
||||||
|
|
||||||
const endpoint = `${nimbusUrl}/api/catalog/table-metadata/`;
|
const endpoint = `${nimbusUrl}/api/catalog/table-metadata/`;
|
||||||
|
|
||||||
|
this.logger.info(
|
||||||
this.logger.info(`Creating table metadata for table ${body.table_metadata.table_name}`, {...body.logMetadata});
|
`Creating table metadata for table ${body.table_metadata.table_name}`,
|
||||||
this.logger.info(`Using endpoint: ${endpoint}`, {...body.logMetadata});
|
{ ...body.logMetadata },
|
||||||
this.logger.debug(`Payload: ${JSON.stringify(body.table_metadata)}`, {...body.logMetadata});
|
);
|
||||||
|
this.logger.info(`Using endpoint: ${endpoint}`, { ...body.logMetadata });
|
||||||
|
this.logger.debug(`Payload: ${JSON.stringify(body.table_metadata)}`, {
|
||||||
|
...body.logMetadata,
|
||||||
|
});
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const { data, status } = await axios.post(endpoint, {...body.table_metadata});
|
const { data, status } = await axios.post(endpoint, {
|
||||||
|
...body.table_metadata,
|
||||||
|
});
|
||||||
|
|
||||||
this.logger.info(
|
this.logger.info(
|
||||||
`Table metadata created successfully with status ${status} for table ${body.table_metadata.table_name}`,
|
`Table metadata created successfully with status ${status} for table ${body.table_metadata.table_name}`,
|
||||||
{...body.logMetadata},
|
{ ...body.logMetadata },
|
||||||
);
|
);
|
||||||
return data.id;
|
return data.id;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
this.logger.error(
|
this.logger.error(
|
||||||
`Failed to create table metadata for table ${body.table_metadata.table_name} failed with status ${
|
`Failed to create table metadata for table ${body.table_metadata.table_name} failed with status ${
|
||||||
error.response?.status
|
error.response?.status
|
||||||
} because of ${JSON.stringify(error.response?.data) || error.message}`, {...body.logMetadata});
|
} because of ${JSON.stringify(error.response?.data) || error.message}`,
|
||||||
|
{ ...body.logMetadata },
|
||||||
|
);
|
||||||
throw new Error(error.response?.data?.message || error.message);
|
throw new Error(error.response?.data?.message || error.message);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
async createColumnMetadata(body: any): Promise<number[]> {
|
async createColumnMetadata(body: any): Promise<number[]> {
|
||||||
const nimbusUrl = this._getNimbusUrl(body);
|
const nimbusUrl = this._getNimbusUrl(body);
|
||||||
this.logger.info(`Nimbus URL: ${nimbusUrl}`, body.logMetadata);
|
this.logger.info(`Nimbus URL: ${nimbusUrl}`, body.logMetadata);
|
||||||
const endpoint = `${nimbusUrl}/api/catalog/column-metadata/`;
|
const endpoint = `${nimbusUrl}/api/catalog/column-metadata/`;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
this.logger.info(`Creating column metadata for table ${body.column_metadata.table_name}`, {...body.logMetadata});
|
this.logger.info(
|
||||||
this.logger.info(`Using endpoint: ${endpoint}`, {...body.logMetadata});
|
`Creating column metadata for table ${body.column_metadata.table_name}`,
|
||||||
this.logger.debug(`Payload: ${JSON.stringify(body.column_metadata)}`, {...body.logMetadata});
|
{ ...body.logMetadata },
|
||||||
const { data, status } = await axios.post(endpoint, body.column_metadata);
|
);
|
||||||
|
this.logger.info(`Using endpoint: ${endpoint}`, { ...body.logMetadata });
|
||||||
|
this.logger.debug(
|
||||||
|
`Payload: ${JSON.stringify(body.column_metadata)}`,
|
||||||
|
{ ...body.logMetadata },
|
||||||
|
);
|
||||||
|
const { data, status } = await axios.post(
|
||||||
|
endpoint,
|
||||||
|
body.column_metadata,
|
||||||
|
);
|
||||||
|
|
||||||
this.logger.info(
|
this.logger.info(
|
||||||
`Column metadata created successfully with status ${status} for table ${body.column_metadata.table_name}`,
|
`Column metadata created successfully with status ${status} for table ${body.column_metadata.table_name}`,
|
||||||
{...body.logMetadata},
|
{ ...body.logMetadata },
|
||||||
);
|
);
|
||||||
return data.map((column) => column.id);
|
return data.map((column) => column.id);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
this.logger.error(
|
this.logger.error(
|
||||||
`Failed to create column metadata failed with status for table ${body.column_metadata.table_name} ${
|
`Failed to create column metadata failed with status for table ${body.column_metadata.table_name} ${
|
||||||
error.response?.status
|
error.response?.status
|
||||||
} because of ${error.response?.data || error.message}`, {...body.logMetadata});
|
} because of ${error.response?.data || error.message}`,
|
||||||
|
{ ...body.logMetadata },
|
||||||
|
);
|
||||||
throw new Error(error.response?.data?.message || error.message);
|
throw new Error(error.response?.data?.message || error.message);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
async createDataPreview(body: any): Promise<number> {
|
async createDataPreview(body: any): Promise<number> {
|
||||||
const nimbusUrl = this._getNimbusUrl(body);
|
const nimbusUrl = this._getNimbusUrl(body);
|
||||||
this.logger.info(`Nimbus URL: ${nimbusUrl}`, {...body.logMetadata});
|
this.logger.info(`Nimbus URL: ${nimbusUrl}`, { ...body.logMetadata });
|
||||||
const endpoint = `${nimbusUrl}/api/catalog/data-preview/`;
|
const endpoint = `${nimbusUrl}/api/catalog/data-preview/`;
|
||||||
|
|
||||||
|
this.logger.info(
|
||||||
this.logger.info(`Creating data preview for table ${body.data_preview.table_name}`, {...body.logMetadata});
|
`Creating data preview for table ${body.data_preview.table_name}`,
|
||||||
this.logger.info(`Using endpoint: ${endpoint}`, {...body.logMetadata});
|
{ ...body.logMetadata },
|
||||||
this.logger.debug(`Payload: ${JSON.stringify(body.data_preview)}`, {...body.logMetadata});
|
);
|
||||||
|
this.logger.info(`Using endpoint: ${endpoint}`, { ...body.logMetadata });
|
||||||
|
this.logger.debug(
|
||||||
|
`Payload: ${JSON.stringify(body.data_preview)}`,
|
||||||
|
{ ...body.logMetadata },
|
||||||
|
);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const { data, status } = await axios.post(endpoint, body.data_preview);
|
const { data, status } = await axios.post(endpoint, body.data_preview);
|
||||||
|
|
||||||
|
|
||||||
this.logger.info(
|
this.logger.info(
|
||||||
`Data preview created successfully with status ${status} for table ${body.data_preview.table_name}`,
|
`Data preview created successfully with status ${status} for table ${body.data_preview.table_name}`,
|
||||||
{...body.logMetadata},
|
{ ...body.logMetadata },
|
||||||
);
|
);
|
||||||
return data.id;
|
return data.id;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
@@ -688,17 +753,73 @@ class CatalogService implements OnModuleInit {
|
|||||||
`Failed to create data preview for table ${body.data_preview.table_name} failed with status ${
|
`Failed to create data preview for table ${body.data_preview.table_name} failed with status ${
|
||||||
error.response?.status
|
error.response?.status
|
||||||
} because of ${error.response?.data || error.message}`,
|
} because of ${error.response?.data || error.message}`,
|
||||||
{...body.logMetadata},
|
{ ...body.logMetadata },
|
||||||
);
|
);
|
||||||
throw new Error(error.response?.data?.message || error.message);
|
throw new Error(error.response?.data?.message || error.message);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async renameTableOnNimbus(
|
||||||
|
nimbusUrl: string,
|
||||||
|
nimbusId: number,
|
||||||
|
changes: { table_name?: string; table_schema?: string; display_name?: string },
|
||||||
|
): Promise<void> {
|
||||||
|
const endpoint = `${nimbusUrl}/api/catalog/table-metadata/${nimbusId}`;
|
||||||
|
this.logger.info(`Renaming table-metadata ${nimbusId} on Nimbus`, { endpoint, changes });
|
||||||
|
await axios.patch(endpoint, changes);
|
||||||
|
}
|
||||||
|
|
||||||
|
async renameColumnMetadataOnNimbus(
|
||||||
|
nimbusUrl: string,
|
||||||
|
databaseName: string,
|
||||||
|
oldTableName: string,
|
||||||
|
oldTableSchema: string,
|
||||||
|
newTableName: string,
|
||||||
|
newTableSchema: string,
|
||||||
|
): Promise<void> {
|
||||||
|
const listEndpoint = `${nimbusUrl}/api/catalog/column-metadata/?database_name=${encodeURIComponent(databaseName)}&table_name=${encodeURIComponent(oldTableName)}&table_schema=${encodeURIComponent(oldTableSchema)}`;
|
||||||
|
this.logger.info(`Fetching column-metadata records to rename`, { listEndpoint });
|
||||||
|
const { data: columns } = await axios.get(listEndpoint);
|
||||||
|
|
||||||
|
const filtered = Array.isArray(columns) ? columns : [];
|
||||||
|
|
||||||
|
for (const column of filtered) {
|
||||||
|
const patchEndpoint = `${nimbusUrl}/api/catalog/column-metadata/${column.id}`;
|
||||||
|
await axios.patch(patchEndpoint, {
|
||||||
|
table_name: newTableName,
|
||||||
|
table_schema: newTableSchema,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
this.logger.info(`Renamed ${filtered.length} column-metadata records on Nimbus`);
|
||||||
|
}
|
||||||
|
|
||||||
|
async renameDataPreviewOnNimbus(
|
||||||
|
nimbusUrl: string,
|
||||||
|
databaseName: string,
|
||||||
|
oldTableName: string,
|
||||||
|
oldTableSchema: string,
|
||||||
|
newTableName: string,
|
||||||
|
newTableSchema: string,
|
||||||
|
): Promise<void> {
|
||||||
|
const listEndpoint = `${nimbusUrl}/api/catalog/data-preview/?database_name=${encodeURIComponent(databaseName)}&table_name=${encodeURIComponent(oldTableName)}&table_schema=${encodeURIComponent(oldTableSchema)}`;
|
||||||
|
this.logger.info(`Fetching data-preview records to rename`, { listEndpoint });
|
||||||
|
const { data: previews } = await axios.get(listEndpoint);
|
||||||
|
|
||||||
|
const filtered = Array.isArray(previews) ? previews : [];
|
||||||
|
|
||||||
|
for (const preview of filtered) {
|
||||||
|
const patchEndpoint = `${nimbusUrl}/api/catalog/data-preview/${preview.id}`;
|
||||||
|
await axios.patch(patchEndpoint, {
|
||||||
|
table_name: newTableName,
|
||||||
|
table_schema: newTableSchema,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
this.logger.info(`Renamed ${filtered.length} data-preview records on Nimbus`);
|
||||||
|
}
|
||||||
|
|
||||||
async catalogDatasetItem(table_metadata_id: number, metadata: Metadata) {
|
async catalogDatasetItem(table_metadata_id: number, metadata: Metadata) {
|
||||||
const customer_name_raw = metadata.get('customer_name');
|
const customer_name_raw = metadata.get('customer_name');
|
||||||
|
|
||||||
|
|
||||||
const customer_name = customer_name_raw?.[0]?.toString();
|
const customer_name = customer_name_raw?.[0]?.toString();
|
||||||
if (!customer_name) {
|
if (!customer_name) {
|
||||||
throw new BadRequestException('Customer name not found in metadata');
|
throw new BadRequestException('Customer name not found in metadata');
|
||||||
@@ -721,5 +842,4 @@ class CatalogService implements OnModuleInit {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
export { CatalogService };
|
export { CatalogService };
|
||||||
|
|||||||
@@ -1,4 +1,10 @@
|
|||||||
import { ApiProperty, ApiPropertyOptional, PickType } from '@nestjs/swagger';
|
import { ApiProperty, ApiPropertyOptional, PickType } from '@nestjs/swagger';
|
||||||
|
import {
|
||||||
|
IsEnum,
|
||||||
|
IsNotEmpty,
|
||||||
|
IsOptional,
|
||||||
|
IsString,
|
||||||
|
} from 'class-validator';
|
||||||
import { CreateDataAssetRequest } from '@dadosfera/protospack-v2/dist/lib/Catalog/interfaces/messages';
|
import { CreateDataAssetRequest } from '@dadosfera/protospack-v2/dist/lib/Catalog/interfaces/messages';
|
||||||
|
|
||||||
export enum DataAssetShareType {
|
export enum DataAssetShareType {
|
||||||
@@ -6,6 +12,12 @@ export enum DataAssetShareType {
|
|||||||
public = 'public',
|
public = 'public',
|
||||||
private = 'private',
|
private = 'private',
|
||||||
}
|
}
|
||||||
|
export enum CertificationStatus {
|
||||||
|
draft = 'draft',
|
||||||
|
in_review = 'in_review',
|
||||||
|
approved = 'approved',
|
||||||
|
deprecated = 'deprecated',
|
||||||
|
}
|
||||||
export enum OrderEnum {
|
export enum OrderEnum {
|
||||||
asc = 'asc',
|
asc = 'asc',
|
||||||
desc = 'desc',
|
desc = 'desc',
|
||||||
@@ -98,6 +110,8 @@ export class IDataAsset {
|
|||||||
embed?: EmbedObject;
|
embed?: EmbedObject;
|
||||||
@ApiPropertyOptional({ enum: DataAssetShareType })
|
@ApiPropertyOptional({ enum: DataAssetShareType })
|
||||||
share_type?: DataAssetShareType;
|
share_type?: DataAssetShareType;
|
||||||
|
@ApiPropertyOptional()
|
||||||
|
docs?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
export class IOneDataAsset {
|
export class IOneDataAsset {
|
||||||
@@ -189,6 +203,27 @@ export class IData {
|
|||||||
day_opening: number;
|
day_opening: number;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
export enum CustomPropertyType {
|
||||||
|
TEXT = 'text',
|
||||||
|
NUMBER = 'number',
|
||||||
|
DATE = 'date',
|
||||||
|
BOOLEAN = 'boolean',
|
||||||
|
}
|
||||||
|
|
||||||
|
export class CustomPropertyDto {
|
||||||
|
@ApiProperty()
|
||||||
|
key: string;
|
||||||
|
@ApiProperty()
|
||||||
|
value: string;
|
||||||
|
@ApiProperty({ enum: CustomPropertyType })
|
||||||
|
type: CustomPropertyType;
|
||||||
|
@ApiPropertyOptional()
|
||||||
|
color?: string;
|
||||||
|
@ApiPropertyOptional()
|
||||||
|
emoji?: string;
|
||||||
|
}
|
||||||
|
|
||||||
export class IUpdateDataRequest {
|
export class IUpdateDataRequest {
|
||||||
@ApiProperty()
|
@ApiProperty()
|
||||||
name: string;
|
name: string;
|
||||||
@@ -200,7 +235,18 @@ export class IUpdateDataRequest {
|
|||||||
embed: EmbedObject;
|
embed: EmbedObject;
|
||||||
@ApiPropertyOptional({ enum: DataAssetShareType })
|
@ApiPropertyOptional({ enum: DataAssetShareType })
|
||||||
share_type?: DataAssetShareType;
|
share_type?: DataAssetShareType;
|
||||||
|
@ApiPropertyOptional()
|
||||||
|
docs?: string;
|
||||||
|
@ApiPropertyOptional({ type: [CustomPropertyDto] })
|
||||||
|
custom_properties?: CustomPropertyDto[];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export class IUpdateCertificationStatusRequest {
|
||||||
|
@ApiProperty({ enum: CertificationStatus })
|
||||||
|
@IsEnum(CertificationStatus)
|
||||||
|
certification_status: CertificationStatus;
|
||||||
|
}
|
||||||
|
|
||||||
export class ICreateDataAsset implements CreateDataAssetRequest {
|
export class ICreateDataAsset implements CreateDataAssetRequest {
|
||||||
@ApiProperty()
|
@ApiProperty()
|
||||||
display_name: string;
|
display_name: string;
|
||||||
@@ -214,6 +260,8 @@ export class ICreateDataAsset implements CreateDataAssetRequest {
|
|||||||
location: string;
|
location: string;
|
||||||
@ApiPropertyOptional()
|
@ApiPropertyOptional()
|
||||||
embed: EmbedObject;
|
embed: EmbedObject;
|
||||||
|
@ApiPropertyOptional()
|
||||||
|
docs: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
export class IPreview {
|
export class IPreview {
|
||||||
|
|||||||
@@ -262,6 +262,7 @@ export class ShareService implements OnModuleInit {
|
|||||||
user_id: accessTokenPayload.user_id,
|
user_id: accessTokenPayload.user_id,
|
||||||
username: accessTokenPayload.username,
|
username: accessTokenPayload.username,
|
||||||
permissions: accessTokenPayload.permissions,
|
permissions: accessTokenPayload.permissions,
|
||||||
|
roles: accessTokenPayload.roles,
|
||||||
customer_id: accessTokenPayload.customer_id,
|
customer_id: accessTokenPayload.customer_id,
|
||||||
customer_name: accessTokenPayload.customer_name,
|
customer_name: accessTokenPayload.customer_name,
|
||||||
customer_tier: accessTokenPayload.customer_tier,
|
customer_tier: accessTokenPayload.customer_tier,
|
||||||
|
|||||||
@@ -22,17 +22,24 @@ import {
|
|||||||
ConnectionTestListTablesRes,
|
ConnectionTestListTablesRes,
|
||||||
GetTableMetadataRes,
|
GetTableMetadataRes,
|
||||||
GetTableMetadataReq,
|
GetTableMetadataReq,
|
||||||
|
RefreshCatalogReq,
|
||||||
|
RefreshCatalogRes,
|
||||||
|
RefreshCatalogStatusReq,
|
||||||
} from './dto/connection-test';
|
} from './dto/connection-test';
|
||||||
import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
|
import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
|
||||||
import { Authenticated } from 'src/decorators/authentication.decorator';
|
import { Authenticated, RequireModule } from 'src/decorators/authentication.decorator';
|
||||||
import { GrpcToHttpExceptionFilter } from 'src/error/grpc-to-http-exception.filter';
|
import { GrpcToHttpExceptionFilter } from 'src/error/grpc-to-http-exception.filter';
|
||||||
import { ApiInternalOnlyController } from 'src/decorators/swagger.decorator';
|
import { ApiInternalOnlyController } from 'src/decorators/swagger.decorator';
|
||||||
|
import { DADOSFERA_MODULES_KEYS } from 'src/authentication/permissions.enum';
|
||||||
|
|
||||||
@ApiInternalOnlyController()
|
@ApiInternalOnlyController()
|
||||||
@ApiTags('Connection Test')
|
@ApiTags('Connection Test')
|
||||||
@Controller('connection-test')
|
@Controller('connection-test')
|
||||||
@UseFilters(new GrpcToHttpExceptionFilter())
|
@UseFilters(new GrpcToHttpExceptionFilter())
|
||||||
@Authenticated()
|
@Authenticated()
|
||||||
|
@RequireModule(
|
||||||
|
DADOSFERA_MODULES_KEYS.COLLECT
|
||||||
|
)
|
||||||
export class ConnectionTestController {
|
export class ConnectionTestController {
|
||||||
logger: any;
|
logger: any;
|
||||||
constructor(
|
constructor(
|
||||||
@@ -84,7 +91,7 @@ export class ConnectionTestController {
|
|||||||
});
|
});
|
||||||
return this.connectionTestService.connectionTestListSchemas(
|
return this.connectionTestService.connectionTestListSchemas(
|
||||||
body,
|
body,
|
||||||
user.customer_name,
|
user,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -101,7 +108,7 @@ export class ConnectionTestController {
|
|||||||
});
|
});
|
||||||
return this.connectionTestService.connectionTestListTables(
|
return this.connectionTestService.connectionTestListTables(
|
||||||
body,
|
body,
|
||||||
user.customer_name,
|
user,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -118,7 +125,38 @@ export class ConnectionTestController {
|
|||||||
});
|
});
|
||||||
return this.connectionTestService.getTableMetadata(
|
return this.connectionTestService.getTableMetadata(
|
||||||
body,
|
body,
|
||||||
user.customer_name,
|
user,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Post('refresh-catalog')
|
||||||
|
@ApiOkResponse({ type: RefreshCatalogRes })
|
||||||
|
@HttpCode(HttpStatus.ACCEPTED)
|
||||||
|
async refreshCatalog(
|
||||||
|
@User() user: RequestUser,
|
||||||
|
@Body(new ValidationPipe()) body: RefreshCatalogReq,
|
||||||
|
) {
|
||||||
|
this.logger.info('/connection-test/refresh-catalog', {
|
||||||
|
user: user.user_id,
|
||||||
|
customer: user.customer_name,
|
||||||
|
connection: body.connection_id,
|
||||||
|
});
|
||||||
|
return this.connectionTestService.refreshCatalog(body, user);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Post('refresh-catalog/status')
|
||||||
|
@ApiOkResponse({ type: RefreshCatalogRes })
|
||||||
|
@HttpCode(HttpStatus.OK)
|
||||||
|
async refreshCatalogStatus(
|
||||||
|
@User() user: RequestUser,
|
||||||
|
@Body(new ValidationPipe()) body: RefreshCatalogStatusReq,
|
||||||
|
) {
|
||||||
|
this.logger.info('/connection-test/refresh-catalog/status', {
|
||||||
|
user: user.user_id,
|
||||||
|
customer: user.customer_name,
|
||||||
|
connection: body.connection_id,
|
||||||
|
session: body.session_id,
|
||||||
|
});
|
||||||
|
return this.connectionTestService.refreshCatalogStatus(body, user);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,10 +5,17 @@ import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
|
|||||||
import { ClientsModule } from '@nestjs/microservices';
|
import { ClientsModule } from '@nestjs/microservices';
|
||||||
import { ConnectionTestClientConfiguration } from './connection-test-client.config';
|
import { ConnectionTestClientConfiguration } from './connection-test-client.config';
|
||||||
import { ConnectionModule } from '../connection/connection.module';
|
import { ConnectionModule } from '../connection/connection.module';
|
||||||
|
import { ConnectionsApiModule } from '../connections-api/connections-api.module';
|
||||||
|
import { PlatformApiModule } from '../platform-api/platform-api.module';
|
||||||
const client = new ConnectionTestClientConfiguration();
|
const client = new ConnectionTestClientConfiguration();
|
||||||
@Module({
|
@Module({
|
||||||
controllers: [ConnectionTestController],
|
controllers: [ConnectionTestController],
|
||||||
providers: [ConnectionTestService, DadosferaLogger],
|
providers: [ConnectionTestService, DadosferaLogger],
|
||||||
imports: [ClientsModule.register([client.providerOptions]), ConnectionModule],
|
imports: [
|
||||||
|
ClientsModule.register([client.providerOptions]),
|
||||||
|
ConnectionModule,
|
||||||
|
ConnectionsApiModule,
|
||||||
|
PlatformApiModule,
|
||||||
|
],
|
||||||
})
|
})
|
||||||
export class ConnectionTestModule {}
|
export class ConnectionTestModule {}
|
||||||
|
|||||||
@@ -0,0 +1,245 @@
|
|||||||
|
import { ConnectionTestService } from './connection-test.service';
|
||||||
|
import { RequestUser } from 'src/decorators/user.decorator';
|
||||||
|
|
||||||
|
describe('ConnectionTestService catalog cache', () => {
|
||||||
|
const user: RequestUser = {
|
||||||
|
user_id: 'user-id',
|
||||||
|
username: 'user@example.com',
|
||||||
|
permissions: [],
|
||||||
|
customer_id: 'customer-id',
|
||||||
|
customer_name: 'customer-name',
|
||||||
|
customer_tier: 'standard',
|
||||||
|
access_token: 'token',
|
||||||
|
customer_modules: [],
|
||||||
|
roles: [],
|
||||||
|
};
|
||||||
|
const grpcClient = { getService: jest.fn().mockReturnValue({}) };
|
||||||
|
const connectionsService = {};
|
||||||
|
const connectionsApiService = { proxy: jest.fn() };
|
||||||
|
const platformApiService = { proxy: jest.fn() };
|
||||||
|
let service: ConnectionTestService;
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
jest.clearAllMocks();
|
||||||
|
service = new ConnectionTestService(
|
||||||
|
grpcClient as any,
|
||||||
|
connectionsService as any,
|
||||||
|
connectionsApiService as any,
|
||||||
|
platformApiService as any,
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('keeps the existing schemas response contract', async () => {
|
||||||
|
connectionsApiService.proxy.mockResolvedValue({
|
||||||
|
schemas: [{ schema_name: 'analytics' }, { schema_name: 'public' }],
|
||||||
|
});
|
||||||
|
|
||||||
|
await expect(
|
||||||
|
service.connectionTestListSchemas(
|
||||||
|
{ connection_id: 'config-id', plugin: 'postgresql' },
|
||||||
|
user,
|
||||||
|
),
|
||||||
|
).resolves.toEqual({
|
||||||
|
operation_result: true,
|
||||||
|
schema_list: ['analytics', 'public'],
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('keeps the existing tables response contract', async () => {
|
||||||
|
connectionsApiService.proxy.mockResolvedValue({
|
||||||
|
tables: [{ table_name: 'customers' }, { table_name: 'orders' }],
|
||||||
|
});
|
||||||
|
|
||||||
|
await expect(
|
||||||
|
service.connectionTestListTables(
|
||||||
|
{
|
||||||
|
connection_id: 'config-id',
|
||||||
|
plugin: 'postgresql',
|
||||||
|
schema: 'public',
|
||||||
|
},
|
||||||
|
user,
|
||||||
|
),
|
||||||
|
).resolves.toEqual({
|
||||||
|
operation_result: true,
|
||||||
|
table_list: ['customers', 'orders'],
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('maps cached columns and derives references from the engine allowlist', async () => {
|
||||||
|
connectionsApiService.proxy.mockResolvedValue({
|
||||||
|
columns: [
|
||||||
|
{
|
||||||
|
column_name: 'id',
|
||||||
|
data_type: 'bigint',
|
||||||
|
is_primary_key: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
column_name: 'name',
|
||||||
|
data_type: 'varchar',
|
||||||
|
is_primary_key: false,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
});
|
||||||
|
platformApiService.proxy.mockResolvedValue({
|
||||||
|
allowed_datatypes: [
|
||||||
|
{ engine: 'postgresql', allowed_datatypes: ['bigint', 'timestamp'] },
|
||||||
|
],
|
||||||
|
});
|
||||||
|
|
||||||
|
await expect(
|
||||||
|
service.getTableMetadata(
|
||||||
|
{
|
||||||
|
connection_id: 'config-id',
|
||||||
|
plugin: 'postgresql',
|
||||||
|
schema: 'public',
|
||||||
|
table_list: ['customers'],
|
||||||
|
},
|
||||||
|
user,
|
||||||
|
),
|
||||||
|
).resolves.toEqual({
|
||||||
|
operation_result: true,
|
||||||
|
tables_metadata: [
|
||||||
|
{
|
||||||
|
table_name: 'customers',
|
||||||
|
columns: [
|
||||||
|
{ name: 'id', type: 'bigint', is_primary_key: true },
|
||||||
|
{ name: 'name', type: 'varchar', is_primary_key: false },
|
||||||
|
],
|
||||||
|
references: [{ name: 'id', type: 'bigint', is_primary_key: true }],
|
||||||
|
},
|
||||||
|
],
|
||||||
|
});
|
||||||
|
expect(connectionsApiService.proxy).toHaveBeenCalledWith(
|
||||||
|
'GET',
|
||||||
|
'/connection_catalog/config-id/schemas/public/tables/customers/columns',
|
||||||
|
user,
|
||||||
|
);
|
||||||
|
expect(platformApiService.proxy).toHaveBeenCalledWith(
|
||||||
|
'GET',
|
||||||
|
'/jobs/jdbc/configs/allowed_datatypes',
|
||||||
|
user,
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('returns empty references when the allowlist call fails', async () => {
|
||||||
|
connectionsApiService.proxy.mockResolvedValue({
|
||||||
|
columns: [{ column_name: 'id', data_type: 'bigint', is_primary_key: true }],
|
||||||
|
});
|
||||||
|
platformApiService.proxy.mockRejectedValue(new Error('platform down'));
|
||||||
|
|
||||||
|
await expect(
|
||||||
|
service.getTableMetadata(
|
||||||
|
{
|
||||||
|
connection_id: 'config-id',
|
||||||
|
plugin: 'postgresql',
|
||||||
|
schema: 'public',
|
||||||
|
table_list: ['customers'],
|
||||||
|
},
|
||||||
|
user,
|
||||||
|
),
|
||||||
|
).resolves.toEqual({
|
||||||
|
operation_result: true,
|
||||||
|
tables_metadata: [
|
||||||
|
{
|
||||||
|
table_name: 'customers',
|
||||||
|
columns: [{ name: 'id', type: 'bigint', is_primary_key: true }],
|
||||||
|
references: [],
|
||||||
|
},
|
||||||
|
],
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('submits a catalog refresh without holding the request open', async () => {
|
||||||
|
platformApiService.proxy.mockResolvedValue({
|
||||||
|
session_id: 'session-id',
|
||||||
|
date: '20260731',
|
||||||
|
});
|
||||||
|
|
||||||
|
await expect(
|
||||||
|
service.refreshCatalog(
|
||||||
|
{ connection_id: 'config-id', plugin: 'postgresql' },
|
||||||
|
user,
|
||||||
|
),
|
||||||
|
).resolves.toEqual({
|
||||||
|
operation_result: true,
|
||||||
|
status: 'PENDING',
|
||||||
|
session_id: 'session-id',
|
||||||
|
date: '20260731',
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(platformApiService.proxy).toHaveBeenCalledWith(
|
||||||
|
'POST',
|
||||||
|
'/connection_test',
|
||||||
|
user,
|
||||||
|
{
|
||||||
|
customer_id: user.customer_name,
|
||||||
|
plugin: 'postgresql',
|
||||||
|
task: {
|
||||||
|
task_type: 'refresh_catalog',
|
||||||
|
connection: {
|
||||||
|
provider: 'connection_manager',
|
||||||
|
config_id: 'config-id',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('keeps polling without changing the catalog pointer while pending', async () => {
|
||||||
|
platformApiService.proxy.mockResolvedValue({ status: 'PENDING' });
|
||||||
|
|
||||||
|
await expect(
|
||||||
|
service.refreshCatalogStatus(
|
||||||
|
{
|
||||||
|
connection_id: 'config-id',
|
||||||
|
plugin: 'postgresql',
|
||||||
|
session_id: 'session-id',
|
||||||
|
date: '20260731',
|
||||||
|
},
|
||||||
|
user,
|
||||||
|
),
|
||||||
|
).resolves.toEqual({
|
||||||
|
operation_result: false,
|
||||||
|
status: 'PENDING',
|
||||||
|
session_id: 'session-id',
|
||||||
|
date: '20260731',
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(connectionsApiService.proxy).not.toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('publishes the catalog pointer after the refresh finishes', async () => {
|
||||||
|
platformApiService.proxy.mockResolvedValue({ status: 'DONE' });
|
||||||
|
connectionsApiService.proxy.mockResolvedValue({
|
||||||
|
last_catalog_refresh_status: 'SUCCESS',
|
||||||
|
});
|
||||||
|
|
||||||
|
await expect(
|
||||||
|
service.refreshCatalogStatus(
|
||||||
|
{
|
||||||
|
connection_id: 'config/id',
|
||||||
|
plugin: 'postgresql',
|
||||||
|
session_id: 'session-id',
|
||||||
|
date: '20260731',
|
||||||
|
},
|
||||||
|
user,
|
||||||
|
),
|
||||||
|
).resolves.toEqual({
|
||||||
|
operation_result: true,
|
||||||
|
status: 'DONE',
|
||||||
|
session_id: 'session-id',
|
||||||
|
date: '20260731',
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(connectionsApiService.proxy).toHaveBeenCalledWith(
|
||||||
|
'PUT',
|
||||||
|
'/connection_config/config%2Fid/catalog_metadata',
|
||||||
|
user,
|
||||||
|
{
|
||||||
|
last_catalog_refresh_status: 'SUCCESS',
|
||||||
|
last_catalog_connection_test_date: '20260731',
|
||||||
|
last_catalog_connection_test_session_id: 'session-id',
|
||||||
|
},
|
||||||
|
);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
import { Inject, Injectable } from '@nestjs/common';
|
import { HttpException, HttpStatus, Inject, Injectable } from '@nestjs/common';
|
||||||
import { ClientGrpc } from '@nestjs/microservices';
|
import { ClientGrpc } from '@nestjs/microservices';
|
||||||
import { ConnectionTest } from '@dadosfera/protospack-v2';
|
import { ConnectionTest } from '@dadosfera/protospack-v2';
|
||||||
import { lastValueFrom } from 'rxjs';
|
import { lastValueFrom } from 'rxjs';
|
||||||
@@ -13,6 +13,9 @@ import {
|
|||||||
ConnectionTestPingRes,
|
ConnectionTestPingRes,
|
||||||
GetTableMetadataReq,
|
GetTableMetadataReq,
|
||||||
GetTableMetadataRes,
|
GetTableMetadataRes,
|
||||||
|
RefreshCatalogReq,
|
||||||
|
RefreshCatalogRes,
|
||||||
|
RefreshCatalogStatusReq,
|
||||||
} from './dto/connection-test';
|
} from './dto/connection-test';
|
||||||
import { ConnectionClientService } from '../connection/client.service';
|
import { ConnectionClientService } from '../connection/client.service';
|
||||||
import {
|
import {
|
||||||
@@ -21,6 +24,8 @@ import {
|
|||||||
} from '../connection/dtos/connection';
|
} from '../connection/dtos/connection';
|
||||||
import { RequestUser } from 'src/decorators/user.decorator';
|
import { RequestUser } from 'src/decorators/user.decorator';
|
||||||
import { PackTheMetadata } from 'src/utils/PackTheMetadata';
|
import { PackTheMetadata } from 'src/utils/PackTheMetadata';
|
||||||
|
import { ConnectionsApiService } from '../connections-api/connections-api.service';
|
||||||
|
import { PlatformApiService } from '../platform-api/platform-api.service';
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class ConnectionTestService {
|
export class ConnectionTestService {
|
||||||
@@ -28,6 +33,8 @@ export class ConnectionTestService {
|
|||||||
constructor(
|
constructor(
|
||||||
@Inject('ConnectionTestGrpcClient') private readonly grpcClient: ClientGrpc,
|
@Inject('ConnectionTestGrpcClient') private readonly grpcClient: ClientGrpc,
|
||||||
private connectionsService: ConnectionClientService,
|
private connectionsService: ConnectionClientService,
|
||||||
|
private connectionsApiService: ConnectionsApiService,
|
||||||
|
private platformApiService: PlatformApiService,
|
||||||
) {
|
) {
|
||||||
this.connectionTestReadClient =
|
this.connectionTestReadClient =
|
||||||
grpcClient.getService<ConnectionTest.ReadService.ConnectionTestReadServices>(
|
grpcClient.getService<ConnectionTest.ReadService.ConnectionTestReadServices>(
|
||||||
@@ -147,45 +154,155 @@ export class ConnectionTestService {
|
|||||||
}
|
}
|
||||||
async connectionTestListSchemas(
|
async connectionTestListSchemas(
|
||||||
body: ConnectionTestListSchemasReq,
|
body: ConnectionTestListSchemasReq,
|
||||||
customer_name: string,
|
user: RequestUser,
|
||||||
): Promise<ConnectionTestListSchemasRes> {
|
): Promise<ConnectionTestListSchemasRes> {
|
||||||
const { connection_id, plugin } = body;
|
const result = await this.connectionsApiService.proxy(
|
||||||
return lastValueFrom(
|
'GET',
|
||||||
this.connectionTestReadClient.ListSchemas({
|
`/connection_catalog/${encodeURIComponent(body.connection_id)}/schemas`,
|
||||||
connection_id,
|
user,
|
||||||
customer_name,
|
|
||||||
plugin,
|
|
||||||
}),
|
|
||||||
);
|
);
|
||||||
|
return {
|
||||||
|
operation_result: true,
|
||||||
|
schema_list: result.schemas.map((schema) => schema.schema_name),
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
async connectionTestListTables(
|
async connectionTestListTables(
|
||||||
body: ConnectionTestListTablesReq,
|
body: ConnectionTestListTablesReq,
|
||||||
customer_name: string,
|
user: RequestUser,
|
||||||
): Promise<ConnectionTestListTablesRes> {
|
): Promise<ConnectionTestListTablesRes> {
|
||||||
const { connection_id, plugin, schema } = body;
|
const result = await this.connectionsApiService.proxy(
|
||||||
return lastValueFrom(
|
'GET',
|
||||||
this.connectionTestReadClient.ListTables({
|
`/connection_catalog/${encodeURIComponent(body.connection_id)}` +
|
||||||
connection_id,
|
`/schemas/${encodeURIComponent(body.schema)}/tables`,
|
||||||
customer_name,
|
user,
|
||||||
plugin,
|
|
||||||
schema,
|
|
||||||
}),
|
|
||||||
);
|
);
|
||||||
|
return {
|
||||||
|
operation_result: true,
|
||||||
|
table_list: result.tables.map((table) => table.table_name),
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
async getTableMetadata(
|
async getTableMetadata(
|
||||||
body: GetTableMetadataReq,
|
body: GetTableMetadataReq,
|
||||||
customer_name: string,
|
user: RequestUser,
|
||||||
): Promise<GetTableMetadataRes> {
|
): Promise<GetTableMetadataRes> {
|
||||||
const { schema, plugin, table_list, connection_id } = body;
|
// Columns eligible as the incremental reference field are the ones whose
|
||||||
return lastValueFrom(
|
// data type is allowed for this engine (e.g. int/date/timestamp). The
|
||||||
this.connectionTestReadClient.GetTableMetadata({
|
// allowlist is owned by the platform API, keyed by engine === plugin.
|
||||||
connection_id,
|
const allowedByEngine = await this.platformApiService
|
||||||
customer_name,
|
.proxy('GET', '/jobs/jdbc/configs/allowed_datatypes', user)
|
||||||
plugin,
|
.catch(() => null);
|
||||||
schema,
|
const allowedDataTypes: string[] =
|
||||||
table_list,
|
allowedByEngine?.allowed_datatypes?.find(
|
||||||
|
(datatypes) => datatypes.engine === body.plugin,
|
||||||
|
)?.allowed_datatypes ?? [];
|
||||||
|
const allowedSet = new Set(
|
||||||
|
allowedDataTypes.map((type) => type.toLowerCase()),
|
||||||
|
);
|
||||||
|
|
||||||
|
const tables_metadata = await Promise.all(
|
||||||
|
body.table_list.map(async (table_name) => {
|
||||||
|
const result = await this.connectionsApiService.proxy(
|
||||||
|
'GET',
|
||||||
|
`/connection_catalog/${encodeURIComponent(body.connection_id)}` +
|
||||||
|
`/schemas/${encodeURIComponent(body.schema)}` +
|
||||||
|
`/tables/${encodeURIComponent(table_name)}/columns`,
|
||||||
|
user,
|
||||||
|
);
|
||||||
|
const columns = result.columns.map((column) => ({
|
||||||
|
name: column.column_name,
|
||||||
|
type: column.data_type,
|
||||||
|
is_primary_key: column.is_primary_key,
|
||||||
|
}));
|
||||||
|
const references = columns.filter((column) =>
|
||||||
|
allowedSet.has(String(column.type).toLowerCase()),
|
||||||
|
);
|
||||||
|
return {
|
||||||
|
table_name,
|
||||||
|
columns,
|
||||||
|
references,
|
||||||
|
};
|
||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
|
return { operation_result: true, tables_metadata };
|
||||||
|
}
|
||||||
|
|
||||||
|
async refreshCatalog(
|
||||||
|
body: RefreshCatalogReq,
|
||||||
|
user: RequestUser,
|
||||||
|
): Promise<RefreshCatalogRes> {
|
||||||
|
const task = await this.platformApiService.proxy(
|
||||||
|
'POST',
|
||||||
|
'/connection_test',
|
||||||
|
user,
|
||||||
|
{
|
||||||
|
customer_id: user.customer_name,
|
||||||
|
plugin: body.plugin,
|
||||||
|
task: {
|
||||||
|
task_type: 'refresh_catalog',
|
||||||
|
connection: {
|
||||||
|
provider: 'connection_manager',
|
||||||
|
config_id: body.connection_id,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
if (!task.session_id || !task.date) {
|
||||||
|
throw new HttpException(
|
||||||
|
'Platform API did not return a catalog refresh task identifier',
|
||||||
|
HttpStatus.BAD_GATEWAY,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
operation_result: true,
|
||||||
|
status: 'PENDING',
|
||||||
|
session_id: task.session_id,
|
||||||
|
date: task.date,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
async refreshCatalogStatus(
|
||||||
|
body: RefreshCatalogStatusReq,
|
||||||
|
user: RequestUser,
|
||||||
|
): Promise<RefreshCatalogRes> {
|
||||||
|
const result = await this.platformApiService.proxy(
|
||||||
|
'POST',
|
||||||
|
'/connection_test/status',
|
||||||
|
user,
|
||||||
|
{
|
||||||
|
session_id: body.session_id,
|
||||||
|
date: body.date,
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
if (result.status === 'DONE') {
|
||||||
|
await this.connectionsApiService.proxy(
|
||||||
|
'PUT',
|
||||||
|
`/connection_config/${encodeURIComponent(
|
||||||
|
body.connection_id,
|
||||||
|
)}/catalog_metadata`,
|
||||||
|
user,
|
||||||
|
{
|
||||||
|
last_catalog_refresh_status: 'SUCCESS',
|
||||||
|
last_catalog_connection_test_date: body.date,
|
||||||
|
last_catalog_connection_test_session_id: body.session_id,
|
||||||
|
},
|
||||||
|
);
|
||||||
|
} else if (result.status === 'ERROR' || result.status === 'EXPIRED') {
|
||||||
|
throw new HttpException(
|
||||||
|
`Catalog refresh finished with status ${result.status}`,
|
||||||
|
HttpStatus.BAD_GATEWAY,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
operation_result: result.status === 'DONE',
|
||||||
|
status: result.status,
|
||||||
|
session_id: body.session_id,
|
||||||
|
date: body.date,
|
||||||
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { ApiProperty, ApiPropertyOptional, OmitType } from '@nestjs/swagger';
|
import { ApiProperty, ApiPropertyOptional, OmitType } from '@nestjs/swagger';
|
||||||
import { IsString, IsOptional } from 'class-validator';
|
import { IsIn, IsString, IsOptional } from 'class-validator';
|
||||||
import { DatabaseConnectionPropertiesDto } from 'src/modules/connection/dtos/connection';
|
import { DatabaseConnectionPropertiesDto } from 'src/modules/connection/dtos/connection';
|
||||||
import { CreateConnectionDto } from 'src/modules/connection/dtos/connection';
|
import { CreateConnectionDto } from 'src/modules/connection/dtos/connection';
|
||||||
export class ColumnDto {
|
export class ColumnDto {
|
||||||
@@ -7,6 +7,8 @@ export class ColumnDto {
|
|||||||
name: string;
|
name: string;
|
||||||
@ApiProperty()
|
@ApiProperty()
|
||||||
type: string;
|
type: string;
|
||||||
|
@ApiProperty()
|
||||||
|
is_primary_key: boolean;
|
||||||
}
|
}
|
||||||
export class TableMetadataDto {
|
export class TableMetadataDto {
|
||||||
@ApiProperty()
|
@ApiProperty()
|
||||||
@@ -131,3 +133,37 @@ export class GetTableMetadataRes {
|
|||||||
@ApiProperty({ type: [TableMetadataDto] })
|
@ApiProperty({ type: [TableMetadataDto] })
|
||||||
tables_metadata: TableMetadataDto[];
|
tables_metadata: TableMetadataDto[];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export class RefreshCatalogReq {
|
||||||
|
@ApiProperty()
|
||||||
|
@IsString()
|
||||||
|
connection_id: string;
|
||||||
|
|
||||||
|
@ApiProperty({ enum: ['oracle', 'mysql', 'postgresql', 'sqlserver'] })
|
||||||
|
@IsIn(['oracle', 'mysql', 'postgresql', 'sqlserver'])
|
||||||
|
plugin: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export class RefreshCatalogStatusReq extends RefreshCatalogReq {
|
||||||
|
@ApiProperty()
|
||||||
|
@IsString()
|
||||||
|
session_id: string;
|
||||||
|
|
||||||
|
@ApiProperty()
|
||||||
|
@IsString()
|
||||||
|
date: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export class RefreshCatalogRes {
|
||||||
|
@ApiProperty()
|
||||||
|
operation_result: boolean;
|
||||||
|
|
||||||
|
@ApiProperty()
|
||||||
|
status: string;
|
||||||
|
|
||||||
|
@ApiProperty()
|
||||||
|
session_id: string;
|
||||||
|
|
||||||
|
@ApiProperty()
|
||||||
|
date: string;
|
||||||
|
}
|
||||||
|
|||||||
@@ -16,8 +16,9 @@ import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
|
|||||||
import {
|
import {
|
||||||
Authenticated,
|
Authenticated,
|
||||||
RequireAllPermissions,
|
RequireAllPermissions,
|
||||||
|
RequireModule,
|
||||||
} from 'src/decorators/authentication.decorator';
|
} from 'src/decorators/authentication.decorator';
|
||||||
import { PERMISSIONS_GROUPS } from 'src/authentication/permissions.enum';
|
import { DADOSFERA_MODULES_KEYS, PERMISSIONS_GROUPS } from 'src/authentication/permissions.enum';
|
||||||
import { RequestUser, User } from 'src/decorators/user.decorator';
|
import { RequestUser, User } from 'src/decorators/user.decorator';
|
||||||
import { ValidationPipe } from '../../pipes/object-validation.pipe';
|
import { ValidationPipe } from '../../pipes/object-validation.pipe';
|
||||||
import {
|
import {
|
||||||
@@ -39,6 +40,9 @@ const connectionPermissions = PERMISSIONS_GROUPS.CONNECTION.permissions;
|
|||||||
@ApiTags('connections')
|
@ApiTags('connections')
|
||||||
@Authenticated()
|
@Authenticated()
|
||||||
@Controller('connections')
|
@Controller('connections')
|
||||||
|
@RequireModule(
|
||||||
|
DADOSFERA_MODULES_KEYS.COLLECT
|
||||||
|
)
|
||||||
export class ConnectionController {
|
export class ConnectionController {
|
||||||
logger: any;
|
logger: any;
|
||||||
constructor(
|
constructor(
|
||||||
|
|||||||
@@ -0,0 +1,11 @@
|
|||||||
|
export const CONNECTIONS_API_CONFIG = {
|
||||||
|
getUrl: (): string => {
|
||||||
|
const url = process.env.CONNECTIONS_API_URL;
|
||||||
|
if (!url) {
|
||||||
|
throw new Error('CONNECTIONS_API_URL environment variable is not set');
|
||||||
|
}
|
||||||
|
return url;
|
||||||
|
},
|
||||||
|
region: process.env.AWS_REGION || 'us-east-1',
|
||||||
|
timeout: parseInt(process.env.CONNECTIONS_API_TIMEOUT || '30000', 10),
|
||||||
|
};
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
import { Module } from '@nestjs/common';
|
||||||
|
import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
|
||||||
|
|
||||||
|
import { ConnectionsApiService } from './connections-api.service';
|
||||||
|
|
||||||
|
@Module({
|
||||||
|
providers: [ConnectionsApiService, DadosferaLogger],
|
||||||
|
exports: [ConnectionsApiService],
|
||||||
|
})
|
||||||
|
export class ConnectionsApiModule {}
|
||||||
@@ -0,0 +1,99 @@
|
|||||||
|
import { Injectable, Inject, HttpException } from '@nestjs/common';
|
||||||
|
import { SignatureV4 } from '@aws-sdk/signature-v4';
|
||||||
|
import { Sha256 } from '@aws-crypto/sha256-js';
|
||||||
|
import { defaultProvider } from '@aws-sdk/credential-provider-node';
|
||||||
|
import axios, { AxiosResponse, Method } from 'axios';
|
||||||
|
import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
|
||||||
|
|
||||||
|
import { RequestUser } from '../../decorators/user.decorator';
|
||||||
|
import { CONNECTIONS_API_CONFIG } from './connections-api.config';
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class ConnectionsApiService {
|
||||||
|
private signer: SignatureV4;
|
||||||
|
private logger: any;
|
||||||
|
|
||||||
|
constructor(@Inject(DadosferaLogger) dadosferaLogger: DadosferaLogger) {
|
||||||
|
this.logger = dadosferaLogger.logger;
|
||||||
|
this.signer = new SignatureV4({
|
||||||
|
service: 'execute-api',
|
||||||
|
region: CONNECTIONS_API_CONFIG.region,
|
||||||
|
credentials: defaultProvider(),
|
||||||
|
sha256: Sha256,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
async proxy(
|
||||||
|
method: string,
|
||||||
|
path: string,
|
||||||
|
user: RequestUser,
|
||||||
|
body?: any,
|
||||||
|
query?: Record<string, string>,
|
||||||
|
): Promise<any> {
|
||||||
|
const baseUrl = CONNECTIONS_API_CONFIG.getUrl();
|
||||||
|
const url = new URL(`${baseUrl}${path}`);
|
||||||
|
|
||||||
|
if (query) {
|
||||||
|
Object.entries(query).forEach(([key, value]) => {
|
||||||
|
if (value !== undefined && value !== null) {
|
||||||
|
url.searchParams.set(key, String(value));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
const headers: Record<string, string> = {
|
||||||
|
host: url.hostname,
|
||||||
|
'content-type': 'application/json',
|
||||||
|
customer_name: user.customer_name || '',
|
||||||
|
customer_id: user.customer_id || '',
|
||||||
|
'x-user-id': user.user_id || '',
|
||||||
|
'x-username': user.username || '',
|
||||||
|
'x-customer-tier': user.customer_tier || '',
|
||||||
|
'x-customer-id': user.customer_id || '',
|
||||||
|
};
|
||||||
|
const requestToSign = {
|
||||||
|
method: method.toUpperCase(),
|
||||||
|
protocol: url.protocol,
|
||||||
|
hostname: url.hostname,
|
||||||
|
port: url.port ? parseInt(url.port, 10) : undefined,
|
||||||
|
path: url.pathname + url.search,
|
||||||
|
headers,
|
||||||
|
body: body ? JSON.stringify(body) : undefined,
|
||||||
|
};
|
||||||
|
|
||||||
|
try {
|
||||||
|
const signedRequest = await this.signer.sign(requestToSign);
|
||||||
|
const response: AxiosResponse = await axios({
|
||||||
|
method: method as Method,
|
||||||
|
url: url.href,
|
||||||
|
headers: signedRequest.headers as Record<string, string>,
|
||||||
|
data: body,
|
||||||
|
timeout: CONNECTIONS_API_CONFIG.timeout,
|
||||||
|
validateStatus: () => true,
|
||||||
|
});
|
||||||
|
|
||||||
|
if (response.status >= 400) {
|
||||||
|
throw new HttpException(response.data, response.status);
|
||||||
|
}
|
||||||
|
return response.data;
|
||||||
|
} catch (error) {
|
||||||
|
this.logger.error('Connections API proxy error', {
|
||||||
|
error: error.message,
|
||||||
|
path,
|
||||||
|
method: method.toUpperCase(),
|
||||||
|
});
|
||||||
|
if (error instanceof HttpException) {
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
if (error.response) {
|
||||||
|
throw new HttpException(error.response.data, error.response.status);
|
||||||
|
}
|
||||||
|
if (error.code === 'ECONNREFUSED') {
|
||||||
|
throw new HttpException('Connections API service unavailable', 503);
|
||||||
|
}
|
||||||
|
if (error.code === 'ETIMEDOUT' || error.code === 'ECONNABORTED') {
|
||||||
|
throw new HttpException('Connections API request timeout', 504);
|
||||||
|
}
|
||||||
|
throw new HttpException('Internal server error', 500);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -25,9 +25,10 @@ import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
|
|||||||
import {
|
import {
|
||||||
Authenticated,
|
Authenticated,
|
||||||
RequireAllPermissions,
|
RequireAllPermissions,
|
||||||
|
RequireModule,
|
||||||
RequireSomePermission,
|
RequireSomePermission,
|
||||||
} from 'src/decorators/authentication.decorator';
|
} from 'src/decorators/authentication.decorator';
|
||||||
import { PERMISSIONS_GROUPS } from 'src/authentication/permissions.enum';
|
import { DADOSFERA_MODULES_KEYS, PERMISSIONS_GROUPS } from 'src/authentication/permissions.enum';
|
||||||
import { Language } from 'src/decorators/language.decorator';
|
import { Language } from 'src/decorators/language.decorator';
|
||||||
import { LanguageEnum } from 'src/utils/languages.enum';
|
import { LanguageEnum } from 'src/utils/languages.enum';
|
||||||
import { ApiInternalOnlyController } from 'src/decorators/swagger.decorator';
|
import { ApiInternalOnlyController } from 'src/decorators/swagger.decorator';
|
||||||
@@ -99,6 +100,9 @@ export class ConnectorController {
|
|||||||
PERMISSIONS_GROUPS.PIPELINE.permissions.UPDATE,
|
PERMISSIONS_GROUPS.PIPELINE.permissions.UPDATE,
|
||||||
PERMISSIONS_GROUPS.PIPELINE.permissions.DELETE,
|
PERMISSIONS_GROUPS.PIPELINE.permissions.DELETE,
|
||||||
)
|
)
|
||||||
|
@RequireModule(
|
||||||
|
DADOSFERA_MODULES_KEYS.COLLECT
|
||||||
|
)
|
||||||
async getAllConnectors(
|
async getAllConnectors(
|
||||||
@Language() language: LanguageEnum,
|
@Language() language: LanguageEnum,
|
||||||
@Query() queries: GetAllDto,
|
@Query() queries: GetAllDto,
|
||||||
@@ -131,6 +135,9 @@ export class ConnectorController {
|
|||||||
PERMISSIONS_GROUPS.PIPELINE.permissions.UPDATE,
|
PERMISSIONS_GROUPS.PIPELINE.permissions.UPDATE,
|
||||||
PERMISSIONS_GROUPS.PIPELINE.permissions.DELETE,
|
PERMISSIONS_GROUPS.PIPELINE.permissions.DELETE,
|
||||||
)
|
)
|
||||||
|
@RequireModule(
|
||||||
|
DADOSFERA_MODULES_KEYS.COLLECT
|
||||||
|
)
|
||||||
async getConnectorsTags() {
|
async getConnectorsTags() {
|
||||||
return await this.connectorClientService.getConnectorsTags();
|
return await this.connectorClientService.getConnectorsTags();
|
||||||
}
|
}
|
||||||
@@ -143,6 +150,9 @@ export class ConnectorController {
|
|||||||
PERMISSIONS_GROUPS.PIPELINE.permissions.UPDATE,
|
PERMISSIONS_GROUPS.PIPELINE.permissions.UPDATE,
|
||||||
PERMISSIONS_GROUPS.PIPELINE.permissions.DELETE,
|
PERMISSIONS_GROUPS.PIPELINE.permissions.DELETE,
|
||||||
)
|
)
|
||||||
|
@RequireModule(
|
||||||
|
DADOSFERA_MODULES_KEYS.COLLECT
|
||||||
|
)
|
||||||
async getConnector(
|
async getConnector(
|
||||||
@Language() language: LanguageEnum,
|
@Language() language: LanguageEnum,
|
||||||
@Param('plugin') plugin: string,
|
@Param('plugin') plugin: string,
|
||||||
@@ -171,6 +181,9 @@ export class ConnectorController {
|
|||||||
PERMISSIONS_GROUPS.PIPELINE.permissions.UPDATE,
|
PERMISSIONS_GROUPS.PIPELINE.permissions.UPDATE,
|
||||||
PERMISSIONS_GROUPS.PIPELINE.permissions.DELETE,
|
PERMISSIONS_GROUPS.PIPELINE.permissions.DELETE,
|
||||||
)
|
)
|
||||||
|
@RequireModule(
|
||||||
|
DADOSFERA_MODULES_KEYS.COLLECT
|
||||||
|
)
|
||||||
async getConnectorDetails(
|
async getConnectorDetails(
|
||||||
@Language() language: LanguageEnum,
|
@Language() language: LanguageEnum,
|
||||||
@Param('plugin') plugin: string,
|
@Param('plugin') plugin: string,
|
||||||
@@ -193,6 +206,9 @@ export class ConnectorController {
|
|||||||
@Put('/:plugin')
|
@Put('/:plugin')
|
||||||
@RequireAllPermissions(PERMISSIONS_GROUPS.CONNECTORS.permissions.UPDATE)
|
@RequireAllPermissions(PERMISSIONS_GROUPS.CONNECTORS.permissions.UPDATE)
|
||||||
@ApiConsumes('multipart/form-data')
|
@ApiConsumes('multipart/form-data')
|
||||||
|
@RequireModule(
|
||||||
|
DADOSFERA_MODULES_KEYS.COLLECT
|
||||||
|
)
|
||||||
async updateConnector(
|
async updateConnector(
|
||||||
@Param('plugin') plugin: string,
|
@Param('plugin') plugin: string,
|
||||||
@Body() body: UpdateDto,
|
@Body() body: UpdateDto,
|
||||||
@@ -214,6 +230,9 @@ export class ConnectorController {
|
|||||||
|
|
||||||
@Put('/:plugin/add-tag')
|
@Put('/:plugin/add-tag')
|
||||||
@RequireAllPermissions(PERMISSIONS_GROUPS.CONNECTORS.permissions.UPDATE)
|
@RequireAllPermissions(PERMISSIONS_GROUPS.CONNECTORS.permissions.UPDATE)
|
||||||
|
@RequireModule(
|
||||||
|
DADOSFERA_MODULES_KEYS.COLLECT
|
||||||
|
)
|
||||||
async addTagOnConnector(
|
async addTagOnConnector(
|
||||||
@Param('plugin') plugin: string,
|
@Param('plugin') plugin: string,
|
||||||
@Body() body: AddTagDto,
|
@Body() body: AddTagDto,
|
||||||
@@ -241,6 +260,9 @@ export class ConnectorController {
|
|||||||
|
|
||||||
@Put('/:plugin/remove-tag')
|
@Put('/:plugin/remove-tag')
|
||||||
@RequireAllPermissions(PERMISSIONS_GROUPS.CONNECTORS.permissions.UPDATE)
|
@RequireAllPermissions(PERMISSIONS_GROUPS.CONNECTORS.permissions.UPDATE)
|
||||||
|
@RequireModule(
|
||||||
|
DADOSFERA_MODULES_KEYS.COLLECT
|
||||||
|
)
|
||||||
async removeTagOnConnector(
|
async removeTagOnConnector(
|
||||||
@Param('plugin') plugin: string,
|
@Param('plugin') plugin: string,
|
||||||
@Body() body: RemoveTagDto,
|
@Body() body: RemoveTagDto,
|
||||||
@@ -269,6 +291,9 @@ export class ConnectorController {
|
|||||||
|
|
||||||
@Delete('/:plugin')
|
@Delete('/:plugin')
|
||||||
@RequireAllPermissions(PERMISSIONS_GROUPS.CONNECTORS.permissions.DELETE)
|
@RequireAllPermissions(PERMISSIONS_GROUPS.CONNECTORS.permissions.DELETE)
|
||||||
|
@RequireModule(
|
||||||
|
DADOSFERA_MODULES_KEYS.COLLECT
|
||||||
|
)
|
||||||
async deleteConnector(
|
async deleteConnector(
|
||||||
@Param('plugin') plugin: string,
|
@Param('plugin') plugin: string,
|
||||||
@Query('version') version: string,
|
@Query('version') version: string,
|
||||||
|
|||||||
@@ -136,4 +136,32 @@ export class CustomersController {
|
|||||||
const result = await this.customersService.getAccessDashboardUrl(user.customer_name, metadata);
|
const result = await this.customersService.getAccessDashboardUrl(user.customer_name, metadata);
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Get(':id/organization-info')
|
||||||
|
@Authenticated()
|
||||||
|
@RequireAllPermissions(PERMISSIONS_GROUPS.USERS.permissions.ADMIN)
|
||||||
|
@ApiOkResponse({ description: 'Organization information' })
|
||||||
|
async getOrganizationInfo(@Param('id') id: string) {
|
||||||
|
this.logger.info('getOrganizationInfo', { id });
|
||||||
|
return this.customersService.getOrganizationInfo(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Put(':id/organization-info')
|
||||||
|
@Authenticated()
|
||||||
|
@RequireAllPermissions(PERMISSIONS_GROUPS.USERS.permissions.ADMIN)
|
||||||
|
@HttpCode(HttpStatus.OK)
|
||||||
|
@ApiOkResponse({ description: 'Organization information updated' })
|
||||||
|
async updateOrganizationInfo(
|
||||||
|
@Param('id') id: string,
|
||||||
|
@Body() body: {
|
||||||
|
companyName: string;
|
||||||
|
companySite: string;
|
||||||
|
domain: string;
|
||||||
|
cnpj: string;
|
||||||
|
description: string;
|
||||||
|
},
|
||||||
|
) {
|
||||||
|
return this.customersService.updateOrganizationInfo(id, body);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,12 +9,12 @@ import {
|
|||||||
} from '@nestjs/common';
|
} from '@nestjs/common';
|
||||||
|
|
||||||
import { firstValueFrom, lastValueFrom } from 'rxjs';
|
import { firstValueFrom, lastValueFrom } from 'rxjs';
|
||||||
import { Link } from '@dadosfera/protospack-v2/dist/lib/Duc/interfaces/entities';
|
|
||||||
import { DucClient } from '../duc/client.config';
|
import { DucClient } from '../duc/client.config';
|
||||||
import { ClientGrpc } from '@nestjs/microservices';
|
import { ClientGrpc } from '@nestjs/microservices';
|
||||||
import { ProtoServices } from '@dadosfera/protospack-v2/dist/lib/Duc';
|
import { ProtoServices } from '@dadosfera/protospack-v2/dist/lib/Duc';
|
||||||
import { CustomerUpdateRequest } from '@dadosfera/protospack-v2/dist/lib/Duc/interfaces/messages';
|
import { CustomerSetLinksRequest } from '@dadosfera/protospack-v2/dist/lib/Duc/interfaces/messages';
|
||||||
import { CustomersProtoService } from '@dadosfera/protospack-v2/dist/lib/Duc/interfaces/write-service';
|
import { CustomersProtoService } from '@dadosfera/protospack-v2/dist/lib/Duc/interfaces/write-service';
|
||||||
|
import { CustomerLinksConfig } from './dtos/customers';
|
||||||
import ErrorCodes from 'src/utils/errorCodes';
|
import ErrorCodes from 'src/utils/errorCodes';
|
||||||
import jwt from 'jsonwebtoken';
|
import jwt from 'jsonwebtoken';
|
||||||
import {
|
import {
|
||||||
@@ -67,12 +67,12 @@ export class CustomersService implements OnModuleInit {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
async getLinks(customerId: string) {
|
async getLinks(customerId: string): Promise<CustomerLinksConfig | null> {
|
||||||
try {
|
try {
|
||||||
const result = await lastValueFrom(
|
const result = await lastValueFrom(
|
||||||
this.customerService.CustomerFindOneById({ id: customerId }),
|
this.customerService.CustomerGetLinks({ customerId }),
|
||||||
);
|
);
|
||||||
return result.customer?.links || [];
|
return (result.links as CustomerLinksConfig) || null;
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
if (err.details === ErrorCodes.CUSTOMER.NOT_FOUND)
|
if (err.details === ErrorCodes.CUSTOMER.NOT_FOUND)
|
||||||
throw new HttpException(err.details, HttpStatus.NOT_FOUND);
|
throw new HttpException(err.details, HttpStatus.NOT_FOUND);
|
||||||
@@ -80,17 +80,17 @@ export class CustomersService implements OnModuleInit {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async setLinks(customerId: string, links: Link[]) {
|
async setLinks(customerId: string, links: CustomerLinksConfig) {
|
||||||
if (!customerId || !links) {
|
if (!customerId || !links) {
|
||||||
throw new HttpException(null, HttpStatus.BAD_REQUEST);
|
throw new HttpException(null, HttpStatus.BAD_REQUEST);
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
return await firstValueFrom(
|
return await firstValueFrom(
|
||||||
this.customerService.CustomerUpdate({
|
this.customerService.CustomerSetLinks({
|
||||||
id: customerId,
|
customerId,
|
||||||
links,
|
links: links as CustomerSetLinksRequest['links'],
|
||||||
} as CustomerUpdateRequest),
|
}),
|
||||||
);
|
);
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
if (err.details === ErrorCodes.CUSTOMER.NOT_FOUND)
|
if (err.details === ErrorCodes.CUSTOMER.NOT_FOUND)
|
||||||
@@ -223,4 +223,57 @@ export class CustomersService implements OnModuleInit {
|
|||||||
})
|
})
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async updateOrganizationInfo(
|
||||||
|
customerId: string,
|
||||||
|
data: {
|
||||||
|
companyName: string;
|
||||||
|
companySite: string;
|
||||||
|
domain: string;
|
||||||
|
cnpj: string;
|
||||||
|
description: string;
|
||||||
|
},
|
||||||
|
) {
|
||||||
|
try {
|
||||||
|
const result = await lastValueFrom(
|
||||||
|
this.customerService.OrganizationUpdate({
|
||||||
|
customerId,
|
||||||
|
companyName: data.companyName || '',
|
||||||
|
companySite: data.companySite || '',
|
||||||
|
domain: data.domain || '',
|
||||||
|
cnpj: data.cnpj || '',
|
||||||
|
description: data.description || '',
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
|
||||||
|
return result;
|
||||||
|
} catch (err) {
|
||||||
|
if (err.details === ErrorCodes.CUSTOMER.NOT_FOUND)
|
||||||
|
throw new HttpException(err.details, HttpStatus.NOT_FOUND);
|
||||||
|
else throw err;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async getOrganizationInfo(customerId: string) {
|
||||||
|
try {
|
||||||
|
const customerResponse = await lastValueFrom(
|
||||||
|
this.customerService.CustomerFindOneById({ id: customerId })
|
||||||
|
);
|
||||||
|
|
||||||
|
const customer = customerResponse.customer;
|
||||||
|
|
||||||
|
return {
|
||||||
|
companyName: customer.companyName || '',
|
||||||
|
companySite: customer.companySite || '',
|
||||||
|
domain: customer.domain || '',
|
||||||
|
cnpj: customer.cnpj || '',
|
||||||
|
description: customer.description || ''
|
||||||
|
};
|
||||||
|
} catch (err) {
|
||||||
|
if (err.details === ErrorCodes.CUSTOMER.NOT_FOUND)
|
||||||
|
throw new HttpException(err.details, HttpStatus.NOT_FOUND);
|
||||||
|
else throw err;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -1,7 +1,6 @@
|
|||||||
import { Link } from '@dadosfera/protospack-v2/dist/lib/Duc/interfaces/entities';
|
|
||||||
import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
|
import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
|
||||||
|
|
||||||
export class CustomerLink implements Link {
|
export class CustomerLinkItem {
|
||||||
@ApiProperty()
|
@ApiProperty()
|
||||||
href: string;
|
href: string;
|
||||||
@ApiProperty()
|
@ApiProperty()
|
||||||
@@ -9,15 +8,59 @@ export class CustomerLink implements Link {
|
|||||||
@ApiProperty()
|
@ApiProperty()
|
||||||
description: string;
|
description: string;
|
||||||
@ApiPropertyOptional()
|
@ApiPropertyOptional()
|
||||||
iconSrc: string;
|
iconSrc?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export class CustomerSidebarLinkItem {
|
||||||
|
@ApiProperty()
|
||||||
|
type: 'link';
|
||||||
|
@ApiProperty({ type: Object })
|
||||||
|
title: Record<string, string>;
|
||||||
|
@ApiProperty()
|
||||||
|
link: string;
|
||||||
|
@ApiPropertyOptional()
|
||||||
|
icon?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export class CustomerSidebarMenuItem {
|
||||||
|
@ApiProperty()
|
||||||
|
type: 'menu';
|
||||||
|
@ApiProperty({ type: Object })
|
||||||
|
title: Record<string, string>;
|
||||||
|
@ApiPropertyOptional()
|
||||||
|
icon?: string;
|
||||||
|
@ApiProperty({ type: [CustomerSidebarLinkItem] })
|
||||||
|
items: CustomerSidebarLinkItem[];
|
||||||
|
}
|
||||||
|
|
||||||
|
export class CustomerSidebarSection {
|
||||||
|
@ApiProperty({ type: Object })
|
||||||
|
title: Record<string, string>;
|
||||||
|
@ApiProperty({
|
||||||
|
type: 'array',
|
||||||
|
items: {
|
||||||
|
oneOf: [
|
||||||
|
{ $ref: '#/components/schemas/CustomerSidebarMenuItem' },
|
||||||
|
{ $ref: '#/components/schemas/CustomerSidebarLinkItem' },
|
||||||
|
],
|
||||||
|
},
|
||||||
|
})
|
||||||
|
items: (CustomerSidebarMenuItem | CustomerSidebarLinkItem)[];
|
||||||
|
}
|
||||||
|
|
||||||
|
export class CustomerLinksConfig {
|
||||||
|
@ApiPropertyOptional({ type: [CustomerLinkItem] })
|
||||||
|
home?: CustomerLinkItem[];
|
||||||
|
@ApiPropertyOptional({ type: [CustomerSidebarSection] })
|
||||||
|
sidebar?: CustomerSidebarSection[];
|
||||||
|
}
|
||||||
|
|
||||||
export class CustomerLinkRequest {
|
export class CustomerLinkRequest {
|
||||||
@ApiProperty({ type: [CustomerLink] })
|
@ApiProperty({ type: CustomerLinksConfig })
|
||||||
links: CustomerLink[];
|
links: CustomerLinksConfig;
|
||||||
}
|
}
|
||||||
|
|
||||||
export class CustomerLinksResponse {
|
export class CustomerLinksResponse {
|
||||||
@ApiProperty({ type: [CustomerLink] })
|
@ApiPropertyOptional({ type: CustomerLinksConfig })
|
||||||
links: CustomerLink[];
|
links?: CustomerLinksConfig;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,27 @@
|
|||||||
|
import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
|
||||||
|
|
||||||
|
export class OrganizationUpdateRequest {
|
||||||
|
@ApiProperty()
|
||||||
|
name: string;
|
||||||
|
@ApiPropertyOptional()
|
||||||
|
companySite: string;
|
||||||
|
@ApiProperty()
|
||||||
|
domain: string;
|
||||||
|
@ApiPropertyOptional()
|
||||||
|
info: string;
|
||||||
|
@ApiPropertyOptional()
|
||||||
|
cnpj: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export class OrganizationResponse {
|
||||||
|
@ApiProperty()
|
||||||
|
name: string;
|
||||||
|
@ApiPropertyOptional()
|
||||||
|
companySite: string;
|
||||||
|
@ApiProperty()
|
||||||
|
domain: string;
|
||||||
|
@ApiPropertyOptional()
|
||||||
|
info: string;
|
||||||
|
@ApiPropertyOptional()
|
||||||
|
cnpj: string;
|
||||||
|
}
|
||||||
@@ -11,10 +11,19 @@ export class TableColumns {
|
|||||||
name: string;
|
name: string;
|
||||||
@ApiProperty()
|
@ApiProperty()
|
||||||
columns: string[];
|
columns: string[];
|
||||||
@ApiProperty()
|
@ApiPropertyOptional({ type: [Column] })
|
||||||
references: Column[];
|
references: Column[];
|
||||||
@ApiProperty()
|
@ApiProperty()
|
||||||
|
destination: Record<'raw' | 'qualify', {
|
||||||
|
table_name: string;
|
||||||
|
table_schema: string;
|
||||||
|
}> | null;
|
||||||
|
@ApiProperty()
|
||||||
type: string;
|
type: string;
|
||||||
|
@ApiPropertyOptional({ type: [String] })
|
||||||
|
identifier_columns?: string[];
|
||||||
|
@ApiPropertyOptional({ type: Column })
|
||||||
|
reference_column?: Column;
|
||||||
}
|
}
|
||||||
export class AvailableEntity {
|
export class AvailableEntity {
|
||||||
@ApiProperty()
|
@ApiProperty()
|
||||||
|
|||||||
@@ -1,4 +1,8 @@
|
|||||||
import { Info } from '@dadosfera/protospack/dist/lib/interfaces';
|
export interface Info {
|
||||||
|
user_id: string;
|
||||||
|
customer_id: string;
|
||||||
|
customer: string;
|
||||||
|
}
|
||||||
|
|
||||||
interface Values {
|
interface Values {
|
||||||
jdbc_user: string;
|
jdbc_user: string;
|
||||||
|
|||||||
@@ -99,6 +99,7 @@ export class InputsController {
|
|||||||
customer: info.customer,
|
customer: info.customer,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
this.logger.info(JSON.stringify(body))
|
||||||
const response = await this.inputService.create({ body, info });
|
const response = await this.inputService.create({ body, info });
|
||||||
|
|
||||||
return response;
|
return response;
|
||||||
|
|||||||
@@ -17,10 +17,13 @@ import {
|
|||||||
InputCreateGenericRequest,
|
InputCreateGenericRequest,
|
||||||
InputCreateS3Request,
|
InputCreateS3Request,
|
||||||
InputNewCreateRequest,
|
InputNewCreateRequest,
|
||||||
|
InputUpdateResponse,
|
||||||
|
RollbackInputRequest,
|
||||||
TestConnectionRequest,
|
TestConnectionRequest,
|
||||||
} from '@dadosfera/protospack-v2/dist/lib/Input/interfaces/messages';
|
} from '@dadosfera/protospack-v2/dist/lib/Input/interfaces/messages';
|
||||||
import { Info } from '@dadosfera/protospack-v2/dist/lib/Input/interfaces/entities';
|
import { Info } from '@dadosfera/protospack-v2/dist/lib/Input/interfaces/entities';
|
||||||
import { CreateInputReq } from './dtos/input.model';
|
import { CreateInputReq } from './dtos/input.model';
|
||||||
|
import { Metadata } from '@grpc/grpc-js';
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
|
|
||||||
@@ -71,10 +74,10 @@ export class InputsService {
|
|||||||
objectCamelToSnake(createInputResponse);
|
objectCamelToSnake(createInputResponse);
|
||||||
return createInputResponse;
|
return createInputResponse;
|
||||||
},
|
},
|
||||||
update: async (updateInputDTO: UpdateInputRequest) => {
|
update: async (updateInputDTO: UpdateInputRequest, metadata: Metadata): Promise<InputUpdateResponse> => {
|
||||||
this.logger.info('InputClientService - Update');
|
this.logger.info('InputClientService - Update' + JSON.stringify(updateInputDTO));
|
||||||
const updateInputResponse = await lastValueFrom(
|
const updateInputResponse = await lastValueFrom(
|
||||||
this.inputWriteService.InputUpdate(updateInputDTO),
|
this.inputWriteService.InputUpdate(updateInputDTO, metadata),
|
||||||
);
|
);
|
||||||
|
|
||||||
return updateInputResponse;
|
return updateInputResponse;
|
||||||
@@ -164,6 +167,11 @@ export class InputsService {
|
|||||||
const inputCreateGenericRequest: InputCreateGenericRequest = {
|
const inputCreateGenericRequest: InputCreateGenericRequest = {
|
||||||
input: {
|
input: {
|
||||||
...body,
|
...body,
|
||||||
|
tables: (body.tables || []).map((table) => ({
|
||||||
|
...table,
|
||||||
|
identifier_columns: table.identifier_columns || [],
|
||||||
|
reference_column: table.reference_column || table.references?.[0],
|
||||||
|
})),
|
||||||
},
|
},
|
||||||
info,
|
info,
|
||||||
};
|
};
|
||||||
@@ -199,24 +207,47 @@ export class InputsService {
|
|||||||
return findOneInputResponse;
|
return findOneInputResponse;
|
||||||
}
|
}
|
||||||
|
|
||||||
async update(id: string, data, info: Info) {
|
async update(id: string, data, info: Info, metadata?: Metadata) {
|
||||||
this.validateCron({ ...data, info });
|
// this.validateCron({ ...data, info });
|
||||||
try {
|
try {
|
||||||
const updateInputResponse: any = await this.OLD_inputClient.update({
|
const {
|
||||||
|
tablesUpdate,
|
||||||
|
dataAssetUpdate,
|
||||||
|
input
|
||||||
|
} = await this.OLD_inputClient.update({
|
||||||
id,
|
id,
|
||||||
info,
|
|
||||||
...data,
|
...data,
|
||||||
});
|
info,
|
||||||
|
}, metadata);
|
||||||
|
|
||||||
updateInputResponse.input = this.adjustInputPayload(
|
const updateInputResponse = this.adjustInputPayload(
|
||||||
updateInputResponse?.input,
|
input,
|
||||||
);
|
);
|
||||||
return updateInputResponse;
|
return {
|
||||||
|
input: updateInputResponse,
|
||||||
|
tablesUpdate,
|
||||||
|
dataAssetUpdate
|
||||||
|
};
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
throw new HttpException(err.message, HttpStatus.NOT_FOUND);
|
throw new HttpException(err.message, HttpStatus.NOT_FOUND);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async rollbackUpdate(
|
||||||
|
data: RollbackInputRequest
|
||||||
|
) {
|
||||||
|
this.logger.info('PipelinesClientService - rollbackUpdate');
|
||||||
|
this.logger.info('Rolling back input update with data: ' + JSON.stringify(data));
|
||||||
|
const updatePipelineResponse = await lastValueFrom(
|
||||||
|
this.inputWriteService.RollbackInputUpdate(
|
||||||
|
data
|
||||||
|
),
|
||||||
|
);
|
||||||
|
this.logger.info('Done');
|
||||||
|
|
||||||
|
return updatePipelineResponse;
|
||||||
|
}
|
||||||
|
|
||||||
async remove(idRequest: IIdRequest) {
|
async remove(idRequest: IIdRequest) {
|
||||||
return lastValueFrom(this.inputWriteService.InputRemove(idRequest));
|
return lastValueFrom(this.inputWriteService.InputRemove(idRequest));
|
||||||
}
|
}
|
||||||
@@ -258,4 +289,12 @@ export class InputsService {
|
|||||||
};
|
};
|
||||||
return formatedPayload;
|
return formatedPayload;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async markTableDeleted(data: { input_id: string; table_name: string; info: Info }) {
|
||||||
|
return lastValueFrom(this.inputWriteService.MarkTableDeleted(data));
|
||||||
|
}
|
||||||
|
|
||||||
|
async unmarkTableDeleted(data: { input_id: string; table_name: string; info: Info }) {
|
||||||
|
return lastValueFrom((this.inputWriteService as any).UnmarkTableDeleted(data));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import { ClientsModule } from '@nestjs/microservices';
|
import { ClientsModule } from '@nestjs/microservices';
|
||||||
import { Test, TestingModule } from '@nestjs/testing';
|
import { Test, TestingModule } from '@nestjs/testing';
|
||||||
// import { DucClient } from 'src/clients/duc/client.config';
|
// import { DucClient } from '../duc/client.config'
|
||||||
import { PermissionsController } from './permissions.controller';
|
import { PermissionsController } from './permissions.controller';
|
||||||
import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
|
import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
|
||||||
import { PermissionsService } from './permissions.service';
|
import { PermissionsService } from './permissions.service';
|
||||||
@@ -22,7 +22,7 @@ describe.skip('PermissionsController', () => {
|
|||||||
provide: DadosferaLogger,
|
provide: DadosferaLogger,
|
||||||
useValue: { logger },
|
useValue: { logger },
|
||||||
},
|
},
|
||||||
PermissionsService,
|
PermissionsService
|
||||||
],
|
],
|
||||||
}).compile();
|
}).compile();
|
||||||
|
|
||||||
|
|||||||
@@ -1,78 +0,0 @@
|
|||||||
import { ConflictException, Inject, OnModuleInit } from '@nestjs/common';
|
|
||||||
import { ClientGrpc } from '@nestjs/microservices';
|
|
||||||
import {
|
|
||||||
PipelineServicesNames,
|
|
||||||
PipelinesServiceInterface,
|
|
||||||
} from '@dadosfera/protospack';
|
|
||||||
import { lastValueFrom } from 'rxjs';
|
|
||||||
|
|
||||||
import { IIdRequest } from './interfaces';
|
|
||||||
|
|
||||||
import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
|
|
||||||
import { PipelinesClientConfiguration } from './pipelines-client';
|
|
||||||
|
|
||||||
export class PipelinesClientService implements OnModuleInit {
|
|
||||||
private pipelineService: PipelinesServiceInterface;
|
|
||||||
logger: DadosferaLogger;
|
|
||||||
|
|
||||||
constructor(
|
|
||||||
@Inject(DadosferaLogger)
|
|
||||||
dadosferaLogger: DadosferaLogger,
|
|
||||||
@Inject(PipelinesClientConfiguration.name)
|
|
||||||
private readonly grpcClient: ClientGrpc,
|
|
||||||
) {
|
|
||||||
this.logger = dadosferaLogger.logger;
|
|
||||||
}
|
|
||||||
|
|
||||||
onModuleInit() {
|
|
||||||
this.pipelineService =
|
|
||||||
this.grpcClient.getService<PipelinesServiceInterface>(
|
|
||||||
PipelineServicesNames.PipelineService,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
async getPipelineStatus(data) {
|
|
||||||
this.logger.info('PipelinesClientService - GetPipelineStatus');
|
|
||||||
|
|
||||||
const statusPipelineResponse = await lastValueFrom(
|
|
||||||
this.pipelineService.getPipelineStatus(data),
|
|
||||||
)
|
|
||||||
.then((res) => {
|
|
||||||
const statusArray =
|
|
||||||
res.status?.sort((a, b) => {
|
|
||||||
if (a.id < b.id) {
|
|
||||||
return 1;
|
|
||||||
} else {
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
}) || [];
|
|
||||||
return { status: statusArray };
|
|
||||||
})
|
|
||||||
.catch((err) => {
|
|
||||||
this.logger.error(err.message);
|
|
||||||
throw new Error(err);
|
|
||||||
});
|
|
||||||
this.logger.info('Done');
|
|
||||||
|
|
||||||
return statusPipelineResponse;
|
|
||||||
}
|
|
||||||
|
|
||||||
async runPipeline({ id, info }: IIdRequest) {
|
|
||||||
this.logger.info('PipelinesClientService - RunPipeline');
|
|
||||||
const statusPipelineResponse = await lastValueFrom(
|
|
||||||
this.pipelineService.triggerPipeline({ id, info }),
|
|
||||||
).catch((err) => {
|
|
||||||
this.logger.error(err.message);
|
|
||||||
throw new Error(err);
|
|
||||||
});
|
|
||||||
|
|
||||||
if (statusPipelineResponse.status == false) {
|
|
||||||
throw new ConflictException(
|
|
||||||
'This pipeline is not ready yet to execute, Try again later!',
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
this.logger.info('Done');
|
|
||||||
return statusPipelineResponse;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-36
@@ -1,36 +0,0 @@
|
|||||||
import { Info } from '@dadosfera/protospack/dist/lib/interfaces';
|
|
||||||
|
|
||||||
export interface ICreatePipelineDto {
|
|
||||||
input: IdRequest;
|
|
||||||
transformations: IdRequest[];
|
|
||||||
output: IdRequest;
|
|
||||||
tags: string[];
|
|
||||||
name: string;
|
|
||||||
description: string;
|
|
||||||
info: Info;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface IdRequest {
|
|
||||||
id: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface IIdRequest {
|
|
||||||
id: string;
|
|
||||||
info: Info;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface IUpdatePipelineRequest {
|
|
||||||
input: IdRequest;
|
|
||||||
transformations: IdRequest[];
|
|
||||||
output: IdRequest;
|
|
||||||
tags: string[];
|
|
||||||
name: string;
|
|
||||||
description: string;
|
|
||||||
id: string;
|
|
||||||
info: Info;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface IGetPipelineLogsRequest {
|
|
||||||
id: string;
|
|
||||||
details: string;
|
|
||||||
}
|
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
import {
|
|
||||||
ClientsProviderAsyncOptions,
|
|
||||||
GrpcOptions,
|
|
||||||
Transport,
|
|
||||||
} from '@nestjs/microservices';
|
|
||||||
import { PipelinePackages, PipelineProtoFilePath } from '@dadosfera/protospack';
|
|
||||||
import { credentials } from '@grpc/grpc-js';
|
|
||||||
|
|
||||||
const isLocalConnection =
|
|
||||||
process.env.PIFACTORY_URL.startsWith('pi-factory:') ||
|
|
||||||
process.env.PIFACTORY_URL.includes('0.0.0.0');
|
|
||||||
|
|
||||||
export class PipelinesClientConfiguration {
|
|
||||||
public name = 'PipelinesClientConfiguration';
|
|
||||||
private config: GrpcOptions = {
|
|
||||||
transport: Transport.GRPC,
|
|
||||||
options: {
|
|
||||||
url: process.env.PIFACTORY_URL,
|
|
||||||
package: PipelinePackages,
|
|
||||||
credentials: isLocalConnection ? undefined : credentials.createSsl(),
|
|
||||||
protoPath: PipelineProtoFilePath,
|
|
||||||
loader: {
|
|
||||||
keepCase: true,
|
|
||||||
enums: String,
|
|
||||||
defaults: false,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
};
|
|
||||||
providerOptions: ClientsProviderAsyncOptions = {
|
|
||||||
name: this.name,
|
|
||||||
...this.config,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,72 +0,0 @@
|
|||||||
import { Body, Controller, Get, Inject, Param, Post } from '@nestjs/common';
|
|
||||||
import { ApiOperation, ApiTags } from '@nestjs/swagger';
|
|
||||||
import {
|
|
||||||
AuthenticateCondition,
|
|
||||||
Authenticated,
|
|
||||||
RequireSomePermission,
|
|
||||||
} from 'src/decorators/authentication.decorator';
|
|
||||||
import { PERMISSIONS_GROUPS } from '../../authentication/permissions.enum';
|
|
||||||
import { PipelinesService } from './pipelines.service';
|
|
||||||
import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
|
|
||||||
import { ApiInternalOnlyController } from 'src/decorators/swagger.decorator';
|
|
||||||
|
|
||||||
@ApiInternalOnlyController()
|
|
||||||
@ApiTags('Pipelines')
|
|
||||||
@Controller('pipelines')
|
|
||||||
@Authenticated()
|
|
||||||
export class PipelinesController {
|
|
||||||
logger: DadosferaLogger;
|
|
||||||
constructor(
|
|
||||||
@Inject(DadosferaLogger)
|
|
||||||
dadosferaLogger: DadosferaLogger,
|
|
||||||
private pipelineService: PipelinesService,
|
|
||||||
) {
|
|
||||||
this.logger = dadosferaLogger.logger;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Post('start/:id')
|
|
||||||
@RequireSomePermission(PERMISSIONS_GROUPS.PIPELINE.permissions.CREATE)
|
|
||||||
@ApiOperation({
|
|
||||||
deprecated: true,
|
|
||||||
description:
|
|
||||||
'This method is deprecated. Please use route /pipelinesV2/start/:id instead',
|
|
||||||
})
|
|
||||||
async activate(@Param('id') id: string, @Body() body) {
|
|
||||||
const { info } = body;
|
|
||||||
|
|
||||||
this.logger.info(
|
|
||||||
process.env.DEV_URL + `/pipeline/start/${id} - ON START PIPELINE ROUTE`,
|
|
||||||
{
|
|
||||||
user: body.info.user_id,
|
|
||||||
customer: body.info.customer,
|
|
||||||
},
|
|
||||||
);
|
|
||||||
|
|
||||||
const response = await this.pipelineService.runPipeline({ id, info });
|
|
||||||
|
|
||||||
return response;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Get(':id/status')
|
|
||||||
@ApiOperation({
|
|
||||||
deprecated: true,
|
|
||||||
description:
|
|
||||||
'This method is deprecated. Please use route /pipelinesV2/:id/status instead',
|
|
||||||
})
|
|
||||||
@RequireSomePermission(PERMISSIONS_GROUPS.IMPORT_FILES.permissions.VIEW, PERMISSIONS_GROUPS.PIPELINE.permissions.GET)
|
|
||||||
async getPipelineStatus(@Body() body, @Param('id') id: string) {
|
|
||||||
body.id = id;
|
|
||||||
|
|
||||||
this.logger.info(
|
|
||||||
process.env.DEV_URL + `/pipeline/${id} - ON GET PIPELINE STATUS ROUTE`,
|
|
||||||
{
|
|
||||||
user: body.info.user_id,
|
|
||||||
customer: body.info.customer,
|
|
||||||
},
|
|
||||||
);
|
|
||||||
|
|
||||||
const response = await this.pipelineService.getPipelineStatus(body);
|
|
||||||
|
|
||||||
return response;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
import { Module } from '@nestjs/common';
|
|
||||||
import { ClientsModule } from '@nestjs/microservices';
|
|
||||||
import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
|
|
||||||
|
|
||||||
import { PipelinesController } from './pipelines.controller';
|
|
||||||
import { PipelinesService } from './pipelines.service';
|
|
||||||
|
|
||||||
import { PipelinesClientConfiguration } from './pipelines-client';
|
|
||||||
import { PipelinesClientService } from './client.service';
|
|
||||||
|
|
||||||
const client = new PipelinesClientConfiguration();
|
|
||||||
|
|
||||||
@Module({
|
|
||||||
imports: [ClientsModule.register([client.providerOptions])],
|
|
||||||
controllers: [PipelinesController],
|
|
||||||
providers: [PipelinesService, PipelinesClientService, DadosferaLogger],
|
|
||||||
exports: [PipelinesService],
|
|
||||||
})
|
|
||||||
export class PipelinesModule {}
|
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
import { HttpException, HttpStatus, Injectable } from '@nestjs/common';
|
|
||||||
import { PipelinesClientService } from './client.service';
|
|
||||||
import { IIdRequest } from './interfaces';
|
|
||||||
import { objectCamelToSnake } from 'src/utils/CaseConverter';
|
|
||||||
|
|
||||||
@Injectable()
|
|
||||||
export class PipelinesService {
|
|
||||||
constructor(private pipelineClient: PipelinesClientService) {}
|
|
||||||
|
|
||||||
async getPipelineStatus(data: IIdRequest) {
|
|
||||||
try {
|
|
||||||
const pipelineStatusResponse =
|
|
||||||
await this.pipelineClient.getPipelineStatus(data);
|
|
||||||
|
|
||||||
return objectCamelToSnake(pipelineStatusResponse);
|
|
||||||
} catch (err) {
|
|
||||||
throw new HttpException(err.message, HttpStatus.NOT_FOUND);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async runPipeline({ id, info }: IIdRequest) {
|
|
||||||
try {
|
|
||||||
const triggerPipelineResponse = await this.pipelineClient.runPipeline({
|
|
||||||
id,
|
|
||||||
info,
|
|
||||||
});
|
|
||||||
|
|
||||||
return objectCamelToSnake(triggerPipelineResponse);
|
|
||||||
} catch (err) {
|
|
||||||
throw new HttpException(err.message, HttpStatus.NOT_FOUND);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,5 +1,13 @@
|
|||||||
import { ApiProperty, ApiPropertyOptional, OmitType } from '@nestjs/swagger';
|
import { ApiProperty, ApiPropertyOptional, OmitType } from '@nestjs/swagger';
|
||||||
import { Info } from '@dadosfera/protospack/dist/lib/interfaces';
|
|
||||||
|
export class PipelineInputsDTO {
|
||||||
|
@ApiProperty()
|
||||||
|
tables: Array<{
|
||||||
|
name: string,
|
||||||
|
type: string,
|
||||||
|
|
||||||
|
}>
|
||||||
|
}
|
||||||
|
|
||||||
export class IPipelineV2 {
|
export class IPipelineV2 {
|
||||||
@ApiProperty()
|
@ApiProperty()
|
||||||
@@ -53,6 +61,12 @@ export interface IIdRequest {
|
|||||||
info: Info;
|
info: Info;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface Info {
|
||||||
|
user_id: string;
|
||||||
|
customer_id: string;
|
||||||
|
customer: string;
|
||||||
|
}
|
||||||
|
|
||||||
export interface IUpdatePipelineRequest {
|
export interface IUpdatePipelineRequest {
|
||||||
input: IdRequest;
|
input: IdRequest;
|
||||||
transformations: IdRequest[];
|
transformations: IdRequest[];
|
||||||
@@ -123,3 +137,30 @@ export class PipelineFindAllReq {
|
|||||||
@ApiPropertyOptional()
|
@ApiPropertyOptional()
|
||||||
type?: string | undefined;
|
type?: string | undefined;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface UpdateTableDTO {
|
||||||
|
name: string;
|
||||||
|
type: string;
|
||||||
|
columns: string[];
|
||||||
|
destinations: {
|
||||||
|
raw: {
|
||||||
|
table_schema: string;
|
||||||
|
table_name: string;
|
||||||
|
};
|
||||||
|
qualify: {
|
||||||
|
table_schema: string;
|
||||||
|
table_name: string;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
identifier_columns: string[];
|
||||||
|
reference_column: {
|
||||||
|
name: string;
|
||||||
|
type: string;
|
||||||
|
};
|
||||||
|
memory: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface UpdatePlatformInputRequest {
|
||||||
|
cron: string;
|
||||||
|
tables: Array<UpdateTableDTO>;
|
||||||
|
}
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ import {
|
|||||||
Patch,
|
Patch,
|
||||||
HttpException,
|
HttpException,
|
||||||
BadRequestException,
|
BadRequestException,
|
||||||
CacheTTL,
|
UseGuards,
|
||||||
} from '@nestjs/common';
|
} from '@nestjs/common';
|
||||||
import {
|
import {
|
||||||
ApiCreatedResponse,
|
ApiCreatedResponse,
|
||||||
@@ -24,18 +24,17 @@ import {
|
|||||||
ApiTags,
|
ApiTags,
|
||||||
} from '@nestjs/swagger';
|
} from '@nestjs/swagger';
|
||||||
import {
|
import {
|
||||||
AuthenticateCondition,
|
|
||||||
RequireAllPermissions,
|
RequireAllPermissions,
|
||||||
|
RequireModule,
|
||||||
RequireSomePermission,
|
RequireSomePermission,
|
||||||
} from 'src/decorators/authentication.decorator';
|
} from 'src/decorators/authentication.decorator';
|
||||||
import { PERMISSIONS_GROUPS } from '../../authentication/permissions.enum';
|
import { DADOSFERA_MODULES_KEYS, PERMISSIONS_GROUPS } from '../../authentication/permissions.enum';
|
||||||
import { PipelinesService } from './pipelines.service';
|
import { PipelinesService } from './pipelines.service';
|
||||||
import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
|
import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
|
||||||
import { Messages } from '@dadosfera/protospack-v2/dist/lib/PipelineV2';
|
import { Messages } from '@dadosfera/protospack-v2/dist/lib/PipelineV2';
|
||||||
import { RequestUser, User } from 'src/decorators/user.decorator';
|
import { RequestUser, User } from 'src/decorators/user.decorator';
|
||||||
import { PackTheMetadata } from 'src/utils/PackTheMetadata';
|
import { PackTheMetadata } from 'src/utils/PackTheMetadata';
|
||||||
|
|
||||||
import { PipelinesService as OldPipelineService } from 'src/modules/pipelines/pipelines.service';
|
|
||||||
import {
|
import {
|
||||||
ICompleteUploadCSVFile,
|
ICompleteUploadCSVFile,
|
||||||
ICreatePipelineCSVFile,
|
ICreatePipelineCSVFile,
|
||||||
@@ -43,23 +42,31 @@ import {
|
|||||||
IPipelineV2,
|
IPipelineV2,
|
||||||
IInitUploadCSVFile,
|
IInitUploadCSVFile,
|
||||||
PipelineFindAllReq,
|
PipelineFindAllReq,
|
||||||
|
UpdatePlatformInputRequest,
|
||||||
} from './interfaces';
|
} from './interfaces';
|
||||||
import { GrpcToHttpExceptionFilter } from 'src/error/grpc-to-http-exception.filter';
|
import { GrpcToHttpExceptionFilter } from 'src/error/grpc-to-http-exception.filter';
|
||||||
import { LanguageEnum } from 'src/utils/languages.enum';
|
import { LanguageEnum } from 'src/utils/languages.enum';
|
||||||
import { Language } from 'src/decorators/language.decorator';
|
import { Language } from 'src/decorators/language.decorator';
|
||||||
import { ApiInternalOnlyEndpoint } from 'src/decorators/swagger.decorator';
|
import { ApiInternalOnlyEndpoint } from 'src/decorators/swagger.decorator';
|
||||||
|
import { Info } from '@dadosfera/protospack-v2/dist/lib/Input/interfaces/entities';
|
||||||
|
import { PipelineExecutionGuard } from 'src/guards/pipeline-execution.guard';
|
||||||
|
|
||||||
|
type PipelineTable = { name: string; job_id?: string; is_deleted?: boolean; [key: string]: any };
|
||||||
|
type PipelineTablesConfig = { input_id?: string; tables: PipelineTable[] };
|
||||||
|
|
||||||
@ApiTags('PipelinesV2')
|
@ApiTags('PipelinesV2')
|
||||||
@ApiHeaders([{ name: 'dadosfera-lang', enum: LanguageEnum, required: false }])
|
@ApiHeaders([{ name: 'dadosfera-lang', enum: LanguageEnum, required: false }])
|
||||||
@UseFilters(new GrpcToHttpExceptionFilter())
|
@UseFilters(new GrpcToHttpExceptionFilter())
|
||||||
@Controller('pipelinesV2')
|
@Controller('pipelinesV2')
|
||||||
|
@RequireModule(
|
||||||
|
DADOSFERA_MODULES_KEYS.COLLECT
|
||||||
|
)
|
||||||
export class PipelinesController {
|
export class PipelinesController {
|
||||||
logger: DadosferaLogger;
|
logger: DadosferaLogger;
|
||||||
constructor(
|
constructor(
|
||||||
@Inject(DadosferaLogger)
|
@Inject(DadosferaLogger)
|
||||||
dadosferaLogger: DadosferaLogger,
|
dadosferaLogger: DadosferaLogger,
|
||||||
private pipelinesClientService: PipelinesService,
|
private pipelinesClientService: PipelinesService,
|
||||||
private oldPipelinesService: OldPipelineService,
|
|
||||||
) {
|
) {
|
||||||
this.logger = dadosferaLogger.logger;
|
this.logger = dadosferaLogger.logger;
|
||||||
}
|
}
|
||||||
@@ -187,6 +194,7 @@ export class PipelinesController {
|
|||||||
@Get(':id/status')
|
@Get(':id/status')
|
||||||
@RequireSomePermission(PERMISSIONS_GROUPS.IMPORT_FILES.permissions.VIEW, PERMISSIONS_GROUPS.PIPELINE.permissions.GET)
|
@RequireSomePermission(PERMISSIONS_GROUPS.IMPORT_FILES.permissions.VIEW, PERMISSIONS_GROUPS.PIPELINE.permissions.GET)
|
||||||
async getPipelineStatus(@Body() body, @Param('id') id: string) {
|
async getPipelineStatus(@Body() body, @Param('id') id: string) {
|
||||||
|
|
||||||
body.id = id;
|
body.id = id;
|
||||||
|
|
||||||
this.logger.info(`/pipeline/${id} - ON GET PIPELINE STATUS ROUTE`, {
|
this.logger.info(`/pipeline/${id} - ON GET PIPELINE STATUS ROUTE`, {
|
||||||
@@ -194,7 +202,7 @@ export class PipelinesController {
|
|||||||
customer: body.info.customer,
|
customer: body.info.customer,
|
||||||
});
|
});
|
||||||
|
|
||||||
const response = await this.oldPipelinesService.getPipelineStatus(body);
|
const response = await this.pipelinesClientService.getPipelineStatus(body);
|
||||||
|
|
||||||
return response;
|
return response;
|
||||||
}
|
}
|
||||||
@@ -218,26 +226,50 @@ export class PipelinesController {
|
|||||||
language,
|
language,
|
||||||
});
|
});
|
||||||
|
|
||||||
const result = await this.pipelinesClientService
|
const pipelineRes = await this.pipelinesClientService.findOne({ id }, metadata);
|
||||||
.findOne({ id }, metadata)
|
|
||||||
.then((res) => {
|
const parsed: PipelineTablesConfig = JSON.parse(pipelineRes.pipeline.config.tables);
|
||||||
//{pipeline:{tables: {tables: [], input_id: ''}}}
|
const input_id = parsed.input_id;
|
||||||
let tables = JSON.parse(res.pipeline.config.tables);
|
const tables: PipelineTable[] = parsed.tables ?? [];
|
||||||
if (tables?.tables) tables = tables.tables;
|
|
||||||
Object.assign(res.pipeline, {
|
Object.assign(pipelineRes.pipeline, {
|
||||||
transformations: res.pipeline.transformations
|
transformations: pipelineRes.pipeline.transformations
|
||||||
? JSON.parse(res.pipeline.transformations)
|
? JSON.parse(pipelineRes.pipeline.transformations)
|
||||||
: [],
|
: [],
|
||||||
config: {
|
config: {
|
||||||
cron: res.pipeline.config.cron,
|
cron: pipelineRes.pipeline.config.cron,
|
||||||
tables,
|
tables,
|
||||||
},
|
input_id,
|
||||||
properties: res.pipeline.properties
|
},
|
||||||
? JSON.parse(res.pipeline.properties)
|
properties: pipelineRes.pipeline.properties
|
||||||
: {},
|
? JSON.parse(pipelineRes.pipeline.properties)
|
||||||
});
|
: {},
|
||||||
return res;
|
});
|
||||||
});
|
|
||||||
|
return pipelineRes;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Get("/:id/data-assets")
|
||||||
|
@RequireSomePermission(
|
||||||
|
PERMISSIONS_GROUPS.PIPELINE.permissions.GET,
|
||||||
|
PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER,
|
||||||
|
PERMISSIONS_GROUPS.CATALOG.permissions.GET
|
||||||
|
)
|
||||||
|
async findAllDataAssetByPipeline(
|
||||||
|
@Language() language: LanguageEnum,
|
||||||
|
@Param('id') id: string,
|
||||||
|
@User() user: RequestUser,
|
||||||
|
@Query('object') object: string
|
||||||
|
) {
|
||||||
|
const payload = {
|
||||||
|
pipeline: id,
|
||||||
|
object: object,
|
||||||
|
};
|
||||||
|
|
||||||
|
this.logger.info(`GET pipelinesV2/:id/data-assets` + JSON.stringify(payload));
|
||||||
|
|
||||||
|
const result =
|
||||||
|
await this.pipelinesClientService.findAllDataAssetByPipeline(payload, user);
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
@@ -277,6 +309,40 @@ export class PipelinesController {
|
|||||||
return response;
|
return response;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Patch('/:pipelineId/inputs/:id')
|
||||||
|
@RequireSomePermission(PERMISSIONS_GROUPS.PIPELINE.permissions.UPDATE)
|
||||||
|
@UseGuards(PipelineExecutionGuard)
|
||||||
|
async updatePipelineInput(
|
||||||
|
@Language() language: LanguageEnum,
|
||||||
|
@Body() pipelineInputDTO: UpdatePlatformInputRequest,
|
||||||
|
@Param('id') inputId: string,
|
||||||
|
@Param('pipelineId') pipelineId: string,
|
||||||
|
@User() user: RequestUser,
|
||||||
|
) {
|
||||||
|
this.logger.info('PipelinesController - update', { user });
|
||||||
|
|
||||||
|
const info: Info = {
|
||||||
|
user_id: user.user_id,
|
||||||
|
customer: user.customer_name,
|
||||||
|
customer_id: user.customer_id,
|
||||||
|
pipeline_id: pipelineId
|
||||||
|
};
|
||||||
|
|
||||||
|
const metadata = PackTheMetadata(user);
|
||||||
|
|
||||||
|
const response = await this.pipelinesClientService.updatePipelineInput(
|
||||||
|
pipelineId,
|
||||||
|
inputId,
|
||||||
|
pipelineInputDTO,
|
||||||
|
info,
|
||||||
|
user,
|
||||||
|
metadata,
|
||||||
|
);
|
||||||
|
|
||||||
|
this.logger.info('PipelinesController - update: OK', { user });
|
||||||
|
return response;
|
||||||
|
}
|
||||||
|
|
||||||
@ApiInternalOnlyEndpoint()
|
@ApiInternalOnlyEndpoint()
|
||||||
@Put('/:id')
|
@Put('/:id')
|
||||||
@ApiOperation({
|
@ApiOperation({
|
||||||
@@ -296,6 +362,21 @@ export class PipelinesController {
|
|||||||
return response;
|
return response;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Patch('/:id/upgrade')
|
||||||
|
@RequireSomePermission(PERMISSIONS_GROUPS.PIPELINE.permissions.UPDATE)
|
||||||
|
@HttpCode(HttpStatus.NO_CONTENT)
|
||||||
|
async upgradeConnector(
|
||||||
|
@Language() language: LanguageEnum,
|
||||||
|
@Param('id') id: string,
|
||||||
|
@User() user: RequestUser
|
||||||
|
) {
|
||||||
|
this.logger.info('PipelinesController - upgrade connector');
|
||||||
|
|
||||||
|
const metadata = PackTheMetadata(user);
|
||||||
|
|
||||||
|
await this.pipelinesClientService.upgrade(id, metadata);
|
||||||
|
}
|
||||||
|
|
||||||
@Delete(':id')
|
@Delete(':id')
|
||||||
@ApiNoContentResponse()
|
@ApiNoContentResponse()
|
||||||
@HttpCode(HttpStatus.NO_CONTENT)
|
@HttpCode(HttpStatus.NO_CONTENT)
|
||||||
@@ -425,7 +506,7 @@ export class PipelinesController {
|
|||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
const response = await this.oldPipelinesService.runPipeline({ id, info });
|
const response = await this.pipelinesClientService.runPipeline({ id, info });
|
||||||
|
|
||||||
return response;
|
return response;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,23 +7,28 @@ import { PipelinesService } from './pipelines.service';
|
|||||||
|
|
||||||
import { PipelinesClientConfiguration } from './pipelines-client';
|
import { PipelinesClientConfiguration } from './pipelines-client';
|
||||||
|
|
||||||
import { PipelinesModule as OldPipelineModule } from 'src/modules/pipelines/pipelines.module';
|
|
||||||
import { ConnectorModule } from '../connector/connector.module';
|
import { ConnectorModule } from '../connector/connector.module';
|
||||||
import { InputsModule } from '../inputs/inputs.module';
|
import { InputsModule } from '../inputs/inputs.module';
|
||||||
import { TransformationsModule } from '../transformations/transformations.module';
|
import { TransformationsModule } from '../transformations/transformations.module';
|
||||||
|
import { PlatformApiModule } from '../platform-api/platform-api.module';
|
||||||
|
import { NimbusServicesModule } from 'src/services/nimbus/nimbus.module';
|
||||||
|
import { NimbusService } from 'src/services/nimbus/nimbus.service';
|
||||||
|
import { CatalogModule } from '../catalog/catalog.module';
|
||||||
|
|
||||||
const client = new PipelinesClientConfiguration();
|
const client = new PipelinesClientConfiguration();
|
||||||
|
|
||||||
@Module({
|
@Module({
|
||||||
imports: [
|
imports: [
|
||||||
ClientsModule.register([client.providerOptions]),
|
ClientsModule.register([client.providerOptions]),
|
||||||
OldPipelineModule,
|
|
||||||
ConnectorModule,
|
ConnectorModule,
|
||||||
InputsModule,
|
InputsModule,
|
||||||
TransformationsModule,
|
TransformationsModule,
|
||||||
|
PlatformApiModule,
|
||||||
|
NimbusServicesModule,
|
||||||
|
CatalogModule
|
||||||
],
|
],
|
||||||
controllers: [PipelinesController],
|
controllers: [PipelinesController],
|
||||||
providers: [PipelinesService, DadosferaLogger],
|
providers: [PipelinesService, DadosferaLogger, NimbusService],
|
||||||
exports: [PipelinesService],
|
exports: [PipelinesService],
|
||||||
})
|
})
|
||||||
export class PipelinesV2Module {}
|
export class PipelinesV2Module {}
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
|
/* eslint-disable no-async-promise-executor */
|
||||||
import {
|
import {
|
||||||
BadRequestException,
|
BadRequestException,
|
||||||
|
ConflictException,
|
||||||
HttpException,
|
HttpException,
|
||||||
HttpStatus,
|
HttpStatus,
|
||||||
Inject,
|
Inject,
|
||||||
@@ -16,7 +18,7 @@ import { lastValueFrom } from 'rxjs';
|
|||||||
|
|
||||||
import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
|
import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
|
||||||
import { PipelinesClientConfiguration } from './pipelines-client';
|
import { PipelinesClientConfiguration } from './pipelines-client';
|
||||||
import { ICreatePipelineV2Req } from './interfaces';
|
import { ICreatePipelineV2Req, IIdRequest, UpdatePlatformInputRequest, UpdateTableDTO } from './interfaces';
|
||||||
import { PipelineV2CreateRequest } from '@dadosfera/protospack-v2/dist/lib/PipelineV2/interfaces/messages';
|
import { PipelineV2CreateRequest } from '@dadosfera/protospack-v2/dist/lib/PipelineV2/interfaces/messages';
|
||||||
import { Metadata } from '@grpc/grpc-js';
|
import { Metadata } from '@grpc/grpc-js';
|
||||||
import { ConnectorClientService } from '../connector/client.service';
|
import { ConnectorClientService } from '../connector/client.service';
|
||||||
@@ -26,6 +28,17 @@ import { TransformationsService } from '../transformations/transformations.servi
|
|||||||
import { getObjValueFromPath, objHasPath } from 'src/utils/ObjValueFromPath';
|
import { getObjValueFromPath, objHasPath } from 'src/utils/ObjValueFromPath';
|
||||||
import ErrorCodes from 'src/utils/errorCodes';
|
import ErrorCodes from 'src/utils/errorCodes';
|
||||||
import ErrorBuilder from 'src/utils/ErrorBuilder';
|
import ErrorBuilder from 'src/utils/ErrorBuilder';
|
||||||
|
import { PlatformApiService } from '../platform-api/platform-api.service';
|
||||||
|
import { Info } from '@dadosfera/protospack-v2/dist/lib/Input/interfaces/entities';
|
||||||
|
import { TableUpdate } from '@dadosfera/protospack-v2/dist/lib/Input/interfaces/messages';
|
||||||
|
import { AxiosError } from 'axios';
|
||||||
|
import { NimbusService } from 'src/services/nimbus/nimbus.service';
|
||||||
|
import { PERMISSIONS_GROUPS } from 'src/authentication/permissions.enum';
|
||||||
|
import { PackTheMetadata } from 'src/utils/PackTheMetadata';
|
||||||
|
import { IDataAsset } from '../catalog/dtos';
|
||||||
|
import { CatalogService } from '../catalog/catalog.service';
|
||||||
|
|
||||||
|
type RollbackPromise = () => Promise<any>;
|
||||||
|
|
||||||
export class PipelinesService implements OnModuleInit {
|
export class PipelinesService implements OnModuleInit {
|
||||||
logger: DadosferaLogger;
|
logger: DadosferaLogger;
|
||||||
@@ -39,6 +52,9 @@ export class PipelinesService implements OnModuleInit {
|
|||||||
private readonly connectorService: ConnectorClientService,
|
private readonly connectorService: ConnectorClientService,
|
||||||
private readonly inputsService: InputsService,
|
private readonly inputsService: InputsService,
|
||||||
private readonly transformationsService: TransformationsService,
|
private readonly transformationsService: TransformationsService,
|
||||||
|
private readonly platformAPI: PlatformApiService,
|
||||||
|
private readonly nimbusService: NimbusService,
|
||||||
|
private readonly catalogService: CatalogService
|
||||||
) {
|
) {
|
||||||
this.logger = dadosferaLogger.logger;
|
this.logger = dadosferaLogger.logger;
|
||||||
}
|
}
|
||||||
@@ -138,6 +154,7 @@ export class PipelinesService implements OnModuleInit {
|
|||||||
const findOnePipelineResponse = await lastValueFrom(
|
const findOnePipelineResponse = await lastValueFrom(
|
||||||
this.pipelineReadService.PipelineV2FindOne(data, metadata),
|
this.pipelineReadService.PipelineV2FindOne(data, metadata),
|
||||||
);
|
);
|
||||||
|
console.log('pipeline find one response', findOnePipelineResponse);
|
||||||
this.logger.info('Done');
|
this.logger.info('Done');
|
||||||
|
|
||||||
return findOnePipelineResponse;
|
return findOnePipelineResponse;
|
||||||
@@ -160,6 +177,15 @@ export class PipelinesService implements OnModuleInit {
|
|||||||
return updatePipelineResponse;
|
return updatePipelineResponse;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async upgrade(id: string, metadata: Metadata) {
|
||||||
|
await lastValueFrom(
|
||||||
|
this.pipelineWriteService.Upgrade(
|
||||||
|
{ id },
|
||||||
|
metadata,
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
async remove(data: { id: string; metadata: Metadata; user: RequestUser }) {
|
async remove(data: { id: string; metadata: Metadata; user: RequestUser }) {
|
||||||
const { id, metadata, user } = data;
|
const { id, metadata, user } = data;
|
||||||
const info = {
|
const info = {
|
||||||
@@ -339,4 +365,320 @@ export class PipelinesService implements OnModuleInit {
|
|||||||
|
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async updatePipelineInput(pipelineId: string, inputId: string, updateInputDTO: UpdatePlatformInputRequest, info: Info, user: RequestUser, metadata: Metadata) {
|
||||||
|
this.logger.info('InputClientService - Update');
|
||||||
|
|
||||||
|
const {
|
||||||
|
input: oldInput
|
||||||
|
} = await this.inputsService.findOne({
|
||||||
|
id: inputId,
|
||||||
|
info: info
|
||||||
|
});
|
||||||
|
|
||||||
|
this.logger.info('Update Dynamo Reference :' + JSON.stringify(oldInput));
|
||||||
|
const pipelineIdFormat = pipelineId.split('-').join('_');
|
||||||
|
const rollback: RollbackPromise[] = [];
|
||||||
|
|
||||||
|
const updateInputResponse = await this.inputsService.update(
|
||||||
|
inputId,
|
||||||
|
updateInputDTO,
|
||||||
|
info,
|
||||||
|
metadata
|
||||||
|
);
|
||||||
|
|
||||||
|
const inputRollback = () => {
|
||||||
|
this.logger.info("exec rollback to input: " + JSON.stringify(oldInput));
|
||||||
|
return this.inputsService.rollbackUpdate(
|
||||||
|
{
|
||||||
|
id: inputId,
|
||||||
|
dataAssetUpdate: updateInputResponse.dataAssetUpdate,
|
||||||
|
tables: oldInput.tables,
|
||||||
|
info
|
||||||
|
}
|
||||||
|
) as Promise<any>;
|
||||||
|
}
|
||||||
|
|
||||||
|
rollback.push(inputRollback);
|
||||||
|
|
||||||
|
this.logger.info("Input Update Response: " + JSON.stringify(updateInputResponse))
|
||||||
|
|
||||||
|
const nimbusUpdates = updateInputResponse?.tablesUpdate || [];
|
||||||
|
|
||||||
|
if (user.customer_modules.includes('catalog')) {
|
||||||
|
nimbusUpdates.forEach(update => {
|
||||||
|
const nimbusRollback = () => {
|
||||||
|
return this.nimbusService.renameTable(
|
||||||
|
info.customer,
|
||||||
|
update.database,
|
||||||
|
{
|
||||||
|
table_name: update.table_name,
|
||||||
|
table_schema: update.table_schema
|
||||||
|
},
|
||||||
|
{
|
||||||
|
table_name: update.old_table_name,
|
||||||
|
table_schema: update.old_table_schema
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
rollback.push(nimbusRollback);
|
||||||
|
});
|
||||||
|
|
||||||
|
try {
|
||||||
|
await this.updateNimbus(info.customer, nimbusUpdates);
|
||||||
|
} catch (error) {
|
||||||
|
this.logger.error(error);
|
||||||
|
if (error instanceof AxiosError) {
|
||||||
|
this.logger.error(JSON.stringify(error.response.data));
|
||||||
|
}
|
||||||
|
await this.executeRenameRollback(rollback);
|
||||||
|
|
||||||
|
throw new Error("Error Nimbus updating tables");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
await this.updatePlatformJobs(
|
||||||
|
pipelineIdFormat,
|
||||||
|
updateInputResponse.input.type,
|
||||||
|
updateInputDTO,
|
||||||
|
user
|
||||||
|
);
|
||||||
|
} catch (error) {
|
||||||
|
this.logger.error(error);
|
||||||
|
await this.executeRenameRollback(rollback)
|
||||||
|
throw new Error("Error Platform API updating jobs");
|
||||||
|
}
|
||||||
|
|
||||||
|
return updateInputResponse;
|
||||||
|
}
|
||||||
|
|
||||||
|
private async executeRenameRollback(request: RollbackPromise[]) {
|
||||||
|
this.logger.info('rollback steps: ' + request.length)
|
||||||
|
const result = await Promise.allSettled(request.map(func => func()));
|
||||||
|
result.forEach(promise => {
|
||||||
|
this.logger.info("Promise finish with status: " + promise.status)
|
||||||
|
|
||||||
|
if (promise.status === "rejected") {
|
||||||
|
this.logger.error("reject with: " + JSON.stringify(promise.reason || {}))
|
||||||
|
}
|
||||||
|
|
||||||
|
if (promise.status === "fulfilled") {
|
||||||
|
this.logger.info("success with: " + JSON.stringify(promise.value || {}))
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private async updateNimbus(customer: string, changes: TableUpdate[]) {
|
||||||
|
// throw new Error("teste error nimbus");
|
||||||
|
this.logger.info('Nimbus Changes: ' + JSON.stringify(changes));
|
||||||
|
if(!changes || changes.length === 0) return;
|
||||||
|
|
||||||
|
const requests = changes.map(change => {
|
||||||
|
return this.nimbusService.renameTable(customer, change.database, {
|
||||||
|
table_name: change.old_table_name,
|
||||||
|
table_schema: change.old_table_schema
|
||||||
|
}, {
|
||||||
|
table_name: change.table_name,
|
||||||
|
table_schema: change.table_schema
|
||||||
|
});
|
||||||
|
})
|
||||||
|
|
||||||
|
const values = await Promise.allSettled(requests);
|
||||||
|
|
||||||
|
const success = values.map(request => request.status === "fulfilled")
|
||||||
|
|
||||||
|
this.logger.info("Updates with succes: " + success.length);
|
||||||
|
|
||||||
|
values.forEach(promise => {
|
||||||
|
this.logger.info("Promise finish with status: " + promise.status)
|
||||||
|
|
||||||
|
if (promise.status === "rejected") {
|
||||||
|
this.logger.error("reject with: " + JSON.stringify(promise.reason || {}));
|
||||||
|
throw new Error(promise.reason );
|
||||||
|
}
|
||||||
|
|
||||||
|
if (promise.status === "fulfilled") {
|
||||||
|
this.logger.info("success with: " + JSON.stringify(promise.value || {}));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
async updatePlatformJobs(pipelineId: string, pipelineType: string, updateInputDTO: UpdatePlatformInputRequest, user: RequestUser) {
|
||||||
|
const jobsUpdated = [];
|
||||||
|
|
||||||
|
for (const [index, table] of updateInputDTO.tables.entries()) {
|
||||||
|
const jobUpdate = {
|
||||||
|
job_id: `${pipelineId}_${index}`,
|
||||||
|
}
|
||||||
|
|
||||||
|
if (table.type !== "incremental_with_qualify") {
|
||||||
|
delete table.destinations?.qualify;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (table.memory) {
|
||||||
|
jobUpdate["memory"] = {
|
||||||
|
amount: table.memory * 1000
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
this.logger.info('Updating input reference for table: ' + table.name);
|
||||||
|
let hasUpdateSyncMode = false;
|
||||||
|
|
||||||
|
const jobSyncMode = {}
|
||||||
|
|
||||||
|
if (table.columns) {
|
||||||
|
hasUpdateSyncMode = true;
|
||||||
|
jobSyncMode['column_include_list'] = table.columns;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (table.reference_column) {
|
||||||
|
hasUpdateSyncMode = true;
|
||||||
|
jobSyncMode['incremental_column_name'] = table.reference_column.name;
|
||||||
|
jobSyncMode['incremental_column_type'] = table.reference_column.type;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (table.identifier_columns) {
|
||||||
|
hasUpdateSyncMode = true;
|
||||||
|
jobSyncMode['primary_keys'] = table.identifier_columns;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (table.type) {
|
||||||
|
hasUpdateSyncMode = true;
|
||||||
|
|
||||||
|
jobSyncMode['target_load_type'] = table.type;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(hasUpdateSyncMode) {
|
||||||
|
jobUpdate["sync_mode"] = jobSyncMode;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (Object.keys(table.destinations).length > 1) {
|
||||||
|
let hasChanges = false
|
||||||
|
const jobRenameTables = {
|
||||||
|
raw: {},
|
||||||
|
qualify: {}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (Object.keys(table.destinations.raw).length > 1) {
|
||||||
|
hasChanges = true;
|
||||||
|
jobRenameTables.raw = table.destinations.raw;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (Object.keys(table.destinations.qualify).length > 1) {
|
||||||
|
hasChanges = true;
|
||||||
|
jobRenameTables.qualify = table.destinations.qualify;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (hasChanges) {
|
||||||
|
jobUpdate['rename_tables'] = jobRenameTables;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
jobsUpdated.push(jobUpdate);
|
||||||
|
}
|
||||||
|
|
||||||
|
this.logger.info('Request body:' + JSON.stringify({
|
||||||
|
jobs_updated: jobsUpdated
|
||||||
|
}));
|
||||||
|
|
||||||
|
const response = await this.platformAPI.proxy(
|
||||||
|
'PUT',
|
||||||
|
`/pipeline/${pipelineId}/jobs`,
|
||||||
|
user,
|
||||||
|
{
|
||||||
|
job_updates: jobsUpdated
|
||||||
|
}
|
||||||
|
)
|
||||||
|
this.logger.info('Platform api response: ' + JSON.stringify(response));
|
||||||
|
}
|
||||||
|
|
||||||
|
async findAllDataAssetByPipeline(data: {
|
||||||
|
pipeline: string,
|
||||||
|
object?: string
|
||||||
|
}, user: RequestUser) {
|
||||||
|
const metadata = PackTheMetadata(user);
|
||||||
|
|
||||||
|
const isDataAdmin = user.permissions.includes(
|
||||||
|
PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER.seqid,
|
||||||
|
);
|
||||||
|
|
||||||
|
let has_permission = false;
|
||||||
|
|
||||||
|
const {
|
||||||
|
data_assets: resultString
|
||||||
|
} = await lastValueFrom(
|
||||||
|
this.pipelineReadService.FindAllDataAssetByPipeline(data, metadata)
|
||||||
|
);
|
||||||
|
|
||||||
|
const result = JSON.parse(resultString) as any;
|
||||||
|
const data_assets: IDataAsset[] = []
|
||||||
|
result.forEach(data_asset => {
|
||||||
|
if (data_asset?.owner === user.username) has_permission = true;
|
||||||
|
|
||||||
|
for (const role of user.roles) {
|
||||||
|
if (data_asset.roles.includes(role)) has_permission = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (data_asset.users.includes(user.user_id)) has_permission = true;
|
||||||
|
|
||||||
|
if (isDataAdmin || has_permission) {
|
||||||
|
delete data_asset.p_roles;
|
||||||
|
delete data_asset.p_users;
|
||||||
|
data_assets.push(data_asset as IDataAsset);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
const assets = await this.catalogService.getAssetsUsersAndRoles(data_assets, user.customer_id);
|
||||||
|
|
||||||
|
return assets;
|
||||||
|
}
|
||||||
|
|
||||||
|
async getPipelineStatus(data) {
|
||||||
|
this.logger.info('PipelinesClientService - GetPipelineStatus');
|
||||||
|
|
||||||
|
const statusPipelineResponse = await lastValueFrom(
|
||||||
|
this.pipelineReadService.PipelineV2GetPipelineV2Status(data),
|
||||||
|
)
|
||||||
|
.then((res) => {
|
||||||
|
const statusArray =
|
||||||
|
res.status?.sort((a, b) => {
|
||||||
|
if (a.id < b.id) {
|
||||||
|
return 1;
|
||||||
|
} else {
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
}) || [];
|
||||||
|
return { status: statusArray };
|
||||||
|
})
|
||||||
|
.catch((err) => {
|
||||||
|
this.logger.error(err.message);
|
||||||
|
throw new Error(err);
|
||||||
|
});
|
||||||
|
this.logger.info('Done');
|
||||||
|
|
||||||
|
return statusPipelineResponse;
|
||||||
|
}
|
||||||
|
|
||||||
|
async runPipeline({ id, info }: IIdRequest) {
|
||||||
|
this.logger.info('PipelinesClientService - RunPipeline');
|
||||||
|
const statusPipelineResponse = await lastValueFrom(
|
||||||
|
this.pipelineWriteService.PipelineV2TriggerPipelineV2({ id, info }),
|
||||||
|
).catch((err) => {
|
||||||
|
this.logger.error(err.message);
|
||||||
|
throw new Error(err);
|
||||||
|
});
|
||||||
|
|
||||||
|
if (statusPipelineResponse.status == false) {
|
||||||
|
throw new ConflictException(
|
||||||
|
'This pipeline is not ready yet to execute, Try again later!',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
this.logger.info('Done');
|
||||||
|
return statusPipelineResponse;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,24 +10,47 @@ import {
|
|||||||
Query,
|
Query,
|
||||||
Inject,
|
Inject,
|
||||||
BadRequestException,
|
BadRequestException,
|
||||||
|
HttpException,
|
||||||
|
NotFoundException,
|
||||||
|
UseGuards,
|
||||||
} from '@nestjs/common';
|
} from '@nestjs/common';
|
||||||
import { ApiTags, ApiOperation } from '@nestjs/swagger';
|
import { ApiTags, ApiOperation, ApiOkResponse } from '@nestjs/swagger';
|
||||||
import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
|
import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
|
||||||
|
|
||||||
import {
|
import {
|
||||||
Authenticated,
|
Authenticated,
|
||||||
RequireAllPermissions,
|
RequireAllPermissions,
|
||||||
|
RequireModule,
|
||||||
} from '../../decorators/authentication.decorator';
|
} from '../../decorators/authentication.decorator';
|
||||||
import { User, RequestUser } from '../../decorators/user.decorator';
|
import { User, RequestUser } from '../../decorators/user.decorator';
|
||||||
import { PlatformApiService } from './platform-api.service';
|
import { PlatformApiService } from './platform-api.service';
|
||||||
import { PERMISSIONS_GROUPS } from '../../authentication/permissions.enum';
|
import { DADOSFERA_MODULES_KEYS, PERMISSIONS_GROUPS } from '../../authentication/permissions.enum';
|
||||||
import { ElasticsearchService } from '../../services/elasticsearch';
|
import { ElasticsearchService } from '../../services/elasticsearch';
|
||||||
import { DynamoDBService, ReferenceColumn } from '../../services/dynamodb';
|
import { DynamoDBService, ReferenceColumn } from '../../services/dynamodb';
|
||||||
import { CustomersService } from '../customers/customers.service';
|
import { CustomersService } from '../customers/customers.service';
|
||||||
import { validateCronAgainstScheduleLimit } from '../../utils/cron-validation';
|
import { validateCronAgainstScheduleLimit } from '../../utils/cron-validation';
|
||||||
|
import { CatalogService } from '../catalog/catalog.service';
|
||||||
|
import { PackTheMetadata } from '../../utils/PackTheMetadata';
|
||||||
|
import { ValidationTableDTO } from './platform-api.dto';
|
||||||
|
import { InputsService } from '../inputs/inputs.service';
|
||||||
|
import { PipelineExecutionGuard } from 'src/guards/pipeline-execution.guard';
|
||||||
|
|
||||||
|
|
||||||
|
type ValidateTablesDTO = {
|
||||||
|
tables: Array<{
|
||||||
|
table_schema: string,
|
||||||
|
table_name: string
|
||||||
|
}>
|
||||||
|
}
|
||||||
|
|
||||||
|
type RenameTablesBody = {
|
||||||
|
raw?: { table_name: string; table_schema: string };
|
||||||
|
qualify?: { table_name: string; table_schema: string };
|
||||||
|
}
|
||||||
|
|
||||||
@ApiTags('Platform API')
|
@ApiTags('Platform API')
|
||||||
@Controller('platform')
|
@Controller('platform')
|
||||||
|
@RequireModule(DADOSFERA_MODULES_KEYS.COLLECT)
|
||||||
export class PlatformApiController {
|
export class PlatformApiController {
|
||||||
private logger: any;
|
private logger: any;
|
||||||
|
|
||||||
@@ -36,6 +59,8 @@ export class PlatformApiController {
|
|||||||
private readonly elasticsearchService: ElasticsearchService,
|
private readonly elasticsearchService: ElasticsearchService,
|
||||||
private readonly dynamoDBService: DynamoDBService,
|
private readonly dynamoDBService: DynamoDBService,
|
||||||
private readonly customersService: CustomersService,
|
private readonly customersService: CustomersService,
|
||||||
|
private readonly catalogService: CatalogService,
|
||||||
|
private readonly inputsService: InputsService,
|
||||||
@Inject(DadosferaLogger) dadosferaLogger: DadosferaLogger,
|
@Inject(DadosferaLogger) dadosferaLogger: DadosferaLogger,
|
||||||
) {
|
) {
|
||||||
this.logger = dadosferaLogger.logger;
|
this.logger = dadosferaLogger.logger;
|
||||||
@@ -49,6 +74,10 @@ export class PlatformApiController {
|
|||||||
return id?.replace(/-/g, '_') || '';
|
return id?.replace(/-/g, '_') || '';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private decodePathParam(value: string): string {
|
||||||
|
return value ? decodeURIComponent(value) : '';
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Denormalize ID back to UUID format (replace _ with -).
|
* Denormalize ID back to UUID format (replace _ with -).
|
||||||
* Used when we receive a normalized ID but need the original UUID.
|
* Used when we receive a normalized ID but need the original UUID.
|
||||||
@@ -67,6 +96,23 @@ export class PlatformApiController {
|
|||||||
return jobId?.replace(/-/g, '_') || '';
|
return jobId?.replace(/-/g, '_') || '';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private async getJobByAnyConnectorType(normalizedJobId: string, user: RequestUser): Promise<any> {
|
||||||
|
const connectorTypes = ['jdbc', 'singer', 's3'];
|
||||||
|
for (const type of connectorTypes) {
|
||||||
|
try {
|
||||||
|
const job = await this.platformApiService.proxy(
|
||||||
|
'GET',
|
||||||
|
`/jobs/${type}/${normalizedJobId}`,
|
||||||
|
user,
|
||||||
|
);
|
||||||
|
return job;
|
||||||
|
} catch (error) {
|
||||||
|
// Continue to next connector type
|
||||||
|
}
|
||||||
|
}
|
||||||
|
throw new HttpException(`Job ${normalizedJobId} not found in any connector type (jdbc, singer, s3)`, 404);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Extract the pipeline ID (base UUID) from a job ID.
|
* Extract the pipeline ID (base UUID) from a job ID.
|
||||||
* Job IDs have format "uuid-suffix" where suffix is the job index (e.g., "0", "1").
|
* Job IDs have format "uuid-suffix" where suffix is the job index (e.g., "0", "1").
|
||||||
@@ -94,7 +140,7 @@ export class PlatformApiController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private readonly VALID_CONNECTORS = ['jdbc', 'singer', 's3'];
|
private readonly VALID_CONNECTORS = ['jdbc', 'singer', 's3'];
|
||||||
private readonly MAX_MEMORY_MB = 12000; // 12GB maximum memory per pipeline/job
|
private readonly MAX_MEMORY_MB = 12000; // 12GB maximum memory per pipelines/job
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Validate that connector is provided and is a valid type.
|
* Validate that connector is provided and is a valid type.
|
||||||
@@ -365,55 +411,9 @@ export class PlatformApiController {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Sync sync-mode changes to DynamoDB for JDBC connectors.
|
|
||||||
* Always passes both target_load_type and incremental_column_name to ensure proper sync.
|
|
||||||
*/
|
|
||||||
private async syncJdbcSyncModeToDynamoDB(
|
|
||||||
jobId: string,
|
|
||||||
body: any,
|
|
||||||
user: RequestUser,
|
|
||||||
): Promise<void> {
|
|
||||||
// JDBC sync mode uses target_load_type field
|
|
||||||
const changes: any = {};
|
|
||||||
|
|
||||||
if ('target_load_type' in body) {
|
|
||||||
changes.target_load_type = body.target_load_type;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Handle incremental_column_name:
|
|
||||||
// - If provided in body, use that value
|
|
||||||
// - If changing to full_load, explicitly clear it
|
|
||||||
if ('incremental_column_name' in body) {
|
|
||||||
changes.incremental_column_name = body.incremental_column_name;
|
|
||||||
changes.incremental_column_type = body.incremental_column_type;
|
|
||||||
} else if (body.target_load_type === 'full_load') {
|
|
||||||
// Changing to full_load without specifying incremental_column - clear it
|
|
||||||
changes.incremental_column_name = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
await this.syncJobInputToDynamoDB(jobId, changes, user, 'jdbc');
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Sync sync-mode changes to DynamoDB for Singer connectors.
|
|
||||||
*/
|
|
||||||
private async syncSingerSyncModeToDynamoDB(
|
|
||||||
jobId: string,
|
|
||||||
body: any,
|
|
||||||
user: RequestUser,
|
|
||||||
): Promise<void> {
|
|
||||||
// Singer sync mode uses replication_method field
|
|
||||||
// Map to DynamoDB type: FULL_TABLE -> full_load, INCREMENTAL -> incremental
|
|
||||||
if ('replication_method' in body) {
|
|
||||||
const type = body.replication_method === 'INCREMENTAL' ? 'incremental' : 'full_load';
|
|
||||||
await this.syncJobInputToDynamoDB(jobId, { load_type: type }, user, 'singer');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// ==================== PIPELINE ROUTES ====================
|
// ==================== PIPELINE ROUTES ====================
|
||||||
|
|
||||||
@Post('pipeline')
|
@Post('pipelines')
|
||||||
@ApiOperation({ summary: 'Create a new pipeline' })
|
@ApiOperation({ summary: 'Create a new pipeline' })
|
||||||
@RequireAllPermissions(PERMISSIONS_GROUPS.PIPELINE.permissions.CREATE)
|
@RequireAllPermissions(PERMISSIONS_GROUPS.PIPELINE.permissions.CREATE)
|
||||||
async createPipeline(@Body() body: any, @User() user: RequestUser) {
|
async createPipeline(@Body() body: any, @User() user: RequestUser) {
|
||||||
@@ -534,7 +534,7 @@ export class PlatformApiController {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Get('pipeline/:pipelineId')
|
@Get('pipelines/:pipelineId')
|
||||||
@ApiOperation({ summary: 'Get pipeline by ID' })
|
@ApiOperation({ summary: 'Get pipeline by ID' })
|
||||||
@RequireAllPermissions(PERMISSIONS_GROUPS.PIPELINE.permissions.GET)
|
@RequireAllPermissions(PERMISSIONS_GROUPS.PIPELINE.permissions.GET)
|
||||||
async getPipeline(
|
async getPipeline(
|
||||||
@@ -545,7 +545,7 @@ export class PlatformApiController {
|
|||||||
return this.platformApiService.proxy('GET', `/pipeline/${normalizedId}`, user);
|
return this.platformApiService.proxy('GET', `/pipeline/${normalizedId}`, user);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Patch('pipeline/:pipelineId')
|
@Patch('pipelines/:pipelineId')
|
||||||
@ApiOperation({ summary: 'Update pipeline by ID' })
|
@ApiOperation({ summary: 'Update pipeline by ID' })
|
||||||
@RequireAllPermissions(PERMISSIONS_GROUPS.PIPELINE.permissions.UPDATE)
|
@RequireAllPermissions(PERMISSIONS_GROUPS.PIPELINE.permissions.UPDATE)
|
||||||
async updatePipeline(
|
async updatePipeline(
|
||||||
@@ -596,7 +596,7 @@ export class PlatformApiController {
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Delete('pipeline/:pipelineId')
|
@Delete('pipelines/:pipelineId')
|
||||||
@ApiOperation({ summary: 'Delete pipeline by ID' })
|
@ApiOperation({ summary: 'Delete pipeline by ID' })
|
||||||
@RequireAllPermissions(PERMISSIONS_GROUPS.PIPELINE.permissions.DELETE)
|
@RequireAllPermissions(PERMISSIONS_GROUPS.PIPELINE.permissions.DELETE)
|
||||||
async deletePipeline(
|
async deletePipeline(
|
||||||
@@ -626,7 +626,7 @@ export class PlatformApiController {
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post('pipeline/execute')
|
@Post('pipelines/execute')
|
||||||
@ApiOperation({ summary: 'Execute a pipeline' })
|
@ApiOperation({ summary: 'Execute a pipeline' })
|
||||||
@RequireAllPermissions(PERMISSIONS_GROUPS.PIPELINE.permissions.UPDATE)
|
@RequireAllPermissions(PERMISSIONS_GROUPS.PIPELINE.permissions.UPDATE)
|
||||||
async executePipeline(@Body() body: any, @User() user: RequestUser) {
|
async executePipeline(@Body() body: any, @User() user: RequestUser) {
|
||||||
@@ -636,10 +636,10 @@ export class PlatformApiController {
|
|||||||
...body,
|
...body,
|
||||||
customer_id: user.customer_name,
|
customer_id: user.customer_name,
|
||||||
};
|
};
|
||||||
return this.platformApiService.proxy('POST', '/pipeline/execute', user, enrichedBody);
|
return this.platformApiService.proxy('POST', '/pipelines/execute', user, enrichedBody);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post('pipeline/pause')
|
@Post('pipelines/pause')
|
||||||
@ApiOperation({ summary: 'Pause a pipeline' })
|
@ApiOperation({ summary: 'Pause a pipeline' })
|
||||||
@RequireAllPermissions(PERMISSIONS_GROUPS.PIPELINE.permissions.UPDATE)
|
@RequireAllPermissions(PERMISSIONS_GROUPS.PIPELINE.permissions.UPDATE)
|
||||||
async pausePipeline(@Body() body: any, @User() user: RequestUser) {
|
async pausePipeline(@Body() body: any, @User() user: RequestUser) {
|
||||||
@@ -652,7 +652,7 @@ export class PlatformApiController {
|
|||||||
return this.platformApiService.proxy('POST', '/pipeline/pause', user, enrichedBody);
|
return this.platformApiService.proxy('POST', '/pipeline/pause', user, enrichedBody);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post('pipeline/unpause')
|
@Post('pipelines/unpause')
|
||||||
@ApiOperation({ summary: 'Unpause a pipeline' })
|
@ApiOperation({ summary: 'Unpause a pipeline' })
|
||||||
@RequireAllPermissions(PERMISSIONS_GROUPS.PIPELINE.permissions.UPDATE)
|
@RequireAllPermissions(PERMISSIONS_GROUPS.PIPELINE.permissions.UPDATE)
|
||||||
async unpausePipeline(@Body() body: any, @User() user: RequestUser) {
|
async unpausePipeline(@Body() body: any, @User() user: RequestUser) {
|
||||||
@@ -665,7 +665,7 @@ export class PlatformApiController {
|
|||||||
return this.platformApiService.proxy('POST', '/pipeline/unpause', user, enrichedBody);
|
return this.platformApiService.proxy('POST', '/pipeline/unpause', user, enrichedBody);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Put('pipeline/:pipelineId/memory')
|
@Put('pipelines/:pipelineId/memory')
|
||||||
@ApiOperation({ summary: 'Update pipeline memory configuration' })
|
@ApiOperation({ summary: 'Update pipeline memory configuration' })
|
||||||
@RequireAllPermissions(PERMISSIONS_GROUPS.PIPELINE.permissions.UPDATE)
|
@RequireAllPermissions(PERMISSIONS_GROUPS.PIPELINE.permissions.UPDATE)
|
||||||
async updatePipelineMemory(
|
async updatePipelineMemory(
|
||||||
@@ -688,7 +688,7 @@ export class PlatformApiController {
|
|||||||
|
|
||||||
// ==================== PIPELINE METADATA ROUTES ====================
|
// ==================== PIPELINE METADATA ROUTES ====================
|
||||||
|
|
||||||
@Put('pipeline/:pipelineId/metadata')
|
@Put('pipelines/:pipelineId/metadata')
|
||||||
@ApiOperation({ summary: 'Update pipeline metadata' })
|
@ApiOperation({ summary: 'Update pipeline metadata' })
|
||||||
@RequireAllPermissions(PERMISSIONS_GROUPS.PIPELINE.permissions.UPDATE)
|
@RequireAllPermissions(PERMISSIONS_GROUPS.PIPELINE.permissions.UPDATE)
|
||||||
async updatePipelineMetadata(
|
async updatePipelineMetadata(
|
||||||
@@ -720,9 +720,44 @@ export class PlatformApiController {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ==================== PIPELINE VALIDATION ====================
|
||||||
|
|
||||||
|
@Get('pipelines/catalog/schemas')
|
||||||
|
@ApiOperation({ summary: 'Get available schemas' })
|
||||||
|
@RequireAllPermissions(PERMISSIONS_GROUPS.PIPELINE.permissions.GET)
|
||||||
|
async getAvailableSchemas(
|
||||||
|
@User() user: RequestUser,
|
||||||
|
@Query() query: Record<string, string>,
|
||||||
|
) {
|
||||||
|
return this.platformApiService.proxy(
|
||||||
|
'GET',
|
||||||
|
`/catalog/schemas`,
|
||||||
|
user,
|
||||||
|
undefined,
|
||||||
|
query,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Post('pipelines/catalog/tables/validate')
|
||||||
|
@ApiOperation({ summary: 'Validate Table and Schema' })
|
||||||
|
@RequireAllPermissions(PERMISSIONS_GROUPS.PIPELINE.permissions.GET)
|
||||||
|
async validateTableAndSchema(
|
||||||
|
@Body() payload: ValidationTableDTO,
|
||||||
|
@User() user: RequestUser,
|
||||||
|
@Query() query: Record<string, string>,
|
||||||
|
) {
|
||||||
|
return this.platformApiService.proxy(
|
||||||
|
'POST',
|
||||||
|
`/catalog/tables/validate`,
|
||||||
|
user,
|
||||||
|
payload,
|
||||||
|
query,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
// ==================== PIPELINE RUN ROUTES ====================
|
// ==================== PIPELINE RUN ROUTES ====================
|
||||||
|
|
||||||
@Get('pipeline/:pipelineId/pipeline_run')
|
@Get('pipelines/:pipelineId/pipeline_run')
|
||||||
@ApiOperation({ summary: 'Get pipeline runs for a pipeline' })
|
@ApiOperation({ summary: 'Get pipeline runs for a pipeline' })
|
||||||
@RequireAllPermissions(PERMISSIONS_GROUPS.PIPELINE.permissions.GET)
|
@RequireAllPermissions(PERMISSIONS_GROUPS.PIPELINE.permissions.GET)
|
||||||
async getPipelineRuns(
|
async getPipelineRuns(
|
||||||
@@ -740,7 +775,7 @@ export class PlatformApiController {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Get('pipeline/:pipelineId/pipeline_run/:runId')
|
@Get('pipelines/:pipelineId/pipeline_run/:runId')
|
||||||
@ApiOperation({ summary: 'Get specific pipeline run' })
|
@ApiOperation({ summary: 'Get specific pipeline run' })
|
||||||
@RequireAllPermissions(PERMISSIONS_GROUPS.PIPELINE.permissions.GET)
|
@RequireAllPermissions(PERMISSIONS_GROUPS.PIPELINE.permissions.GET)
|
||||||
async getPipelineRun(
|
async getPipelineRun(
|
||||||
@@ -757,7 +792,7 @@ export class PlatformApiController {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Get('pipeline/pipeline_run/:runId/logs')
|
@Get('pipelines/pipeline_run/:runId/logs')
|
||||||
@ApiOperation({ summary: 'Get pipeline run logs' })
|
@ApiOperation({ summary: 'Get pipeline run logs' })
|
||||||
@RequireAllPermissions(PERMISSIONS_GROUPS.PIPELINE.permissions.GET)
|
@RequireAllPermissions(PERMISSIONS_GROUPS.PIPELINE.permissions.GET)
|
||||||
async getPipelineRunLogs(
|
async getPipelineRunLogs(
|
||||||
@@ -775,6 +810,68 @@ export class PlatformApiController {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Post('pipelines/:pipelineId/pipeline_run/:runId/cancel')
|
||||||
|
@ApiOperation({ summary: 'Cancel a running pipeline run' })
|
||||||
|
@RequireAllPermissions(PERMISSIONS_GROUPS.PIPELINE.permissions.UPDATE)
|
||||||
|
async cancelPipelineRun(
|
||||||
|
@Param('pipelineId') pipelineId: string,
|
||||||
|
@Param('runId') runId: string,
|
||||||
|
@User() user: RequestUser,
|
||||||
|
) {
|
||||||
|
const normalizedPipelineId = this.normalizePipelineId(pipelineId);
|
||||||
|
const normalizedRunId = this.normalizePipelineId(runId);
|
||||||
|
|
||||||
|
const status = await this.platformApiService.proxy(
|
||||||
|
'GET',
|
||||||
|
`/pipeline/${normalizedPipelineId}/pipeline_run`,
|
||||||
|
user,
|
||||||
|
);
|
||||||
|
|
||||||
|
if (status.length === 1) {
|
||||||
|
throw new BadRequestException('The first pipeline cannot be canceled');
|
||||||
|
}
|
||||||
|
|
||||||
|
return this.platformApiService.proxy(
|
||||||
|
'POST',
|
||||||
|
`/pipeline/${normalizedPipelineId}/pipeline_run/${normalizedRunId}/cancel`,
|
||||||
|
user,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Get('pipelines/:pipelineId/pipeline_run/:runId/jobs')
|
||||||
|
@ApiOperation({
|
||||||
|
summary: 'Get pipeline run jobs',
|
||||||
|
description: 'Proxies platform-api DB-backed job runs and returns `{ jobs: [...] }`.',
|
||||||
|
})
|
||||||
|
@ApiOkResponse({
|
||||||
|
description: 'DB-backed job runs for the selected pipeline run.',
|
||||||
|
schema: {
|
||||||
|
type: 'object',
|
||||||
|
properties: {
|
||||||
|
jobs: {
|
||||||
|
type: 'array',
|
||||||
|
items: { type: 'object' },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
required: ['jobs'],
|
||||||
|
},
|
||||||
|
})
|
||||||
|
@RequireAllPermissions(PERMISSIONS_GROUPS.PIPELINE.permissions.GET)
|
||||||
|
async getPipelineRunJobs(
|
||||||
|
@Param('pipelineId') pipelineId: string,
|
||||||
|
@Param('runId') runId: string,
|
||||||
|
@User() user: RequestUser,
|
||||||
|
) {
|
||||||
|
const normalizedPipelineId = this.normalizePipelineId(pipelineId);
|
||||||
|
const decodedRunId = this.decodePathParam(runId);
|
||||||
|
|
||||||
|
return this.platformApiService.proxy(
|
||||||
|
'GET',
|
||||||
|
`/pipeline/${normalizedPipelineId}/pipeline_run/${decodedRunId}/jobs`,
|
||||||
|
user,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
// ==================== JOBS - COLUMN EDITING ROUTES ====================
|
// ==================== JOBS - COLUMN EDITING ROUTES ====================
|
||||||
|
|
||||||
@Put('jobs/:jobId/input')
|
@Put('jobs/:jobId/input')
|
||||||
@@ -874,41 +971,54 @@ export class PlatformApiController {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
// ==================== JOBS - JDBC SYNC MODE ROUTES ====================
|
@Delete('pipelines/:pipelineId/inputs/:inputId')
|
||||||
|
@ApiOperation({ summary: 'Mark a table as deleted and delete its associated job via platform-api' })
|
||||||
@Get('jobs/jdbc/:jobId')
|
@RequireAllPermissions(PERMISSIONS_GROUPS.PIPELINE.permissions.DELETE)
|
||||||
@ApiOperation({ summary: 'Get JDBC job details' })
|
@UseGuards(PipelineExecutionGuard)
|
||||||
@RequireAllPermissions(PERMISSIONS_GROUPS.PIPELINE.permissions.GET)
|
async deleteTable(
|
||||||
async getJdbcJob(@Param('jobId') jobId: string, @User() user: RequestUser) {
|
@Param('pipelineId') pipelineId: string,
|
||||||
// Normalize job ID for Platform API (replace - with _)
|
@Param('inputId') inputId: string,
|
||||||
const normalizedJobId = this.normalizeJobId(jobId);
|
@Body() body: { table_name: string },
|
||||||
return this.platformApiService.proxy('GET', `/jobs/jdbc/${normalizedJobId}`, user);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Post('jobs/jdbc/:jobId/sync-mode')
|
|
||||||
@ApiOperation({ summary: 'Update JDBC job sync mode' })
|
|
||||||
@RequireAllPermissions(PERMISSIONS_GROUPS.PIPELINE.permissions.UPDATE)
|
|
||||||
async updateJdbcSyncMode(
|
|
||||||
@Param('jobId') jobId: string,
|
|
||||||
@Body() body: any,
|
|
||||||
@User() user: RequestUser,
|
@User() user: RequestUser,
|
||||||
) {
|
) {
|
||||||
// Normalize job ID for Platform API (replace - with _)
|
const tableName = body.table_name;
|
||||||
const normalizedJobId = this.normalizeJobId(jobId);
|
const info = {
|
||||||
|
customer_id: user.customer_id,
|
||||||
|
customer: user.customer_name,
|
||||||
|
user_id: user.user_id,
|
||||||
|
};
|
||||||
|
|
||||||
const result = await this.platformApiService.proxy(
|
this.logger.info('deleteTable: marking table as deleted', { inputId, tableName });
|
||||||
'POST',
|
const updatedInput: any = await this.inputsService.markTableDeleted({ input_id: inputId, table_name: tableName, info });
|
||||||
`/jobs/jdbc/${normalizedJobId}/sync-mode`,
|
this.logger.info('deleteTable: table marked as deleted', { inputId, tableName });
|
||||||
user,
|
|
||||||
body,
|
|
||||||
);
|
|
||||||
|
|
||||||
// Sync to DynamoDB (pass raw jobId for pipeline extraction)
|
try {
|
||||||
await this.syncJdbcSyncModeToDynamoDB(jobId, body, user);
|
const normalizedPipelineId = this.normalizePipelineId(pipelineId);
|
||||||
|
this.logger.info('deleteTable: fetching pipeline from platform-api', { pipelineId, normalizedPipelineId });
|
||||||
|
const platformPipeline = await this.platformApiService.proxy('GET', `/pipeline/${normalizedPipelineId}`, user);
|
||||||
|
this.logger.info('deleteTable: pipeline fetched', { jobCount: platformPipeline?.jobs?.length });
|
||||||
|
|
||||||
return result;
|
const job = platformPipeline?.jobs?.find((j: any) => j.input?.table_name === tableName);
|
||||||
|
if (!job) throw new NotFoundException(`Job for table '${tableName}' not found in pipeline`);
|
||||||
|
|
||||||
|
this.logger.info('deleteTable: deleting job from platform-api', { jobId: job.job_id });
|
||||||
|
await this.platformApiService.proxy('DELETE', `/jobs/${job.job_id}`, user);
|
||||||
|
this.logger.info('deleteTable: job deleted', { jobId: job.job_id });
|
||||||
|
|
||||||
|
return { name: tableName, is_deleted: updatedInput.is_deleted ?? true, deleted_at: updatedInput.deleted_at };
|
||||||
|
} catch (error) {
|
||||||
|
this.logger.error('deleteTable: platform-api delete failed, attempting rollback', { tableName, error: error.message });
|
||||||
|
try {
|
||||||
|
await this.inputsService.unmarkTableDeleted({ input_id: inputId, table_name: tableName, info });
|
||||||
|
} catch (rollbackError) {
|
||||||
|
this.logger.error('deleteTable: rollback failed', { tableName, error: rollbackError.message });
|
||||||
|
}
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ==================== JOBS - JDBC SYNC MODE ROUTES ====================
|
||||||
|
|
||||||
@Get('jobs/jdbc/configs/allowed_datatypes')
|
@Get('jobs/jdbc/configs/allowed_datatypes')
|
||||||
@ApiOperation({ summary: 'Get allowed datatypes for JDBC' })
|
@ApiOperation({ summary: 'Get allowed datatypes for JDBC' })
|
||||||
@RequireAllPermissions(PERMISSIONS_GROUPS.PIPELINE.permissions.GET)
|
@RequireAllPermissions(PERMISSIONS_GROUPS.PIPELINE.permissions.GET)
|
||||||
@@ -920,52 +1030,6 @@ export class PlatformApiController {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
// ==================== JOBS - SINGER REPLICATION ROUTES ====================
|
|
||||||
|
|
||||||
@Get('jobs/singer/:jobId')
|
|
||||||
@ApiOperation({ summary: 'Get Singer job details' })
|
|
||||||
@RequireAllPermissions(PERMISSIONS_GROUPS.PIPELINE.permissions.GET)
|
|
||||||
async getSingerJob(@Param('jobId') jobId: string, @User() user: RequestUser) {
|
|
||||||
// Normalize job ID for Platform API (replace - with _)
|
|
||||||
const normalizedJobId = this.normalizeJobId(jobId);
|
|
||||||
return this.platformApiService.proxy('GET', `/jobs/singer/${normalizedJobId}`, user);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Post('jobs/singer/:jobId/sync-mode')
|
|
||||||
@ApiOperation({ summary: 'Update Singer job sync mode' })
|
|
||||||
@RequireAllPermissions(PERMISSIONS_GROUPS.PIPELINE.permissions.UPDATE)
|
|
||||||
async updateSingerSyncMode(
|
|
||||||
@Param('jobId') jobId: string,
|
|
||||||
@Body() body: any,
|
|
||||||
@User() user: RequestUser,
|
|
||||||
) {
|
|
||||||
// Normalize job ID for Platform API (replace - with _)
|
|
||||||
const normalizedJobId = this.normalizeJobId(jobId);
|
|
||||||
|
|
||||||
const result = await this.platformApiService.proxy(
|
|
||||||
'POST',
|
|
||||||
`/jobs/singer/${normalizedJobId}/sync-mode`,
|
|
||||||
user,
|
|
||||||
body,
|
|
||||||
);
|
|
||||||
|
|
||||||
// Sync to DynamoDB (pass raw jobId for pipeline extraction)
|
|
||||||
await this.syncSingerSyncModeToDynamoDB(jobId, body, user);
|
|
||||||
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
// ==================== JOBS - S3 ROUTES ====================
|
|
||||||
|
|
||||||
@Get('jobs/s3/:jobId')
|
|
||||||
@ApiOperation({ summary: 'Get S3 job details' })
|
|
||||||
@RequireAllPermissions(PERMISSIONS_GROUPS.PIPELINE.permissions.GET)
|
|
||||||
async getS3Job(@Param('jobId') jobId: string, @User() user: RequestUser) {
|
|
||||||
// Normalize job ID for Platform API (replace - with _)
|
|
||||||
const normalizedJobId = this.normalizeJobId(jobId);
|
|
||||||
return this.platformApiService.proxy('GET', `/jobs/s3/${normalizedJobId}`, user);
|
|
||||||
}
|
|
||||||
|
|
||||||
// ==================== HEALTH ROUTE ====================
|
// ==================== HEALTH ROUTE ====================
|
||||||
|
|
||||||
@Get('health')
|
@Get('health')
|
||||||
|
|||||||
@@ -0,0 +1,9 @@
|
|||||||
|
import { ApiProperty } from "@nestjs/swagger";
|
||||||
|
|
||||||
|
export class ValidationTableDTO {
|
||||||
|
@ApiProperty()
|
||||||
|
tables: Array<{
|
||||||
|
table_name: string;
|
||||||
|
table_schema: string;
|
||||||
|
}>
|
||||||
|
}
|
||||||
@@ -7,9 +7,11 @@ import { PlatformApiService } from './platform-api.service';
|
|||||||
import { ElasticsearchModule } from '../../services/elasticsearch';
|
import { ElasticsearchModule } from '../../services/elasticsearch';
|
||||||
import { DynamoDBModule } from '../../services/dynamodb';
|
import { DynamoDBModule } from '../../services/dynamodb';
|
||||||
import { CustomersModule } from '../customers/customers.module';
|
import { CustomersModule } from '../customers/customers.module';
|
||||||
|
import { CatalogModule } from '../catalog/catalog.module';
|
||||||
|
import { InputsModule } from '../inputs/inputs.module';
|
||||||
|
|
||||||
@Module({
|
@Module({
|
||||||
imports: [ElasticsearchModule, DynamoDBModule, CustomersModule],
|
imports: [ElasticsearchModule, DynamoDBModule, CustomersModule, CatalogModule, InputsModule],
|
||||||
controllers: [PlatformApiController],
|
controllers: [PlatformApiController],
|
||||||
providers: [PlatformApiService, DadosferaLogger],
|
providers: [PlatformApiService, DadosferaLogger],
|
||||||
exports: [PlatformApiService],
|
exports: [PlatformApiService],
|
||||||
|
|||||||
@@ -89,6 +89,12 @@ export class PlatformApiService {
|
|||||||
|
|
||||||
// Propagate non-2xx responses as HttpExceptions
|
// Propagate non-2xx responses as HttpExceptions
|
||||||
if (response.status >= 400) {
|
if (response.status >= 400) {
|
||||||
|
this.logger.error('Platform API upstream error' + JSON.stringify({
|
||||||
|
status: response.status,
|
||||||
|
data: response.data,
|
||||||
|
path,
|
||||||
|
method: method.toUpperCase(),
|
||||||
|
}));
|
||||||
throw new HttpException(response.data, response.status);
|
throw new HttpException(response.data, response.status);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -101,6 +107,8 @@ export class PlatformApiService {
|
|||||||
method: method.toUpperCase(),
|
method: method.toUpperCase(),
|
||||||
});
|
});
|
||||||
|
|
||||||
|
this.logger.error(error)
|
||||||
|
|
||||||
if (error instanceof HttpException) {
|
if (error instanceof HttpException) {
|
||||||
throw error;
|
throw error;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,14 @@
|
|||||||
|
export type ReleaseNoteDTO = {
|
||||||
|
id: string;
|
||||||
|
date: string;
|
||||||
|
tag: string;
|
||||||
|
title: string;
|
||||||
|
visible: boolean;
|
||||||
|
expiryDate: string;
|
||||||
|
content: string;
|
||||||
|
showEmojis: boolean;
|
||||||
|
image?: string;
|
||||||
|
link?: string;
|
||||||
|
linkText?: string;
|
||||||
|
};
|
||||||
|
|
||||||
@@ -0,0 +1,31 @@
|
|||||||
|
import { Test, TestingModule } from '@nestjs/testing';
|
||||||
|
import { ReleaseNoteController } from './release_note.controller';
|
||||||
|
import { ReleaseNoteService } from './release_note.service';
|
||||||
|
import DadosferaLogger from '@dadosfera/dadosfera-logs';
|
||||||
|
|
||||||
|
describe('ReleaseNoteController', () => {
|
||||||
|
let controller: ReleaseNoteController;
|
||||||
|
const logger = {
|
||||||
|
info: (...args) => args,
|
||||||
|
error: (...args) => args,
|
||||||
|
};
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
const module: TestingModule = await Test.createTestingModule({
|
||||||
|
controllers: [ReleaseNoteController],
|
||||||
|
providers: [
|
||||||
|
{
|
||||||
|
provide: DadosferaLogger,
|
||||||
|
useValue: { logger },
|
||||||
|
},
|
||||||
|
ReleaseNoteService
|
||||||
|
],
|
||||||
|
}).compile();
|
||||||
|
|
||||||
|
controller = module.get<ReleaseNoteController>(ReleaseNoteController);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should be defined', () => {
|
||||||
|
expect(controller).toBeDefined();
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
import { Controller, Get, Inject } from '@nestjs/common';
|
||||||
|
import { ReleaseNoteService } from './release_note.service';
|
||||||
|
import { Authenticated } from 'src/decorators/authentication.decorator';
|
||||||
|
import { Language } from 'src/decorators/language.decorator';
|
||||||
|
import { LanguageEnum } from 'src/utils/languages.enum';
|
||||||
|
import DadosferaLogger from '@dadosfera/dadosfera-logs';
|
||||||
|
|
||||||
|
@Controller('release_note')
|
||||||
|
@Authenticated()
|
||||||
|
export class ReleaseNoteController {
|
||||||
|
logger: DadosferaLogger;
|
||||||
|
|
||||||
|
constructor(
|
||||||
|
@Inject(DadosferaLogger)
|
||||||
|
dadosferaLogger: DadosferaLogger,
|
||||||
|
private readonly releaseNoteService: ReleaseNoteService,
|
||||||
|
) {
|
||||||
|
this.logger = dadosferaLogger.logger;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Get()
|
||||||
|
async getLatestReleaseNote(@Language() language: LanguageEnum) {
|
||||||
|
this.logger.info(`Fetching latest release note for language: ${language}`);
|
||||||
|
return await this.releaseNoteService.getLatestReleaseNote(language);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
import { Module } from '@nestjs/common';
|
||||||
|
import { ReleaseNoteService } from './release_note.service';
|
||||||
|
import { ReleaseNoteController } from './release_note.controller';
|
||||||
|
import DadosferaLogger from '@dadosfera/dadosfera-logs';
|
||||||
|
|
||||||
|
@Module({
|
||||||
|
controllers: [ReleaseNoteController],
|
||||||
|
providers: [ReleaseNoteService, DadosferaLogger]
|
||||||
|
})
|
||||||
|
export class ReleaseNoteModule {}
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
import { Test, TestingModule } from '@nestjs/testing';
|
||||||
|
import { ReleaseNoteService } from './release_note.service';
|
||||||
|
import DadosferaLogger from '@dadosfera/dadosfera-logs';
|
||||||
|
|
||||||
|
describe('ReleaseNoteService', () => {
|
||||||
|
let service: ReleaseNoteService;
|
||||||
|
const logger = {
|
||||||
|
info: (...args) => args,
|
||||||
|
error: (...args) => args,
|
||||||
|
};
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
const module: TestingModule = await Test.createTestingModule({
|
||||||
|
providers: [
|
||||||
|
{
|
||||||
|
provide: DadosferaLogger,
|
||||||
|
useValue: { logger },
|
||||||
|
},
|
||||||
|
ReleaseNoteService
|
||||||
|
],
|
||||||
|
}).compile();
|
||||||
|
|
||||||
|
service = module.get<ReleaseNoteService>(ReleaseNoteService);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should be defined', () => {
|
||||||
|
expect(service).toBeDefined();
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,46 @@
|
|||||||
|
import { Inject, Injectable } from '@nestjs/common';
|
||||||
|
import axios, { AxiosInstance } from 'axios';
|
||||||
|
import { LanguageEnum } from 'src/utils/languages.enum';
|
||||||
|
import { ReleaseNoteDTO } from './dto/release_note.dto';
|
||||||
|
import DadosferaLogger from '@dadosfera/dadosfera-logs';
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class ReleaseNoteService {
|
||||||
|
client: AxiosInstance;
|
||||||
|
logger: DadosferaLogger;
|
||||||
|
|
||||||
|
constructor(
|
||||||
|
@Inject(DadosferaLogger)
|
||||||
|
dadosferaLogger: DadosferaLogger,
|
||||||
|
) {
|
||||||
|
this.logger = dadosferaLogger.logger;
|
||||||
|
this.client = axios.create({
|
||||||
|
baseURL: process.env.FIREBASE_BASE_URL,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
async getLatestReleaseNote(lang: LanguageEnum) {
|
||||||
|
try {
|
||||||
|
const lng = lang.split('-');
|
||||||
|
const language = lng[0] + '-' + lng[1].toUpperCase();
|
||||||
|
|
||||||
|
const endpoint = `/release_note/${language}.json`;
|
||||||
|
const {
|
||||||
|
data,
|
||||||
|
status,
|
||||||
|
config
|
||||||
|
} = await this.client.get<ReleaseNoteDTO>(endpoint)
|
||||||
|
this.logger.info(`Fetched release note for language: ${lang} with status: ${status}`);
|
||||||
|
this.logger.info(`Request URL: ${config.baseURL}/${config.url}`);
|
||||||
|
|
||||||
|
return data;
|
||||||
|
} catch (error) {
|
||||||
|
this.logger.error(`Error fetching release note: ${error.message}`);
|
||||||
|
|
||||||
|
if (axios.isAxiosError(error)) {
|
||||||
|
this.logger.error(`Axios error details: ${error.toJSON()}`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -229,27 +229,33 @@ export class RolesService {
|
|||||||
const [roleTreated] = this.getRolesPermissionsName([role.role]);
|
const [roleTreated] = this.getRolesPermissionsName([role.role]);
|
||||||
return { role: roleTreated };
|
return { role: roleTreated };
|
||||||
}
|
}
|
||||||
|
|
||||||
getRolesPermissionsName(roles: GetRolesPermissionsName[]): RoleDto[] {
|
getRolesPermissionsName(roles: GetRolesPermissionsName[]): RoleDto[] {
|
||||||
const newRoles: RoleDto[] = [];
|
const newRoles: RoleDto[] = [];
|
||||||
for (const role of roles) {
|
for (const role of roles) {
|
||||||
const allPermissions = this.permissionsService.getAllPermissions(
|
const newRole: RoleDto = this.formatRole(role);
|
||||||
this.language,
|
|
||||||
);
|
|
||||||
const newPermissions = role.permissions.map((p) => {
|
|
||||||
const permission = allPermissions.find((per) => per.seqid === p.seqid);
|
|
||||||
return {
|
|
||||||
...p,
|
|
||||||
name: permission.name,
|
|
||||||
id: p.seqid,
|
|
||||||
};
|
|
||||||
});
|
|
||||||
const newRole: RoleDto = {
|
|
||||||
...role,
|
|
||||||
permissions: newPermissions,
|
|
||||||
isPublic: role.isPublic,
|
|
||||||
};
|
|
||||||
newRoles.push(newRole);
|
newRoles.push(newRole);
|
||||||
}
|
}
|
||||||
return newRoles;
|
return newRoles;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private formatRole(role: GetRolesPermissionsName): RoleDto {
|
||||||
|
const allPermissions = this.permissionsService.getAllPermissions(
|
||||||
|
this.language
|
||||||
|
);
|
||||||
|
const newPermissions = role.permissions.map((p) => {
|
||||||
|
const permission = allPermissions.find((per) => per.seqid === p.seqid);
|
||||||
|
return {
|
||||||
|
...p,
|
||||||
|
name: permission.name,
|
||||||
|
id: p.seqid,
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
return {
|
||||||
|
...role,
|
||||||
|
permissions: newPermissions,
|
||||||
|
isPublic: role.isPublic,
|
||||||
|
};;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,13 @@
|
|||||||
|
export const STORAGE_EXPLORER_CONFIG = {
|
||||||
|
getUrl: (customerName: string): string => {
|
||||||
|
const urlTemplate = process.env.STORAGE_EXPLORER_API_URL;
|
||||||
|
if (!urlTemplate) {
|
||||||
|
throw new Error('STORAGE_EXPLORER_API_URL environment variable is not set');
|
||||||
|
}
|
||||||
|
// Replace {customer_id} placeholder with actual customer ID
|
||||||
|
// For local: http://172.17.0.1:8000/api (no placeholder)
|
||||||
|
// For prod: https://storage-explorer-{customer_id}.dadosfera.ai/api
|
||||||
|
return urlTemplate.replace('{customer}', customerName);
|
||||||
|
},
|
||||||
|
timeout: parseInt(process.env.STORAGE_EXPLORER_TIMEOUT || '30000', 10),
|
||||||
|
};
|
||||||
@@ -0,0 +1,383 @@
|
|||||||
|
import {
|
||||||
|
Controller,
|
||||||
|
Get,
|
||||||
|
Post,
|
||||||
|
Put,
|
||||||
|
Param,
|
||||||
|
Body,
|
||||||
|
Query,
|
||||||
|
Inject,
|
||||||
|
UseInterceptors,
|
||||||
|
UploadedFiles,
|
||||||
|
Headers,
|
||||||
|
} from '@nestjs/common';
|
||||||
|
import { ApiTags, ApiOperation, ApiConsumes } from '@nestjs/swagger';
|
||||||
|
import { FilesInterceptor } from '@nestjs/platform-express';
|
||||||
|
import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
|
||||||
|
import FormData from 'form-data';
|
||||||
|
|
||||||
|
import {
|
||||||
|
Authenticated,
|
||||||
|
RequireAllPermissions,
|
||||||
|
} from '../../decorators/authentication.decorator';
|
||||||
|
import { User, RequestUser } from '../../decorators/user.decorator';
|
||||||
|
import { StorageExplorerService } from './storage-explorer.service';
|
||||||
|
import { PERMISSIONS_GROUPS } from '../../authentication/permissions.enum';
|
||||||
|
|
||||||
|
@ApiTags('Storage Explorer')
|
||||||
|
@Controller('storage-explorer')
|
||||||
|
@Authenticated()
|
||||||
|
export class StorageExplorerController {
|
||||||
|
private logger: any;
|
||||||
|
|
||||||
|
constructor(
|
||||||
|
private readonly storageExplorerService: StorageExplorerService,
|
||||||
|
@Inject(DadosferaLogger) dadosferaLogger: DadosferaLogger,
|
||||||
|
) {
|
||||||
|
this.logger = dadosferaLogger.logger;
|
||||||
|
}
|
||||||
|
|
||||||
|
// ============================================
|
||||||
|
// TABLE OPERATIONS
|
||||||
|
// ============================================
|
||||||
|
|
||||||
|
@ApiOperation({ summary: 'Validate table name in PostgreSQL and Snowflake' })
|
||||||
|
@Post('tables/validate-name')
|
||||||
|
@RequireAllPermissions(PERMISSIONS_GROUPS.STORAGE_EXPLORER.permissions.WRITE)
|
||||||
|
async validateTableName(
|
||||||
|
@Body() body: any,
|
||||||
|
@User() user: RequestUser,
|
||||||
|
|
||||||
|
) {
|
||||||
|
return this.storageExplorerService.proxy(
|
||||||
|
'POST',
|
||||||
|
'/tables/validate-name',
|
||||||
|
user,
|
||||||
|
|
||||||
|
body,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@ApiOperation({ summary: 'Create a new table' })
|
||||||
|
@Post('tables')
|
||||||
|
@RequireAllPermissions(PERMISSIONS_GROUPS.STORAGE_EXPLORER.permissions.WRITE)
|
||||||
|
async createTable(
|
||||||
|
@Body() body: any,
|
||||||
|
@User() user: RequestUser,
|
||||||
|
|
||||||
|
) {
|
||||||
|
return this.storageExplorerService.proxy(
|
||||||
|
'POST',
|
||||||
|
'/tables/',
|
||||||
|
user,
|
||||||
|
|
||||||
|
body,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@ApiOperation({ summary: 'List all tables with pagination' })
|
||||||
|
@Get('tables')
|
||||||
|
@RequireAllPermissions(PERMISSIONS_GROUPS.STORAGE_EXPLORER.permissions.READ)
|
||||||
|
async listTables(
|
||||||
|
@Query('page') page: number,
|
||||||
|
@User() user: RequestUser,
|
||||||
|
|
||||||
|
) {
|
||||||
|
return this.storageExplorerService.proxy(
|
||||||
|
'GET',
|
||||||
|
'/tables/',
|
||||||
|
user,
|
||||||
|
|
||||||
|
undefined,
|
||||||
|
{ page },
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@ApiOperation({ summary: 'Get table details by ID' })
|
||||||
|
@Get('tables/:tableId')
|
||||||
|
@RequireAllPermissions(PERMISSIONS_GROUPS.STORAGE_EXPLORER.permissions.READ)
|
||||||
|
async getTable(
|
||||||
|
@Param('tableId') tableId: string,
|
||||||
|
@User() user: RequestUser,
|
||||||
|
|
||||||
|
) {
|
||||||
|
return this.storageExplorerService.proxy(
|
||||||
|
'GET',
|
||||||
|
`/tables/${tableId}`,
|
||||||
|
user,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@ApiOperation({ summary: 'Link a dataset to a table' })
|
||||||
|
@Post('tables/:tableId/datasets/:datasetId')
|
||||||
|
@RequireAllPermissions(PERMISSIONS_GROUPS.STORAGE_EXPLORER.permissions.WRITE)
|
||||||
|
async linkDatasetToTable(
|
||||||
|
@Param('tableId') tableId: string,
|
||||||
|
@Param('datasetId') datasetId: string,
|
||||||
|
@User() user: RequestUser,
|
||||||
|
|
||||||
|
) {
|
||||||
|
return this.storageExplorerService.proxy(
|
||||||
|
'POST',
|
||||||
|
`/tables/${tableId}/datasets/${datasetId}`,
|
||||||
|
user,
|
||||||
|
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@ApiOperation({ summary: 'Get all datasets linked to a table' })
|
||||||
|
@Get('tables/:tableId/datasets')
|
||||||
|
@RequireAllPermissions(PERMISSIONS_GROUPS.STORAGE_EXPLORER.permissions.READ)
|
||||||
|
async getTableDatasets(
|
||||||
|
@Param('tableId') tableId: string,
|
||||||
|
@User() user: RequestUser,
|
||||||
|
|
||||||
|
) {
|
||||||
|
return this.storageExplorerService.proxy(
|
||||||
|
'GET',
|
||||||
|
`/tables/${tableId}/datasets`,
|
||||||
|
user,
|
||||||
|
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@ApiOperation({ summary: 'Get table schema' })
|
||||||
|
@Get('tables/:tableId/schema')
|
||||||
|
@RequireAllPermissions(PERMISSIONS_GROUPS.STORAGE_EXPLORER.permissions.READ)
|
||||||
|
async getTableSchema(
|
||||||
|
@Param('tableId') tableId: string,
|
||||||
|
@User() user: RequestUser,
|
||||||
|
|
||||||
|
) {
|
||||||
|
return this.storageExplorerService.proxy(
|
||||||
|
'GET',
|
||||||
|
`/tables/${tableId}/schema`,
|
||||||
|
user,
|
||||||
|
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@ApiOperation({ summary: 'Validate schema compatibility between table and dataset' })
|
||||||
|
@Post('tables/:tableId/validate-compatibility/:datasetId')
|
||||||
|
@RequireAllPermissions(PERMISSIONS_GROUPS.STORAGE_EXPLORER.permissions.READ)
|
||||||
|
async validateSchemaCompatibility(
|
||||||
|
@Param('tableId') tableId: string,
|
||||||
|
@Param('datasetId') datasetId: string,
|
||||||
|
@User() user: RequestUser,
|
||||||
|
) {
|
||||||
|
return this.storageExplorerService.proxy(
|
||||||
|
'POST',
|
||||||
|
`/tables/${tableId}/validate-compatibility/${datasetId}`,
|
||||||
|
user,
|
||||||
|
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// ============================================
|
||||||
|
// DATASET OPERATIONS
|
||||||
|
// ============================================
|
||||||
|
|
||||||
|
@ApiOperation({ summary: 'Get dataset preview data' })
|
||||||
|
@Get('datasets/:datasetId/preview')
|
||||||
|
@RequireAllPermissions(PERMISSIONS_GROUPS.STORAGE_EXPLORER.permissions.READ)
|
||||||
|
async getDatasetPreview(
|
||||||
|
@Param('datasetId') datasetId: string,
|
||||||
|
@Query('limit') limit: number,
|
||||||
|
@User() user: RequestUser,
|
||||||
|
|
||||||
|
) {
|
||||||
|
return this.storageExplorerService.proxy(
|
||||||
|
'GET',
|
||||||
|
`/datasets/${datasetId}/preview`,
|
||||||
|
user,
|
||||||
|
|
||||||
|
undefined,
|
||||||
|
{ limit },
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@ApiOperation({ summary: 'Get dataset schema information' })
|
||||||
|
@Get('datasets/:datasetId/schema')
|
||||||
|
@RequireAllPermissions(PERMISSIONS_GROUPS.STORAGE_EXPLORER.permissions.READ)
|
||||||
|
async getDatasetSchema(
|
||||||
|
@Param('datasetId') datasetId: string,
|
||||||
|
@Query('force_refresh') forceRefresh: boolean,
|
||||||
|
@User() user: RequestUser,
|
||||||
|
|
||||||
|
) {
|
||||||
|
return this.storageExplorerService.proxy(
|
||||||
|
'GET',
|
||||||
|
`/datasets/${datasetId}/schema`,
|
||||||
|
user,
|
||||||
|
|
||||||
|
undefined,
|
||||||
|
{ force_refresh: forceRefresh },
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@ApiOperation({ summary: 'List all datasets for a specific upload' })
|
||||||
|
@Get('datasets/upload/:uploadId')
|
||||||
|
@RequireAllPermissions(PERMISSIONS_GROUPS.STORAGE_EXPLORER.permissions.READ)
|
||||||
|
async listDatasetsByUpload(
|
||||||
|
@Param('uploadId') uploadId: string,
|
||||||
|
@User() user: RequestUser,
|
||||||
|
|
||||||
|
) {
|
||||||
|
return this.storageExplorerService.proxy(
|
||||||
|
'GET',
|
||||||
|
`/datasets/upload/${uploadId}`,
|
||||||
|
user,
|
||||||
|
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@ApiOperation({ summary: 'Refresh dataset schema with new parsing options (Excel)' })
|
||||||
|
@Put('datasets/:datasetId/refresh-schema')
|
||||||
|
@RequireAllPermissions(PERMISSIONS_GROUPS.STORAGE_EXPLORER.permissions.WRITE)
|
||||||
|
async refreshDatasetSchema(
|
||||||
|
@Param('datasetId') datasetId: string,
|
||||||
|
@Body() body: any,
|
||||||
|
@User() user: RequestUser,
|
||||||
|
|
||||||
|
) {
|
||||||
|
return this.storageExplorerService.proxy(
|
||||||
|
'PUT',
|
||||||
|
`/datasets/${datasetId}/refresh-schema`,
|
||||||
|
user,
|
||||||
|
|
||||||
|
body,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// ============================================
|
||||||
|
// STORAGE OPERATIONS
|
||||||
|
// ============================================
|
||||||
|
|
||||||
|
@ApiOperation({ summary: 'List file explorer uploads with pagination' })
|
||||||
|
@Get('storage/uploads/history')
|
||||||
|
@RequireAllPermissions(PERMISSIONS_GROUPS.STORAGE_EXPLORER.permissions.READ)
|
||||||
|
async listFileExplorerUploads(
|
||||||
|
@Query('page') page: number,
|
||||||
|
@Query('limit') limit: number,
|
||||||
|
@Query('folder_path') folderPath: string,
|
||||||
|
@User() user: RequestUser,
|
||||||
|
|
||||||
|
) {
|
||||||
|
return this.storageExplorerService.proxy(
|
||||||
|
'GET',
|
||||||
|
'/storage/uploads/history',
|
||||||
|
user,
|
||||||
|
|
||||||
|
undefined,
|
||||||
|
{ page, limit, folder_path: folderPath },
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@ApiOperation({ summary: 'Browse folders and files in storage' })
|
||||||
|
@Get('storage/browse')
|
||||||
|
@RequireAllPermissions(PERMISSIONS_GROUPS.STORAGE_EXPLORER.permissions.READ)
|
||||||
|
async browseStorage(
|
||||||
|
@Query('path') path: string,
|
||||||
|
@User() user: RequestUser,
|
||||||
|
|
||||||
|
) {
|
||||||
|
return this.storageExplorerService.proxy(
|
||||||
|
'GET',
|
||||||
|
'/storage/browse',
|
||||||
|
user,
|
||||||
|
|
||||||
|
undefined,
|
||||||
|
{ path },
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@ApiOperation({ summary: 'Upload multiple files to storage' })
|
||||||
|
@Post('storage/upload/batch')
|
||||||
|
@ApiConsumes('multipart/form-data')
|
||||||
|
@UseInterceptors(FilesInterceptor('files'))
|
||||||
|
@RequireAllPermissions(PERMISSIONS_GROUPS.STORAGE_EXPLORER.permissions.WRITE)
|
||||||
|
async batchUpload(
|
||||||
|
@UploadedFiles() files: Array<Express.Multer.File>,
|
||||||
|
@Body('folder_path') folderPath: string,
|
||||||
|
@User() user: RequestUser,
|
||||||
|
|
||||||
|
) {
|
||||||
|
// Create FormData to forward files to storage-explorer API
|
||||||
|
const formData = new FormData();
|
||||||
|
|
||||||
|
// Add files
|
||||||
|
if (files && files.length > 0) {
|
||||||
|
files.forEach((file) => {
|
||||||
|
formData.append('files', file.buffer, {
|
||||||
|
filename: file.originalname,
|
||||||
|
contentType: file.mimetype,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add folder_path
|
||||||
|
if (folderPath) {
|
||||||
|
formData.append('folder_path', folderPath);
|
||||||
|
}
|
||||||
|
|
||||||
|
return this.storageExplorerService.proxyFormData(
|
||||||
|
'POST',
|
||||||
|
'/storage/upload/batch',
|
||||||
|
user,
|
||||||
|
|
||||||
|
formData,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@ApiOperation({ summary: 'Create a new folder in storage' })
|
||||||
|
@Post('storage/folder/create')
|
||||||
|
@RequireAllPermissions(PERMISSIONS_GROUPS.STORAGE_EXPLORER.permissions.WRITE)
|
||||||
|
async createFolder(
|
||||||
|
@Body() body: any,
|
||||||
|
@User() user: RequestUser,
|
||||||
|
|
||||||
|
) {
|
||||||
|
return this.storageExplorerService.proxy(
|
||||||
|
'POST',
|
||||||
|
'/storage/folder/create',
|
||||||
|
user,
|
||||||
|
|
||||||
|
body,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@ApiOperation({ summary: 'Download a file from storage' })
|
||||||
|
@Get('storage/download')
|
||||||
|
@RequireAllPermissions(PERMISSIONS_GROUPS.STORAGE_EXPLORER.permissions.READ)
|
||||||
|
async downloadFile(
|
||||||
|
@Query('file_path') filePath: string,
|
||||||
|
@User() user: RequestUser,
|
||||||
|
|
||||||
|
) {
|
||||||
|
return this.storageExplorerService.proxy(
|
||||||
|
'GET',
|
||||||
|
'/storage/download',
|
||||||
|
user,
|
||||||
|
|
||||||
|
undefined,
|
||||||
|
{ file_path: filePath },
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@ApiOperation({ summary: 'Get detailed file metadata' })
|
||||||
|
@Get('storage/metadata')
|
||||||
|
@RequireAllPermissions(PERMISSIONS_GROUPS.STORAGE_EXPLORER.permissions.READ)
|
||||||
|
async getFileMetadata(
|
||||||
|
@Query('file_path') filePath: string,
|
||||||
|
@User() user: RequestUser,
|
||||||
|
|
||||||
|
) {
|
||||||
|
return this.storageExplorerService.proxy(
|
||||||
|
'GET',
|
||||||
|
'/storage/metadata',
|
||||||
|
user,
|
||||||
|
undefined,
|
||||||
|
{ file_path: filePath },
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
import { Module } from '@nestjs/common';
|
||||||
|
import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
|
||||||
|
|
||||||
|
import { StorageExplorerController } from './storage-explorer.controller';
|
||||||
|
import { StorageExplorerService } from './storage-explorer.service';
|
||||||
|
|
||||||
|
@Module({
|
||||||
|
imports: [],
|
||||||
|
controllers: [StorageExplorerController],
|
||||||
|
providers: [StorageExplorerService, DadosferaLogger],
|
||||||
|
exports: [StorageExplorerService],
|
||||||
|
})
|
||||||
|
export class StorageExplorerModule {}
|
||||||
@@ -0,0 +1,178 @@
|
|||||||
|
import { Injectable, Inject, HttpException } from '@nestjs/common';
|
||||||
|
import axios, { AxiosResponse, Method } from 'axios';
|
||||||
|
import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
|
||||||
|
|
||||||
|
import { RequestUser } from '../../decorators/user.decorator';
|
||||||
|
import { STORAGE_EXPLORER_CONFIG } from './storage-explorer.config';
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class StorageExplorerService {
|
||||||
|
private logger: any;
|
||||||
|
|
||||||
|
constructor(
|
||||||
|
@Inject(DadosferaLogger) dadosferaLogger: DadosferaLogger,
|
||||||
|
) {
|
||||||
|
this.logger = dadosferaLogger.logger;
|
||||||
|
}
|
||||||
|
|
||||||
|
async proxy(
|
||||||
|
method: string,
|
||||||
|
path: string,
|
||||||
|
user: RequestUser,
|
||||||
|
body?: any,
|
||||||
|
query?: Record<string, any>
|
||||||
|
): Promise<any> {
|
||||||
|
// Validate customer_id is present for multi-tenant isolation
|
||||||
|
if (!user.customer_id) {
|
||||||
|
throw new HttpException('Customer ID is required for storage operations', 400);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get customer-specific storage-explorer URL
|
||||||
|
const baseUrl = STORAGE_EXPLORER_CONFIG.getUrl(user.customer_name);
|
||||||
|
const url = new URL(`${baseUrl}${path}`);
|
||||||
|
|
||||||
|
// Add query params
|
||||||
|
if (query) {
|
||||||
|
Object.entries(query).forEach(([key, value]) => {
|
||||||
|
if (value !== undefined && value !== null) {
|
||||||
|
url.searchParams.set(key, String(value));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
const headers: Record<string, string> = {
|
||||||
|
'content-type': 'application/json',
|
||||||
|
};
|
||||||
|
|
||||||
|
this.logger.info('Proxying request to storage-explorer', {
|
||||||
|
method: method.toUpperCase(),
|
||||||
|
path,
|
||||||
|
customer_id: user.customer_id,
|
||||||
|
storage_url: baseUrl,
|
||||||
|
user_id: user.user_id,
|
||||||
|
});
|
||||||
|
|
||||||
|
try {
|
||||||
|
const response: AxiosResponse = await axios({
|
||||||
|
method: method as Method,
|
||||||
|
url: url.href,
|
||||||
|
headers,
|
||||||
|
data: body,
|
||||||
|
timeout: STORAGE_EXPLORER_CONFIG.timeout,
|
||||||
|
validateStatus: () => true, // Don't throw on non-2xx
|
||||||
|
});
|
||||||
|
|
||||||
|
// Propagate non-2xx responses as HttpExceptions
|
||||||
|
if (response.status >= 400) {
|
||||||
|
throw new HttpException(response.data, response.status);
|
||||||
|
}
|
||||||
|
|
||||||
|
return response.data;
|
||||||
|
} catch (error) {
|
||||||
|
this.logger.error('Storage Explorer API proxy error', {
|
||||||
|
error: error.message,
|
||||||
|
status: error.response?.status,
|
||||||
|
path,
|
||||||
|
storage_url: baseUrl,
|
||||||
|
method: method.toUpperCase(),
|
||||||
|
});
|
||||||
|
|
||||||
|
if (error instanceof HttpException) {
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (error.response) {
|
||||||
|
throw new HttpException(error.response.data, error.response.status);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (error.code === 'ECONNREFUSED') {
|
||||||
|
throw new HttpException('Storage Explorer API service unavailable', 503);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (error.code === 'ETIMEDOUT' || error.code === 'ECONNABORTED') {
|
||||||
|
throw new HttpException('Storage Explorer API request timeout', 504);
|
||||||
|
}
|
||||||
|
|
||||||
|
throw new HttpException('Internal server error', 500);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Proxy with file upload support (multipart/form-data)
|
||||||
|
*/
|
||||||
|
async proxyFormData(
|
||||||
|
method: string,
|
||||||
|
path: string,
|
||||||
|
user: RequestUser,
|
||||||
|
formData: any,
|
||||||
|
query?: Record<string, any>,
|
||||||
|
): Promise<any> {
|
||||||
|
// Validate customer_id is present for multi-tenant isolation
|
||||||
|
if (!user.customer_id) {
|
||||||
|
throw new HttpException('Customer ID is required for storage operations', 400);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get customer-specific storage-explorer URL
|
||||||
|
const baseUrl = STORAGE_EXPLORER_CONFIG.getUrl(user.customer_name);
|
||||||
|
const url = new URL(`${baseUrl}${path}`);
|
||||||
|
|
||||||
|
// Add query params
|
||||||
|
if (query) {
|
||||||
|
Object.entries(query).forEach(([key, value]) => {
|
||||||
|
if (value !== undefined && value !== null) {
|
||||||
|
url.searchParams.set(key, String(value));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
const headers: Record<string, string> = {
|
||||||
|
// Let axios set Content-Type for multipart/form-data with boundary
|
||||||
|
...formData.getHeaders?.(),
|
||||||
|
};
|
||||||
|
|
||||||
|
this.logger.info('Proxying form data request to storage-explorer', {
|
||||||
|
method: method.toUpperCase(),
|
||||||
|
path,
|
||||||
|
customer_id: user.customer_id,
|
||||||
|
storage_url: baseUrl,
|
||||||
|
user_id: user.user_id,
|
||||||
|
});
|
||||||
|
|
||||||
|
try {
|
||||||
|
const response: AxiosResponse = await axios({
|
||||||
|
method: method as Method,
|
||||||
|
url: url.href,
|
||||||
|
headers,
|
||||||
|
data: formData,
|
||||||
|
timeout: STORAGE_EXPLORER_CONFIG.timeout,
|
||||||
|
maxContentLength: Infinity,
|
||||||
|
maxBodyLength: Infinity,
|
||||||
|
validateStatus: () => true,
|
||||||
|
});
|
||||||
|
|
||||||
|
if (response.status >= 400) {
|
||||||
|
throw new HttpException(response.data, response.status);
|
||||||
|
}
|
||||||
|
|
||||||
|
return response.data;
|
||||||
|
} catch (error) {
|
||||||
|
this.logger.error('Storage Explorer API form data proxy error', {
|
||||||
|
error: error.message,
|
||||||
|
status: error.response?.status,
|
||||||
|
path,
|
||||||
|
storage_url: baseUrl,
|
||||||
|
method: method.toUpperCase(),
|
||||||
|
});
|
||||||
|
|
||||||
|
if (error instanceof HttpException) {
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (error.response) {
|
||||||
|
throw new HttpException(error.response.data, error.response.status);
|
||||||
|
}
|
||||||
|
|
||||||
|
throw new HttpException('Internal server error', 500);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+5
-2
@@ -1,5 +1,8 @@
|
|||||||
import { Info } from '@dadosfera/protospack/dist/lib/interfaces';
|
export interface Info {
|
||||||
|
user_id: string;
|
||||||
|
customer_id: string;
|
||||||
|
customer: string;
|
||||||
|
}
|
||||||
export interface ICreateTransformationsRequest {
|
export interface ICreateTransformationsRequest {
|
||||||
transformations: Transformation[];
|
transformations: Transformation[];
|
||||||
info: Info;
|
info: Info;
|
||||||
|
|||||||
@@ -38,6 +38,12 @@ export class User {
|
|||||||
department?: string;
|
department?: string;
|
||||||
@ApiProperty()
|
@ApiProperty()
|
||||||
hierarchy?: string;
|
hierarchy?: string;
|
||||||
|
@ApiProperty()
|
||||||
|
bio?: string;
|
||||||
|
@ApiProperty()
|
||||||
|
companyName?: string;
|
||||||
|
@ApiProperty()
|
||||||
|
personalSite?: string;
|
||||||
@ApiPropertyOptional()
|
@ApiPropertyOptional()
|
||||||
customer?: Customer;
|
customer?: Customer;
|
||||||
@ApiProperty()
|
@ApiProperty()
|
||||||
@@ -58,6 +64,8 @@ export class UserNoRolesAndCustomer extends OmitType(UserNoRoles, [
|
|||||||
export class IUserByCustomer extends OmitType(User, ['customer']) {
|
export class IUserByCustomer extends OmitType(User, ['customer']) {
|
||||||
@ApiPropertyOptional()
|
@ApiPropertyOptional()
|
||||||
permissions?: string[];
|
permissions?: string[];
|
||||||
|
@ApiPropertyOptional()
|
||||||
|
authProvider?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
export class CreateUserReq {
|
export class CreateUserReq {
|
||||||
@@ -109,6 +117,12 @@ export class UpdateUserReq {
|
|||||||
@ApiPropertyOptional()
|
@ApiPropertyOptional()
|
||||||
hierarchy?: string;
|
hierarchy?: string;
|
||||||
@ApiPropertyOptional()
|
@ApiPropertyOptional()
|
||||||
|
bio?: string;
|
||||||
|
@ApiPropertyOptional()
|
||||||
|
personalSite?: string;
|
||||||
|
@ApiPropertyOptional()
|
||||||
|
companyName?: string;
|
||||||
|
@ApiPropertyOptional()
|
||||||
roleNames?: string[];
|
roleNames?: string[];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -266,7 +266,6 @@ export class UsersController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Patch(':id')
|
@Patch(':id')
|
||||||
@RequireAllPermissions(PERMISSIONS_GROUPS.USERS.permissions.ADMIN)
|
|
||||||
@ApiOkResponse({ type: UpdateUserRes })
|
@ApiOkResponse({ type: UpdateUserRes })
|
||||||
async updateUser(
|
async updateUser(
|
||||||
@User() user: RequestUser,
|
@User() user: RequestUser,
|
||||||
@@ -274,6 +273,18 @@ export class UsersController {
|
|||||||
@Param('id') id: string,
|
@Param('id') id: string,
|
||||||
@Language() language: LanguageEnum,
|
@Language() language: LanguageEnum,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
|
const isSameUser = user.user_id === id;
|
||||||
|
const isSuperAdmin = user.permissions.includes(PERMISSIONS_GROUPS.USERS.permissions.ADMIN.seqid)
|
||||||
|
if (!isSameUser && !isSuperAdmin) {
|
||||||
|
throw new ErrorBuilder(ErrorCodes.AUTH.FORBIDDEN);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isSameUser && !isSuperAdmin && body.roleNames) {
|
||||||
|
// Prevent users from updating their own roles
|
||||||
|
delete body.roleNames;
|
||||||
|
}
|
||||||
|
|
||||||
this.logger.info('updateUser', { user });
|
this.logger.info('updateUser', { user });
|
||||||
this.userService.setLanguage(language);
|
this.userService.setLanguage(language);
|
||||||
return await this.userService.updateUser(body, id, user.customer_id);
|
return await this.userService.updateUser(body, id, user.customer_id);
|
||||||
|
|||||||
@@ -125,6 +125,7 @@ export class UsersService implements OnModuleInit {
|
|||||||
return { permissions };
|
return { permissions };
|
||||||
});
|
});
|
||||||
res.user.permissions = permissions;
|
res.user.permissions = permissions;
|
||||||
|
res.user.authProvider = process.env.AUTH_PROVIDER || 'cognito';
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -148,20 +149,23 @@ export class UsersService implements OnModuleInit {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async updateUser(req: UpdateUserReq, id: string, customerId: string) {
|
async updateUser(req: UpdateUserReq, id: string, customerId: string) {
|
||||||
const { department, hierarchy, jobTitle, name, roleNames, email } = req;
|
const { roleNames, ...updateUserDTO } = req;
|
||||||
if (roleNames) {
|
if (roleNames && roleNames.length > 0) {
|
||||||
await this.setRoles({ roleNames, userId: id }, customerId);
|
await this.setRoles({ roleNames, userId: id }, customerId);
|
||||||
}
|
}
|
||||||
|
|
||||||
const { user } = await lastValueFrom(
|
const { user } = await lastValueFrom(
|
||||||
this.usersClientService.UserUpdate({
|
this.usersClientService.UserUpdate({
|
||||||
name,
|
department: updateUserDTO.department,
|
||||||
|
email: updateUserDTO.email,
|
||||||
|
hierarchy: updateUserDTO.hierarchy,
|
||||||
|
jobTitle: updateUserDTO.jobTitle,
|
||||||
|
name: updateUserDTO.name,
|
||||||
|
bio: updateUserDTO.bio,
|
||||||
|
companyName: updateUserDTO.companyName,
|
||||||
|
personalSite: updateUserDTO.personalSite,
|
||||||
customerId,
|
customerId,
|
||||||
id,
|
id,
|
||||||
department,
|
|
||||||
hierarchy,
|
|
||||||
jobTitle,
|
|
||||||
email,
|
|
||||||
metabaseUserId: undefined,
|
metabaseUserId: undefined,
|
||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -14,7 +14,10 @@ export class ValidationPipe implements PipeTransform<any> {
|
|||||||
return value;
|
return value;
|
||||||
}
|
}
|
||||||
const object = plainToInstance(metatype, value);
|
const object = plainToInstance(metatype, value);
|
||||||
const errors = await validate(object);
|
const errors = await validate(object, {
|
||||||
|
forbidUnknownValues: false,
|
||||||
|
whitelist: true,
|
||||||
|
});
|
||||||
if (errors.length > 0) {
|
if (errors.length > 0) {
|
||||||
const errorMessages = errors.map((err) => err.constraints);
|
const errorMessages = errors.map((err) => err.constraints);
|
||||||
throw new BadRequestException(errorMessages);
|
throw new BadRequestException(errorMessages);
|
||||||
|
|||||||
@@ -125,9 +125,13 @@ export class DynamoDBService {
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
const { Item } = await this.documentClient.send(getCommand);
|
try {
|
||||||
|
const { Item } = await this.documentClient.send(getCommand);
|
||||||
return Item as InputDocument | null;
|
return Item as InputDocument | null;
|
||||||
|
} catch (error) {
|
||||||
|
this.logger.error('DynamoDB: findInput failed', { inputId, clientId, error: error.message });
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async deleteInput(clientId: string, inputId: string): Promise<void> {
|
async deleteInput(clientId: string, inputId: string): Promise<void> {
|
||||||
@@ -203,7 +207,6 @@ export class DynamoDBService {
|
|||||||
updatedTable.reference_column = changes.reference_column;
|
updatedTable.reference_column = changes.reference_column;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
tables[tableIndex] = updatedTable;
|
tables[tableIndex] = updatedTable;
|
||||||
|
|
||||||
// Save updated document
|
// Save updated document
|
||||||
@@ -231,4 +234,5 @@ export class DynamoDBService {
|
|||||||
throw error;
|
throw error;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -358,6 +358,81 @@ export class ElasticsearchService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private getDataAssetIndex(customerName: string): string {
|
||||||
|
return `${customerName}_data_assets_catalog`;
|
||||||
|
}
|
||||||
|
|
||||||
|
async findDataAssetByTable(
|
||||||
|
customerName: string,
|
||||||
|
tableName: string,
|
||||||
|
tableSchema: string,
|
||||||
|
): Promise<{ id: string; nimbus_id: number | null; [key: string]: any } | null> {
|
||||||
|
const index = this.getDataAssetIndex(customerName);
|
||||||
|
|
||||||
|
this.logger.info('Elasticsearch: Searching data asset', {
|
||||||
|
index,
|
||||||
|
tableName,
|
||||||
|
tableSchema,
|
||||||
|
});
|
||||||
|
|
||||||
|
try {
|
||||||
|
const response = await this.client.post(`/${index}/_search`, {
|
||||||
|
query: {
|
||||||
|
bool: {
|
||||||
|
must: [
|
||||||
|
{ term: { 'table_name.keyword': tableName.toUpperCase() } },
|
||||||
|
{ term: { 'table_schema.keyword': tableSchema.toUpperCase() } },
|
||||||
|
],
|
||||||
|
},
|
||||||
|
},
|
||||||
|
size: 1,
|
||||||
|
});
|
||||||
|
|
||||||
|
const hits = response.data.hits?.hits || [];
|
||||||
|
if (hits.length === 0) {
|
||||||
|
this.logger.warn('Elasticsearch: Data asset not found', { tableName, tableSchema, index });
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return { ...hits[0]._source, _es_id: hits[0]._id };
|
||||||
|
} catch (error) {
|
||||||
|
this.handleError('findDataAssetByTable', error, { tableName, tableSchema, index });
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async updateDataAsset(
|
||||||
|
customerName: string,
|
||||||
|
assetId: string,
|
||||||
|
updates: Record<string, any>,
|
||||||
|
): Promise<any> {
|
||||||
|
const index = this.getDataAssetIndex(customerName);
|
||||||
|
|
||||||
|
this.logger.info('Elasticsearch: Updating data asset', {
|
||||||
|
index,
|
||||||
|
assetId,
|
||||||
|
fields: Object.keys(updates),
|
||||||
|
});
|
||||||
|
|
||||||
|
try {
|
||||||
|
const response = await this.client.post(
|
||||||
|
`/${index}/_update/${assetId}`,
|
||||||
|
{ doc: updates },
|
||||||
|
{ params: { refresh: 'wait_for' } },
|
||||||
|
);
|
||||||
|
|
||||||
|
this.logger.info('Elasticsearch: Data asset updated', {
|
||||||
|
assetId,
|
||||||
|
result: response.data.result,
|
||||||
|
});
|
||||||
|
|
||||||
|
return response.data;
|
||||||
|
} catch (error) {
|
||||||
|
this.handleError('updateDataAsset', error, { assetId, index });
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private handleError(
|
private handleError(
|
||||||
operation: string,
|
operation: string,
|
||||||
error: any,
|
error: any,
|
||||||
|
|||||||
@@ -0,0 +1,9 @@
|
|||||||
|
import { Module } from "@nestjs/common";
|
||||||
|
import { NimbusService } from "./nimbus.service";
|
||||||
|
import DadosferaLogger from "@dadosfera/dadosfera-logs";
|
||||||
|
|
||||||
|
@Module({
|
||||||
|
providers: [NimbusService, DadosferaLogger],
|
||||||
|
exports: [NimbusService],
|
||||||
|
})
|
||||||
|
export class NimbusServicesModule {}
|
||||||
@@ -0,0 +1,56 @@
|
|||||||
|
import DadosferaLogger from "@dadosfera/dadosfera-logs";
|
||||||
|
import { Inject, Injectable } from "@nestjs/common";
|
||||||
|
import axios from "axios";
|
||||||
|
|
||||||
|
type TableUpdate = {
|
||||||
|
table_schema: string;
|
||||||
|
table_name: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class NimbusService {
|
||||||
|
private logger: DadosferaLogger;
|
||||||
|
|
||||||
|
constructor(
|
||||||
|
@Inject(DadosferaLogger) dadosferaLogger: DadosferaLogger,
|
||||||
|
) {
|
||||||
|
this.logger = dadosferaLogger.logger;
|
||||||
|
}
|
||||||
|
|
||||||
|
private buildUrl(customerName: string) {
|
||||||
|
if (process.env.ENV === 'prd') {
|
||||||
|
return `https://nimbus-${customerName}.dadosfera.ai`;
|
||||||
|
}
|
||||||
|
|
||||||
|
return `https://nimbus-${customerName}.${process.env.ENV.replace(
|
||||||
|
'local',
|
||||||
|
'stg',
|
||||||
|
)}.dadosfera.ai`;
|
||||||
|
}
|
||||||
|
|
||||||
|
async renameTable(customerName: string, database: string, old: TableUpdate, update: TableUpdate) {
|
||||||
|
const nimbusUrl = this.buildUrl(customerName);
|
||||||
|
|
||||||
|
const path = `/api/catalog/rename-tables/?database_name=${encodeURIComponent(database)}&table_name=${encodeURIComponent(old.table_name)}&table_schema=${encodeURIComponent(old.table_schema)}`;
|
||||||
|
|
||||||
|
try {
|
||||||
|
this.logger.info("Request for PATCH " + nimbusUrl + path);
|
||||||
|
this.logger.info("Payload: " + JSON.stringify(update));
|
||||||
|
const { data } = await axios.patch(nimbusUrl + path, {
|
||||||
|
table_name: update.table_name,
|
||||||
|
table_schema: update.table_schema
|
||||||
|
})
|
||||||
|
|
||||||
|
return data;
|
||||||
|
} catch (error) {
|
||||||
|
this.logger.error(error);
|
||||||
|
return {
|
||||||
|
message: error.message,
|
||||||
|
database,
|
||||||
|
old,
|
||||||
|
update
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -9,6 +9,7 @@ interface IMetadata {
|
|||||||
details?: string;
|
details?: string;
|
||||||
sensitive?: string;
|
sensitive?: string;
|
||||||
roles?: string[];
|
roles?: string[];
|
||||||
|
customer_modules?: string[];
|
||||||
is_data_manager?: boolean;
|
is_data_manager?: boolean;
|
||||||
access_token?: string;
|
access_token?: string;
|
||||||
host?: string;
|
host?: string;
|
||||||
|
|||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
{
|
{
|
||||||
"extends": "./tsconfig.json",
|
"extends": "./tsconfig.json",
|
||||||
"exclude": ["node_modules", "test", "dist", "**/*spec.ts", "jest.config.ts"]
|
"exclude": ["node_modules", "test", "dist", "**/*spec.ts", "jest.*.ts"]
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user