From d310ec2b93e57c1c717ef9ffc37385dcb05f36b3 Mon Sep 17 00:00:00 2001 From: Rafael Moraes Date: Mon, 7 Apr 2025 11:55:06 -0300 Subject: [PATCH 1/3] FEAT: logs_dasboard --- package-lock.json | 34 +++++++++---------- src/modules/customers/customers.controller.ts | 15 ++++++++ src/modules/customers/customers.service.ts | 17 ++++++++++ 3 files changed, 49 insertions(+), 17 deletions(-) diff --git a/package-lock.json b/package-lock.json index 31af08d..80f218f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2417,6 +2417,23 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" }, + "node_modules/@nestjs/platform-express/node_modules/multer": { + "version": "1.4.4-lts.1", + "resolved": "https://registry.npmjs.org/multer/-/multer-1.4.4-lts.1.tgz", + "integrity": "sha512-WeSGziVj6+Z2/MwQo3GvqzgR+9Uc+qt8SwHKh3gvNPiISKfsMfG4SvCOFYlxxgkXt7yIV2i1yczehm0EOKIxIg==", + "dependencies": { + "append-field": "^1.0.0", + "busboy": "^1.0.0", + "concat-stream": "^1.5.2", + "mkdirp": "^0.5.4", + "object-assign": "^4.1.1", + "type-is": "^1.6.4", + "xtend": "^4.0.0" + }, + "engines": { + "node": ">= 6.0.0" + } + }, "node_modules/@nestjs/platform-express/node_modules/path-to-regexp": { "version": "0.1.7", "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", @@ -8703,23 +8720,6 @@ "node": ">=12.13" } }, - "node_modules/multer": { - "version": "1.4.5-lts.1", - "resolved": "https://registry.npmjs.org/multer/-/multer-1.4.5-lts.1.tgz", - "integrity": "sha512-ywPWvcDMeH+z9gQq5qYHCCy+ethsk4goepZ45GLD63fOu0YcNecQxi64nDs3qluZB+murG3/D4dJ7+dGctcCQQ==", - "dependencies": { - "append-field": "^1.0.0", - "busboy": "^1.0.0", - "concat-stream": "^1.5.2", - "mkdirp": "^0.5.4", - "object-assign": "^4.1.1", - "type-is": "^1.6.4", - "xtend": "^4.0.0" - }, - "engines": { - "node": ">= 6.0.0" - } - }, "node_modules/mute-stream": { "version": "0.0.8", "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", diff --git a/src/modules/customers/customers.controller.ts b/src/modules/customers/customers.controller.ts index 1bd9835..57b2d38 100644 --- a/src/modules/customers/customers.controller.ts +++ b/src/modules/customers/customers.controller.ts @@ -91,4 +91,19 @@ export class CustomersController { const metadata = PackTheMetadata(user); return this.customersService.getMonitoringDashboardUrl(metadata); } + + @Get('logs-dashboard') + @Authenticated() + @RequireAllPermissions( + PERMISSIONS_GROUPS.USERS.permissions.ADMIN, + ) + async getCustomerMixPanelLogsDashboard( + @User() user: RequestUser, + ): Promise<{ url: string }> { + this.logger.info('getLogsDashboardUrl'); + const metadata = PackTheMetadata(user); + const result = await this.customersService.getLogsDashboardUrl(metadata); + return result; + } + } diff --git a/src/modules/customers/customers.service.ts b/src/modules/customers/customers.service.ts index 7c85561..6cb7b24 100644 --- a/src/modules/customers/customers.service.ts +++ b/src/modules/customers/customers.service.ts @@ -154,6 +154,23 @@ export class CustomersService implements OnModuleInit { ); logger.info('Done'); + return res; + } + async getLogsDashboardUrl(metadata: Metadata) { + logger.info('CustomersService - getMixPanelLogsDashboardUrl'); + + const res = await lastValueFrom( + this.pipelineReadService.PipelineV2GetDashboardUrl( + { + dashboard_id: '104', + exp: '15m', + metabase_customer_name: 'dadosferatech', + }, + metadata, + ), + ); + logger.info('Done'); + return res; } } From 0df286a5f7de04bff172fcc675c5946b5b6b8c47 Mon Sep 17 00:00:00 2001 From: Rafael Moraes Date: Fri, 11 Apr 2025 15:23:41 -0300 Subject: [PATCH 2/3] FEAT: att docsfera --- docsfera.json | 22 ++++++++++++ package-lock.json | 35 ++++++++++--------- src/modules/customers/customers.controller.ts | 9 +++-- src/modules/customers/customers.service.ts | 2 +- 4 files changed, 48 insertions(+), 20 deletions(-) diff --git a/docsfera.json b/docsfera.json index 212ad4e..b98c072 100644 --- a/docsfera.json +++ b/docsfera.json @@ -5466,6 +5466,28 @@ ] } }, + "/customers/logs-dashboard": { + "get": { + "operationId": "CustomersController_getCustomerMixPanelLogsDashboard", + "parameters": [], + "responses": { + "200": { + "description": "" + } + }, + "tags": [ + "Customers" + ], + "security": [ + { + "access-token": [] + }, + { + "access-token": [] + } + ] + } + }, "/open-data/sharing-ocean-data": { "post": { "operationId": "OpenDataController_createUser", diff --git a/package-lock.json b/package-lock.json index 80f218f..6fd4bc8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2417,23 +2417,6 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" }, - "node_modules/@nestjs/platform-express/node_modules/multer": { - "version": "1.4.4-lts.1", - "resolved": "https://registry.npmjs.org/multer/-/multer-1.4.4-lts.1.tgz", - "integrity": "sha512-WeSGziVj6+Z2/MwQo3GvqzgR+9Uc+qt8SwHKh3gvNPiISKfsMfG4SvCOFYlxxgkXt7yIV2i1yczehm0EOKIxIg==", - "dependencies": { - "append-field": "^1.0.0", - "busboy": "^1.0.0", - "concat-stream": "^1.5.2", - "mkdirp": "^0.5.4", - "object-assign": "^4.1.1", - "type-is": "^1.6.4", - "xtend": "^4.0.0" - }, - "engines": { - "node": ">= 6.0.0" - } - }, "node_modules/@nestjs/platform-express/node_modules/path-to-regexp": { "version": "0.1.7", "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", @@ -8720,6 +8703,24 @@ "node": ">=12.13" } }, + "node_modules/multer": { + "version": "1.4.5-lts.1", + "resolved": "https://registry.npmjs.org/multer/-/multer-1.4.5-lts.1.tgz", + "integrity": "sha512-ywPWvcDMeH+z9gQq5qYHCCy+ethsk4goepZ45GLD63fOu0YcNecQxi64nDs3qluZB+murG3/D4dJ7+dGctcCQQ==", + "license": "MIT", + "dependencies": { + "append-field": "^1.0.0", + "busboy": "^1.0.0", + "concat-stream": "^1.5.2", + "mkdirp": "^0.5.4", + "object-assign": "^4.1.1", + "type-is": "^1.6.4", + "xtend": "^4.0.0" + }, + "engines": { + "node": ">= 6.0.0" + } + }, "node_modules/mute-stream": { "version": "0.0.8", "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", diff --git a/src/modules/customers/customers.controller.ts b/src/modules/customers/customers.controller.ts index 57b2d38..3d2afa2 100644 --- a/src/modules/customers/customers.controller.ts +++ b/src/modules/customers/customers.controller.ts @@ -101,9 +101,14 @@ export class CustomersController { @User() user: RequestUser, ): Promise<{ url: string }> { this.logger.info('getLogsDashboardUrl'); - const metadata = PackTheMetadata(user); + const metadata = PackTheMetadata({ + ...user, + customer_name: 'dadosferatech', + }); + const result = await this.customersService.getLogsDashboardUrl(metadata); return result; - } + } + } diff --git a/src/modules/customers/customers.service.ts b/src/modules/customers/customers.service.ts index 6cb7b24..36df7c3 100644 --- a/src/modules/customers/customers.service.ts +++ b/src/modules/customers/customers.service.ts @@ -162,7 +162,7 @@ export class CustomersService implements OnModuleInit { const res = await lastValueFrom( this.pipelineReadService.PipelineV2GetDashboardUrl( { - dashboard_id: '104', + dashboard_id: '103', exp: '15m', metabase_customer_name: 'dadosferatech', }, From a8ae07e6c48863b68de1b7e5ee91d8c0969e083f Mon Sep 17 00:00:00 2001 From: Rafael Moraes Date: Fri, 11 Apr 2025 16:06:55 -0300 Subject: [PATCH 3/3] FEAT: url fix --- src/modules/customers/customers.controller.ts | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/modules/customers/customers.controller.ts b/src/modules/customers/customers.controller.ts index 3d2afa2..7700eb3 100644 --- a/src/modules/customers/customers.controller.ts +++ b/src/modules/customers/customers.controller.ts @@ -101,10 +101,7 @@ export class CustomersController { @User() user: RequestUser, ): Promise<{ url: string }> { this.logger.info('getLogsDashboardUrl'); - const metadata = PackTheMetadata({ - ...user, - customer_name: 'dadosferatech', - }); + const metadata = PackTheMetadata(user); const result = await this.customersService.getLogsDashboardUrl(metadata); return result;