CI: printing env

Beta -> main

.github/workflows/deploy-manually.yml

@@ -2,37 +2,49 @@ name: Deploy
 on:
   push:
     branches:
-      - alpha
-      - beta
       - main
+  workflow_dispatch:
+    inputs:
+      environment:
+        description: 'Deployment environment'
+        required: true
+        type: choice
+        options:
+          - dev
+          - stg
+          - prd
 
 jobs:
   extract_environment:
     runs-on: ubuntu-latest
     outputs:
       environment: ${{ steps.extract_environment.outputs.environment }}
+    env:
+      EVENT: ${{ github.event_name }}
+      DEPLOY_ENV: ${{ github.event.inputs.environment }}
     steps:
       - name: Extract Environment
         run: |
-          if [ ${GITHUB_REF} == "refs/heads/main" ]; then
+          if [ ${EVENT} == "workflow_dispatch" ]; then
+            echo "##[set-output name=environment;]$(echo ${DEPLOY_ENV})"
+          elif [ ${GITHUB_REF} == "refs/heads/main" ]; then
             echo "##[set-output name=environment;]$(echo "prd")"
-          elif [ ${GITHUB_REF} == "refs/heads/alpha" ]; then
-            echo "##[set-output name=environment;]$(echo "dev")"
-          elif [ ${GITHUB_REF} == "refs/heads/beta" ]; then
-            echo "##[set-output name=environment;]$(echo "stg")"
           fi
         id: extract_environment
 
   semantic_release:
     runs-on: ubuntu-latest
     outputs:
+      #new_release_published: ${{ steps.semantic.outputs.last_release_version != steps.semantic.outputs.new_release_version }}
       new_release_published: ${{ steps.semantic.outputs.new_release_published }}
-      new_release_version: ${{ steps.semantic.outputs.new_release_version }}
+      #new_release_version: ${{ steps.semantic.outputs.new_release_version }}
+      new_release_version: ${{ (steps.semantic.outputs.new_release_published == 'true' && steps.semantic.outputs.new_release_version) || (github.event_name == 'workflow_dispatch' && '0.0.0') }}
     steps:
       - name: Checkout
         uses: actions/checkout@v2
 
-      - name: Semantic Release
+      - if: github.event_name != 'workflow_dispatch'
+        name: Semantic Release
         uses: cycjimmy/semantic-release-action@v2
         id: semantic
         with:
@@ -41,77 +53,58 @@ jobs:
             conventional-changelog-eslint
           branches: |
             [
-              'main',
-              {
-                name: 'alpha',
-                prerelease: true
-              },
-              {
-                name: 'beta',
-                prerelease: true
-              }
+              'main'
             ]
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
 
   deploy:
+    if: ${{ (github.event_name != 'workflow_dispatch' && needs.semantic_release.outputs.new_release_published == 'true') || 'true' }}
     needs: [extract_environment, semantic_release]
-    runs-on: [self-hosted, "${{ needs.extract_environment.outputs.environment }}"]
+    runs-on:
+      [self-hosted, '${{ needs.extract_environment.outputs.environment }}']
 
     steps:
+      - name: Printing stats
+        env:
+          EVENT: ${{ github.event_name }}
+          IMAGE_TAG: ${{ needs.semantic_release.outputs.new_release_version }}
+          ENV: ${{ needs.extract_environment.outputs.environment }}
+        run: echo ${GITHUB_REF#refs/heads/}
+
       - name: Checkout
         uses: actions/checkout@v2
 
       - name: Update Pip
-        if: needs.semantic_release.outputs.new_release_published == 'true'
         run: |
           python3 -m pip install --upgrade pip
 
       - name: Install Docker Compose
-        if: needs.semantic_release.outputs.new_release_published == 'true'
         run: |
           python3 -m pip install docker-compose --upgrade
 
       - name: Install AWS CLI
-        if: needs.semantic_release.outputs.new_release_published == 'true'
         run: |
           python3 -m pip install awscli --upgrade
 
       - name: Install AWS Elastic Beanstalk CLI
-        if: needs.semantic_release.outputs.new_release_published == 'true'
         run: |
           python3 -m pip install awsebcli --upgrade
 
       - name: Configure AWS Region
-        if: needs.semantic_release.outputs.new_release_published == 'true'
         uses: aws-actions/configure-aws-credentials@v1
         id: aws
         with:
           aws-region: us-east-1
 
-      - name: Extract Environment
-        if: needs.semantic_release.outputs.new_release_published == 'true'
-        shell: bash
-        run: |
-          if [ ${GITHUB_REF} == "refs/heads/main" ]; then
-            echo "##[set-output name=result;]$(echo "prd")"
-          elif [ ${GITHUB_REF} == "refs/heads/alpha" ]; then
-            echo "##[set-output name=result;]$(echo "dev")"
-          elif [ ${GITHUB_REF} == "refs/heads/beta" ]; then
-            echo "##[set-output name=result;]$(echo "stg")"
-          fi
-        id: extract_environment
-
       - name: Login to AWS ECR
-        if: needs.semantic_release.outputs.new_release_published == 'true'
         id: login_ecr
         uses: aws-actions/amazon-ecr-login@v1
 
       - name: Build, Tag, and Push Image to AWS ECR
-        if: needs.semantic_release.outputs.new_release_published == 'true'
         env:
-          ENV: ${{ steps.extract_environment.outputs.result }}
+          ENV: ${{ needs.extract_environment.outputs.environment }}
           IMAGE_TAG: ${{ needs.semantic_release.outputs.new_release_version }}
           ACCOUNT_ID: ${{ steps.aws.outputs.aws-account-id }}
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
@@ -120,9 +113,8 @@ jobs:
           docker-compose -f build.docker-compose.yml push
 
       - name: Create ZIP file to Deploy AWS Beanstalk
-        if: needs.semantic_release.outputs.new_release_published == 'true'
         env:
-          ENV: ${{ steps.extract_environment.outputs.result }}
+          ENV: ${{ needs.extract_environment.outputs.environment }}
           IMAGE_TAG: ${{ needs.semantic_release.outputs.new_release_version }}
           ACCOUNT_ID: ${{ steps.aws.outputs.aws-account-id }}
         run: |
@@ -132,11 +124,10 @@ jobs:
           zip deploy.zip docker-compose.yml  -r .ebextensions
 
       - name: Deploy AWS Beanstalk
-        if: needs.semantic_release.outputs.new_release_published == 'true'
         env:
-          ENV: ${{ steps.extract_environment.outputs.result }}
+          ENV: ${{ needs.extract_environment.outputs.environment }}
           AWS_REGION: us-east-1
-          APP_NAME: maestro
+          APP_NAME: ${{ github.event.repository.name }}
         run: |
           eb use $APP_NAME-$ENV
           echo -e "deploy:\n  artifact: deploy.zip" >> .elasticbeanstalk/config.yml

.gitignore

@@ -29,7 +29,7 @@ lerna-debug.log*
 
 # IDE - VSCode
 .vscode/*
-!.vscode/settings.json
+#!.vscode/settings.json
 !.vscode/tasks.json
 !.vscode/launch.json
 !.vscode/extensions.json

README.md

@@ -1,4 +1,4 @@
 <p align="center">
   <image src="./assets/maestro.svg" style="width:10rem">
-  <h1 align="center">Maestro</h1> 
+  <h1 align="center">Maestro</h1>  
 </p>  

package.json

@@ -31,7 +31,7 @@
     "@nestjs/platform-express": "^8.4.3",
     "@nestjs/schedule": "^1.1.0",
     "@nestjs/swagger": "^5.2.1",
-    "@victorradael/protospack": "1.7.4",
+    "@victorradael/protospack": "2.3.0",
     "axios": "^0.25.0",
     "dotenv": "^14.2.0",
     "helmet": "^5.0.2",

src/clients/auth/client.config.ts

@@ -10,7 +10,9 @@ export class AuthClient {
       options: {
         url: process.env.DUC_URL,
         package: DucPackages,
-        credentials: credentials.createSsl(),
+        credentials: process.env.LOCAL_ENV
+          ? undefined
+          : credentials.createSsl(),
         protoPath: DucProtoFilePath,
         loader: {
           enums: String,

src/clients/auth/client.service.ts

@@ -2,17 +2,18 @@ import { OnModuleInit, Inject } from '@nestjs/common';
 import { ClientGrpc } from '@nestjs/microservices';
 
 import {
-  AuthConfirmationRequest,
-  AuthDisableTotpMfaRequest,
-  AuthEnableTotpMfaRequest,
-  AuthResendConfirmationCodeRequest,
-  AuthServiceInterface,
-  AuthVerifyTotpMfaRequest,
   DucServicesNames,
+  AuthServiceInterface,
+  AuthSignInRequest,
+  AuthRefreshAccessTokenRequest,
+  AuthConfirmationRequest,
+  AuthResendConfirmationCodeRequest,
+  AuthEnableTotpMfaRequest,
+  AuthDisableTotpMfaRequest,
+  AuthDismissTotpMfaRequest,
+  AuthVerifyTotpMfaRequest,
 } from '@victorradael/protospack';
 
-import { ISignIn, IRefreshAccessToken } from './interfaces';
-
 export class AuthClientService implements OnModuleInit {
   private authService: AuthServiceInterface;
   constructor(
@@ -25,111 +26,89 @@ export class AuthClientService implements OnModuleInit {
     );
   }
 
-  async signIn({ username, password, totp }: ISignIn): Promise<any> {
+  async signIn({ username, password, totp }: AuthSignInRequest): Promise<any> {
     console.log('AuthClientService', 'SignIn');
 
-    const tokens = await new Promise((resolve, reject) => {
+    return new Promise((resolve, reject) => {
       this.authService.signIn({ username, password, totp }).subscribe({
-        next(x) {
-          resolve(x);
-        },
-        error(err) {
-          console.log('Observable Error');
-          reject(err);
+        next: resolve,
+        //error: (err) => reject(err.details),
+        error: (err) => {
+          console.log(err);
+          reject(err.details);
         },
         complete() {
           console.log('done');
         },
       });
-    })
-      .then((res) => res)
-      .catch((err) => {
-        throw new Error(err);
-      });
-    return tokens;
+    });
   }
 
   async enableTotpMFA({
-    username,
+    accessToken,
     password,
   }: AuthEnableTotpMfaRequest): Promise<any> {
     console.log('AuthClientService', 'enableTotpMFA');
 
-    const tokens = await new Promise((resolve, reject) => {
-      this.authService.enableTotpMfa({ username, password }).subscribe({
-        next(x) {
-          resolve(x);
-        },
-        error(err) {
-          console.log('Observable Error');
-          reject(err);
-        },
+    return new Promise((resolve, reject) => {
+      this.authService.enableTotpMfa({ accessToken, password }).subscribe({
+        next: resolve,
+        error: (err) => reject(err.details),
         complete() {
           console.log('done');
         },
       });
-    })
-      .then((res) => res)
-      .catch((err) => {
-        throw new Error(err);
-      });
-    return tokens;
+    });
   }
 
   async disableTotpMFA({
-    username,
+    accessToken,
     password,
-    totp,
   }: AuthDisableTotpMfaRequest): Promise<any> {
     console.log('AuthClientService', 'disableTotpMFA');
 
-    const tokens = await new Promise((resolve, reject) => {
-      this.authService.disableTotpMfa({ username, password, totp }).subscribe({
-        next(x) {
-          resolve(x);
-        },
-        error(err) {
-          console.log('Observable Error');
-          reject(err);
-        },
+    return new Promise((resolve, reject) => {
+      this.authService.disableTotpMfa({ accessToken, password }).subscribe({
+        next: resolve,
+        error: (err) => reject(err.details),
         complete() {
           console.log('done');
         },
       });
-    })
-      .then((res) => res)
-      .catch((err) => {
-        throw new Error(err);
+    });
+  }
+
+  async dismissTotpMFA({
+    accessToken,
+  }: AuthDismissTotpMfaRequest): Promise<any> {
+    console.log('AuthClientService', 'dismissTotpMFA');
+
+    return new Promise((resolve, reject) => {
+      this.authService.dismissTotpMfa({ accessToken }).subscribe({
+        next: resolve,
+        error: (err) => reject(err.details),
+        complete() {
+          console.log('done');
+        },
       });
-    return tokens;
+    });
   }
 
   async verifyTotp({
-    username,
     accessToken,
     totp,
   }: AuthVerifyTotpMfaRequest): Promise<any> {
     console.log('AuthClientService', 'disableTotpMFA');
 
-    const tokens = await new Promise((resolve, reject) => {
-      this.authService.verifyTotp({ username, accessToken, totp }).subscribe({
-        next(x) {
-          resolve(x);
-        },
-        error(err) {
-          console.log('Observable Error');
-          reject(err);
-        },
+    return new Promise((resolve, reject) => {
+      this.authService.verifyTotp({ accessToken, totp }).subscribe({
+        next: resolve,
+        error: (err) => reject(err.details),
         complete() {
           console.log('done');
         },
       });
-    })
-      .then((res) => res)
-      .catch((err) => {
-        throw new Error(err);
-      });
-    return tokens;
+    });
   }
 
   async confirmRegister({
@@ -162,11 +141,11 @@ export class AuthClientService implements OnModuleInit {
   async resendeConfirmationCode({
     username,
   }: AuthResendConfirmationCodeRequest): Promise<any> {
-    console.log('AuthClientService', 'resendeConfirmationCode');
+    console.log('AuthClientService', 'resendConfirmationCode');
 
     const authResendConfirmationCodeRequestReturn = await new Promise(
       (resolve, reject) => {
-        this.authService.resendeConfirmationCode({ username }).subscribe({
+        this.authService.resendConfirmationCode({ username }).subscribe({
           next(x) {
             resolve(x);
           },
@@ -190,29 +169,19 @@ export class AuthClientService implements OnModuleInit {
   async refreshAccessToken({
     username,
     refreshToken,
-  }: IRefreshAccessToken): Promise<any> {
+  }: AuthRefreshAccessTokenRequest): Promise<any> {
     console.log('AuthClientService', 'RefreshAccessToken');
 
-    const tokens = await new Promise((resolve, reject) => {
+    return new Promise((resolve, reject) => {
       this.authService
         .refreshAccessToken({ username, refreshToken })
         .subscribe({
-          next(x) {
-            resolve(x);
-          },
-          error(err) {
-            console.log('Observable Error');
-            reject(err);
-          },
+          next: resolve,
+          error: (err) => reject(err.details),
           complete() {
             console.log('done');
           },
         });
-    })
-      .then((res) => res)
-      .catch((err) => {
-        throw new Error(err);
-      });
-    return tokens;
+    });
   }
 }

src/clients/auth/interfaces.d.ts

@@ -1,10 +0,0 @@
-export interface ISignIn {
-  username: string;
-  password: string;
-  totp: string;
-}
-
-export interface IRefreshAccessToken {
-  username: string;
-  refreshToken: string;
-}

src/clients/inputs/client.config.ts

@@ -10,7 +10,9 @@ export class InputsClientConfiguration {
       options: {
         url: process.env.INFACTORY_URL,
         package: InputPackages,
-        credentials: credentials.createSsl(),
+        credentials: process.env.LOCAL_ENV
+          ? undefined
+          : credentials.createSsl(),
         protoPath: InputProtoFilePath,
         loader: {
           enums: String,

src/clients/inputs/client.service.ts

@@ -1,6 +1,8 @@
 import { OnModuleInit, Inject } from '@nestjs/common';
 import { ClientGrpc } from '@nestjs/microservices';
 import {
+  InputCreateResponse,
+  InputCreateS3Request,
   InputNewCreateRequest,
   InputService,
   TestConnectionGetColumnsRequest,
@@ -41,6 +43,29 @@ export class InputsClientService implements OnModuleInit {
             console.log('done');
           },
         });
+    }).catch((err) => {
+      throw new Error(err);
+    });
+
+    return createInputResponse;
+  }
+
+  async createS3Inputs(createInputDto: InputCreateS3Request) {
+    console.log('InputClientService', 'Create');
+
+    const createInputResponse = await new Promise((resolve, reject) => {
+      this.inputService.CreateS3(objectSnakeToCamel(createInputDto)).subscribe({
+        next(x) {
+          resolve(objectCamelToSnake(x));
+        },
+        error(err) {
+          console.log('Observable Error');
+          reject(err);
+        },
+        complete() {
+          console.log('done');
+        },
+      });
     })
       .then((res) => res)
       .catch((err) => {

src/clients/outputs/client.config.ts

@@ -9,7 +9,9 @@ export class OutputsClientConfiguration {
       options: {
         url: process.env.OTFACTORY_URL,
         package: OutputPackages,
-        credentials: credentials.createSsl(),
+        credentials: process.env.LOCAL_ENV
+          ? undefined
+          : credentials.createSsl(),
         protoPath: OutputProtoFilePath,
         loader: {
           enums: String,

src/clients/pipelines/client.config.ts

@@ -12,7 +12,9 @@ export class PipelinesClientConfiguration {
       options: {
         url: process.env.PIFACTORY_URL,
         package: PipelinePackages,
-        credentials: credentials.createSsl(),
+        credentials: process.env.LOCAL_ENV
+          ? undefined
+          : credentials.createSsl(),
         protoPath: PipelineProtoFilePath,
         loader: {
           enums: String,

src/clients/pipelines/client.service.ts

@@ -61,7 +61,7 @@ export class PipelinesClientService implements OnModuleInit {
     const findAllPipelineResponse = await new Promise((resolve, reject) => {
       this.pipelineService.FindAll(objectSnakeToCamel(data)).subscribe({
         next(x) {
-          resolve(x);
+          resolve(x.pipelines);
         },
         error(err) {
           console.log('Observable Error');

src/middlewares/authentication.ts

@@ -31,6 +31,7 @@ export class LoggerMiddleware implements NestMiddleware {
     const jwtDecoded: any = decode(idToken);
 
     const permissions = jwtDecoded.user.permissions;
+
     const clienId = jwtDecoded.user.customerId;
     const customer = jwtDecoded.user.customer;
     const userId = jwtDecoded.user.id;
@@ -38,16 +39,20 @@ export class LoggerMiddleware implements NestMiddleware {
     await verifyToken(accessToken);
 
     let havePermission = false;
-    permissions.forEach((permission) => {
+    const permission = permissions.find((permission) => {
       permission = permission.split('/');
       const method = permission[0].trim();
       const route = permission[1].trim();
 
       if (method === requiredMethod && route === requiredRoute) {
-        havePermission = true;
+        return permission;
       }
     });
 
+    if (permission) {
+      havePermission = true;
+    }
+
     if (havePermission) {
       request.body.info = {
         customer_id: clienId,

src/modules/auth/auth.controller.ts

@@ -3,15 +3,21 @@ import {
   Controller,
   Headers,
   Post,
+  HttpCode,
+  HttpStatus,
   UnauthorizedException,
 } from '@nestjs/common';
 import {
+  AuthSignInRequest,
+  AuthRefreshAccessTokenRequest,
   AuthEnableTotpMfaRequest,
+  AuthDisableTotpMfaRequest,
   AuthVerifyTotpMfaRequest,
 } from '@victorradael/protospack';
 
 import { AuthClientService } from 'src/clients/auth/client.service';
-import { ISignIn, IRefreshAccessToken } from 'src/clients/auth/interfaces';
+
+import ErrorBuilder from '../../utils/ErrorBuilder';
 
 @Controller('auth')
 export class AuthController {
@@ -19,82 +25,124 @@ export class AuthController {
 
   // DEPRECADO!
   @Post()
-  async signIn_old(@Body() body: ISignIn) {
+  @HttpCode(HttpStatus.OK)
+  async signIn_old(@Body() body: AuthSignInRequest) {
     console.log(`/auth`, 'SignIn_old');
 
     return this.signIn(body);
   }
 
   @Post('login')
-  async signIn_login(@Body() body: ISignIn) {
+  @HttpCode(HttpStatus.OK)
+  async signIn_login(@Body() body: AuthSignInRequest) {
     console.log(`/auth`, 'SignIn_login');
 
     return this.signIn(body);
   }
 
   @Post('sign-in')
-  async signIn(@Body() { username, password, totp }: ISignIn) {
+  @HttpCode(HttpStatus.OK)
+  async signIn(@Body() { username, password, totp }: AuthSignInRequest) {
     console.log(`/auth`, 'SignIn');
 
     const tokens = await this.authClient
       .signIn({ username, password, totp })
-      .then((result) => result)
       .catch((err) => {
-        throw new UnauthorizedException(err.message);
+        throw ErrorBuilder(err);
       });
 
     return tokens;
   }
 
   @Post('refresh-access-token')
+  @HttpCode(HttpStatus.OK)
   async refreshAccessToken(
-    @Body() { username, refreshToken }: IRefreshAccessToken,
+    @Body() { username, refreshToken }: AuthRefreshAccessTokenRequest,
   ) {
     console.log(`/auth`, 'RefreshAccessToken');
 
     const accessToken = await this.authClient
       .refreshAccessToken({ username, refreshToken })
-      .then((result) => result)
       .catch((err) => {
-        throw new UnauthorizedException(err.message);
+        throw ErrorBuilder(err);
       });
 
     return accessToken;
   }
 
   @Post('enable-totp')
+  @HttpCode(HttpStatus.OK)
   async enableTotpMFA(
-    @Body() { username, password }: AuthEnableTotpMfaRequest,
+    @Body() body: AuthEnableTotpMfaRequest,
+    @Headers() headers,
   ) {
     console.log(`/auth`, 'enable-totp');
 
-    const enableTotpResponse = await this.authClient
-      .enableTotpMFA({ username, password })
-      .then((result) => result)
+    const { password } = body;
+    const { authorization: accessToken } = headers;
+
+    const response = await this.authClient
+      .enableTotpMFA({ accessToken, password })
       .catch((err) => {
-        throw new UnauthorizedException(err.message);
+        throw ErrorBuilder(err);
       });
 
-    return enableTotpResponse;
+    return response;
+  }
+
+  @Post('disable-totp')
+  @HttpCode(HttpStatus.OK)
+  async disableTotpMFA(
+    @Body() body: AuthDisableTotpMfaRequest,
+    @Headers() headers,
+  ) {
+    console.log(`/auth`, 'disable-totp');
+
+    const { password } = body;
+    const { authorization: accessToken } = headers;
+
+    const response = await this.authClient
+      .disableTotpMFA({ accessToken, password })
+      .catch((err) => {
+        throw ErrorBuilder(err);
+      });
+
+    return response;
+  }
+
+  @Post('dismiss-totp')
+  @HttpCode(HttpStatus.OK)
+  async dismissTotpMFA(@Headers() headers) {
+    console.log(`/auth`, 'disable-totp');
+
+    const { authorization: accessToken } = headers;
+
+    const response = await this.authClient
+      .dismissTotpMFA({ accessToken })
+      .catch((err) => {
+        throw ErrorBuilder(err);
+      });
+
+    return response;
   }
 
   @Post('verify-totp')
+  @HttpCode(HttpStatus.OK)
   async verifyTotp(
     @Body() body: AuthVerifyTotpMfaRequest,
     @Headers() headers,
   ): Promise<any> {
     console.log(`/auth`, 'enable-totp');
 
-    const { username, totp } = body;
-    const { Authorization } = headers;
+    const { totp } = body;
+    const { authorization: accessToken } = headers;
 
-    const enableTotpResponse = await this.authClient
-      .verifyTotp({ username, totp, accessToken: Authorization })
-      .then((result) => result)
+    const response = await this.authClient
+      .verifyTotp({ accessToken, totp })
       .catch((err) => {
-        throw new UnauthorizedException(err.message);
+        throw ErrorBuilder(err);
       });
 
-    return enableTotpResponse;
+    return response;
   }
 }

src/modules/catalog/catalog.controller.ts

@@ -17,9 +17,7 @@ export class CatalogController {
   async catalogAll(@Body() body) {
     console.log(`/catalog`, 'ON CATALOG ALL ROUTE');
 
-    const catalogService = new CatalogService();
-
-    const res = await catalogService.catalogAll(body);
+    const res = await this.catalogService.catalogAll(body);
 
     return res;
   }
@@ -28,9 +26,7 @@ export class CatalogController {
   async dataAppsAll(@Body() body) {
     console.log(`/catalog`, 'ON FIND ALL DATA APPS ROUTE');
 
-    const catalogService = new CatalogService();
-
-    const res = await catalogService.dataAppsAll(body);
+    const res = await this.catalogService.dataAppsAll(body);
 
     return res;
   }
@@ -39,9 +35,8 @@ export class CatalogController {
   async dataAppsOne(@Param() params, @Body() body) {
     console.log(`/catalog`, 'ON FIND ONE DATA APP ROUTE');
     const { id } = params;
-    const catalogService = new CatalogService();
 
-    const res = await catalogService.dataAppsOne(id, body);
+    const res = await this.catalogService.dataAppsOne(id, body);
 
     return res;
   }
@@ -50,9 +45,7 @@ export class CatalogController {
   async getAllDashboardMetabase(@Body() body) {
     console.log(`/catalog`, 'ON GET ALL DASHBOARDS METABASE ROUTE');
 
-    const catalogService = new CatalogService();
-
-    const res = await catalogService.getAllDashboardMetabase(body);
+    const res = await this.catalogService.getAllDashboardMetabase(body);
 
     return res;
   }
@@ -62,9 +55,7 @@ export class CatalogController {
     const { id } = params;
     console.log(`/catalog`, 'ON GET ONE DASHBOARD METABASE ROUTE');
 
-    const catalogService = new CatalogService();
-
-    const res = await catalogService.getOneDashboardMetabase(id, body);
+    const res = await this.catalogService.getOneDashboardMetabase(id, body);
 
     return res;
   }
@@ -73,12 +64,11 @@ export class CatalogController {
   async getAllTableMetadata(@Body() body, @Query() query) {
     console.log(`/catalog`, 'ON GET ALL TABLES METADATA ROUTE');
 
-    const catalogService = new CatalogService();
     if (!query) {
-      const res = await catalogService.getAllTableMetadata(body);
+      const res = await this.catalogService.getAllTableMetadata(body);
       return res;
     } else {
-      const res = await catalogService.getOneTableMetadata(body, query);
+      const res = await this.catalogService.getOneTableMetadata(body, query);
       return res;
     }
   }
@@ -88,9 +78,7 @@ export class CatalogController {
     const { id } = params;
     console.log(`/catalog`, 'ON DELETE ONE TABLE METADATA ROUTE');
 
-    const catalogService = new CatalogService();
-
-    const res = await catalogService.deleteOneTableMetadata(id, body);
+    const res = await this.catalogService.deleteOneTableMetadata(id, body);
 
     return res;
   }
@@ -99,9 +87,7 @@ export class CatalogController {
   async getOneColumnMetadata(@Body() body, @Query() params) {
     console.log(`/catalog`, 'ON GET ONE COLUMN METADATA ROUTE');
 
-    const catalogService = new CatalogService();
-
-    const res = await catalogService.getOneColumnMetadata(body, params);
+    const res = await this.catalogService.getOneColumnMetadata(body, params);
 
     return res;
   }
@@ -111,9 +97,7 @@ export class CatalogController {
     console.log(`/catalog`, 'ON DELETE ONE COLUMN METADATA ROUTE');
     const { id } = params;
 
-    const catalogService = new CatalogService();
-
-    const res = await catalogService.deleteOneColumnMetadata(id, body);
+    const res = await this.catalogService.deleteOneColumnMetadata(id, body);
 
     return res;
   }
@@ -122,9 +106,7 @@ export class CatalogController {
   async getOneDataPreview(@Body() body, @Query() params) {
     console.log(`/catalog`, 'ON GET ONE DATAPREVIEW ROUTE');
 
-    const catalogService = new CatalogService();
-
-    const res = await catalogService.getOneDataPreview(body, params);
+    const res = await this.catalogService.getOneDataPreview(body, params);
 
     return res;
   }
@@ -133,9 +115,7 @@ export class CatalogController {
   async getDataStatus(@Body() body) {
     console.log(`/catalog`, 'ON GET DATA STATUS ROUTE');
 
-    const catalogService = new CatalogService();
-
-    const res = await catalogService.getDataStatus(body);
+    const res = await this.catalogService.getDataStatus(body);
 
     return res;
   }
@@ -144,9 +124,7 @@ export class CatalogController {
   async createDataStatus(@Body() body) {
     console.log(`/catalog`, 'ON CREATE DATA STATUS ROUTE');
 
-    const catalogService = new CatalogService();
-
-    const res = await catalogService.createDataStatus(body);
+    const res = await this.catalogService.createDataStatus(body);
 
     return res;
   }
@@ -155,9 +133,7 @@ export class CatalogController {
   async getDataDescription(@Body() body) {
     console.log(`/catalog`, 'ON GET DATA DESCRIPTION ROUTE');
 
-    const catalogService = new CatalogService();
-
-    const res = await catalogService.getDataDescription(body);
+    const res = await this.catalogService.getDataDescription(body);
 
     return res;
   }
@@ -166,9 +142,7 @@ export class CatalogController {
   async createDataDescription(@Body() body) {
     console.log(`/catalog`, 'ON CREATE DATA DESCRIPTION ROUTE');
 
-    const catalogService = new CatalogService();
-
-    const res = await catalogService.createDataDescription(body);
+    const res = await this.catalogService.createDataDescription(body);
 
     return res;
   }
@@ -177,9 +151,7 @@ export class CatalogController {
   async getDataDocs(@Body() body) {
     console.log(`/catalog`, 'ON GET DATA DOCS ROUTE');
 
-    const catalogService = new CatalogService();
-
-    const res = await catalogService.getDataDocs(body);
+    const res = await this.catalogService.getDataDocs(body);
 
     return res;
   }
@@ -188,9 +160,7 @@ export class CatalogController {
   async createDataDocs(@Body() body) {
     console.log(`/catalog`, 'ON CREATE DATA DOCS ROUTE');
 
-    const catalogService = new CatalogService();
-
-    const res = await catalogService.createDataDocs(body);
+    const res = await this.catalogService.createDataDocs(body);
 
     return res;
   }
@@ -199,9 +169,7 @@ export class CatalogController {
   async getDataRating(@Body() body) {
     console.log(`/catalog`, 'ON GET DATA RATING ROUTE');
 
-    const catalogService = new CatalogService();
-
-    const res = await catalogService.getDataRating(body);
+    const res = await this.catalogService.getDataRating(body);
 
     return res;
   }
@@ -210,9 +178,7 @@ export class CatalogController {
   async createDataRating(@Body() body) {
     console.log(`/catalog`, 'ON GET DATA RATING ROUTE');
 
-    const catalogService = new CatalogService();
-
-    const res = await catalogService.createDataRating(body);
+    const res = await this.catalogService.createDataRating(body);
 
     return res;
   }
@@ -222,9 +188,9 @@ export class CatalogController {
     console.log(`/catalog`, 'ON GET SUMMARY RATING ROUTE');
     //const { id } = params;
 
-    //const catalogService = new CatalogService();
+    //
 
-    //const res = await catalogService.getSummaryRating(id, body);
+    //const res = await this.catalogService.getSummaryRating(id, body);
 
     return {
       avg_rating: 0,
@@ -236,9 +202,7 @@ export class CatalogController {
   async getDataComment(@Body() body) {
     console.log(`/catalog`, 'ON GET DATA COMMENT ROUTE');
 
-    const catalogService = new CatalogService();
-
-    const res = await catalogService.getDataComment(body);
+    const res = await this.catalogService.getDataComment(body);
 
     return res;
   }
@@ -247,9 +211,7 @@ export class CatalogController {
   async createDataComment(@Body() body) {
     console.log(`/catalog`, 'ON GET DATA COMMENT ROUTE');
 
-    const catalogService = new CatalogService();
-
-    const res = await catalogService.createDataComment(body);
+    const res = await this.catalogService.createDataComment(body);
 
     return res;
   }
@@ -258,9 +220,7 @@ export class CatalogController {
   async getDataReview(@Body() body, @Query() params) {
     console.log(`/catalog`, 'ON GET DATA REVIEW ROUTE');
 
-    const catalogService = new CatalogService();
-
-    const res = await catalogService.getDataReview(body, params);
+    const res = await this.catalogService.getDataReview(body, params);
 
     return res;
   }
@@ -269,9 +229,7 @@ export class CatalogController {
   async createTags(@Body() body) {
     console.log(`/catalog`, 'ON CREATE TAG ROUTE');
 
-    const catalogService = new CatalogService();
-
-    const res = await catalogService.createTags(body);
+    const res = await this.catalogService.createTags(body);
 
     return res;
   }
@@ -280,9 +238,7 @@ export class CatalogController {
   async findAllTags(@Body() body) {
     console.log(`/catalog`, 'ON FIND ALL TAGS ROUTE');
 
-    const catalogService = new CatalogService();
-
-    const res = await catalogService.findAllTags(body);
+    const res = await this.catalogService.findAllTags(body);
 
     return res;
   }
@@ -292,9 +248,7 @@ export class CatalogController {
     console.log(`/catalog`, 'ON DELETE TAG ROUTE');
     const { id } = params;
 
-    const catalogService = new CatalogService();
-
-    const res = await catalogService.deleteTags(id, body);
+    const res = await this.catalogService.deleteTags(id, body);
 
     return res;
   }
@@ -303,9 +257,7 @@ export class CatalogController {
   async createTableTags(@Body() body) {
     console.log(`/catalog`, 'ON CREATE TABLE TAG ROUTE');
 
-    const catalogService = new CatalogService();
-
-    const res = await catalogService.createTableTags(body);
+    const res = await this.catalogService.createTableTags(body);
 
     return res;
   }
@@ -314,9 +266,7 @@ export class CatalogController {
   async getAllTableTags(@Body() body) {
     console.log(`/catalog`, 'ON GET ALL TABLE TAGS ROUTE');
 
-    const catalogService = new CatalogService();
-
-    const res = await catalogService.findAllTableTags(body);
+    const res = await this.catalogService.findAllTableTags(body);
 
     return res;
   }
@@ -326,9 +276,7 @@ export class CatalogController {
     console.log(`/catalog`, 'ON CREATE TABLE TAGS ROUTE');
     const { id } = params;
 
-    const catalogService = new CatalogService();
-
-    const res = await catalogService.deleteTableTags(id, body);
+    const res = await this.catalogService.deleteTableTags(id, body);
 
     return res;
   }
@@ -337,9 +285,7 @@ export class CatalogController {
   async getTableRules(@Body() body) {
     console.log(`/catalog`, 'ON GET TABLE RULES ROUTE');
 
-    const catalogService = new CatalogService();
-
-    const res = await catalogService.getTableRules(body);
+    const res = await this.catalogService.getTableRules(body);
 
     return res;
   }
@@ -349,9 +295,7 @@ export class CatalogController {
     console.log(`/catalog`, 'ON DELETE TABLE RULES ROUTE');
     const { id } = params;
 
-    const catalogService = new CatalogService();
-
-    const res = await catalogService.deleteTableRules(id, body);
+    const res = await this.catalogService.deleteTableRules(id, body);
 
     return res;
   }

src/modules/catalog/catalog.service.ts

@@ -1,48 +1,31 @@
 import axios from 'axios';
 
 class CatalogService {
+  _getNimbusUrl(body) {
+    const customer = body.info.customer.toLowerCase();
+
+    if (process.env.ENV === 'prd') {
+      return `https://nimbus-${customer}.dadosfera.ai`;
+    }
+
+    return `https://nimbus-${customer}.${process.env.ENV}.dadosfera.ai`;
+  }
+
   async catalogAll(body) {
-    const customer =
-      body.info.customer.toLowerCase() === 'dadosfera'
-        ? ``
-        : `-${body.info.customer.toLowerCase()}`;
-
-    const nimbusUrl =
-      process.env.ENV === 'prd'
-        ? `https://nimbus-${body.info.customer.toLowerCase()}.dadosfera.ai`
-        : `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera`;
-
+    const nimbusUrl = this._getNimbusUrl(body);
     const { data } = await axios.get(`${nimbusUrl}/api/catalog/all/`);
 
     return data;
   }
 
   async dataAppsAll(body) {
-    const customer =
-      body.info.customer.toLowerCase() === 'dadosfera'
-        ? ``
-        : `-${body.info.customer.toLowerCase()}`;
-
-    const nimbusUrl =
-      process.env.ENV === 'prd'
-        ? `https://nimbus-${body.info.customer.toLowerCase()}.dadosfera.ai`
-        : `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera`;
-
+    const nimbusUrl = this._getNimbusUrl(body);
     const { data } = await axios.get(`${nimbusUrl}/api/catalog/data_apps/`);
     return data;
   }
 
   async dataAppsOne(id, body) {
-    const customer =
-      body.info.customer.toLowerCase() === 'dadosfera'
-        ? ``
-        : `-${body.info.customer.toLowerCase()}`;
-
-    const nimbusUrl =
-      process.env.ENV === 'prd'
-        ? `https://nimbus-${body.info.customer.toLowerCase()}.dadosfera.ai`
-        : `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera`;
-
+    const nimbusUrl = this._getNimbusUrl(body);
     const { data } = await axios.get(
       `${nimbusUrl}/api/catalog/data_apps/${id}/`,
     );
@@ -51,16 +34,7 @@ class CatalogService {
   }
 
   async getAllDashboardMetabase(body) {
-    const customer =
-      body.info.customer.toLowerCase() === 'dadosfera'
-        ? ``
-        : `-${body.info.customer.toLowerCase()}`;
-
-    const nimbusUrl =
-      process.env.ENV === 'prd'
-        ? `https://nimbus-${body.info.customer.toLowerCase()}.dadosfera.ai`
-        : `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera`;
-
+    const nimbusUrl = this._getNimbusUrl(body);
     const { data } = await axios.get(
       `${nimbusUrl}/api/catalog/dashboard-metabase/`,
     );
@@ -68,16 +42,7 @@ class CatalogService {
   }
 
   async getOneDashboardMetabase(id, body) {
-    const customer =
-      body.info.customer.toLowerCase() === 'dadosfera'
-        ? ``
-        : `-${body.info.customer.toLowerCase()}`;
-
-    const nimbusUrl =
-      process.env.ENV === 'prd'
-        ? `https://nimbus-${body.info.customer.toLowerCase()}.dadosfera.ai`
-        : `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera`;
-
+    const nimbusUrl = this._getNimbusUrl(body);
     const { data } = await axios.get(
       `${nimbusUrl}/api/catalog/dashboard-metabase/${id}`,
     );
@@ -91,16 +56,7 @@ class CatalogService {
   }
 
   async getAllTableMetadata(body) {
-    const customer =
-      body.info.customer.toLowerCase() === 'dadosfera'
-        ? ``
-        : `-${body.info.customer.toLowerCase()}`;
-
-    const nimbusUrl =
-      process.env.ENV === 'prd'
-        ? `https://nimbus-${body.info.customer.toLowerCase()}.dadosfera.ai`
-        : `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera`;
-
+    const nimbusUrl = this._getNimbusUrl(body);
     const { data } = await axios.get(
       `${nimbusUrl}/api/catalog/table-metadata/`,
     );
@@ -108,16 +64,7 @@ class CatalogService {
   }
 
   async getOneTableMetadata(body, params) {
-    const customer =
-      body.info.customer.toLowerCase() === 'dadosfera'
-        ? ``
-        : `-${body.info.customer.toLowerCase()}`;
-
-    const nimbusUrl =
-      process.env.ENV === 'prd'
-        ? `https://nimbus-${body.info.customer.toLowerCase()}.dadosfera.ai`
-        : `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera`;
-
+    const nimbusUrl = this._getNimbusUrl(body);
     const { data } = await axios.get(
       `${nimbusUrl}/api/catalog/table-metadata/`,
       { params: params },
@@ -126,16 +73,7 @@ class CatalogService {
   }
 
   async deleteOneTableMetadata(id, body) {
-    const customer =
-      body.info.customer.toLowerCase() === 'dadosfera'
-        ? ``
-        : `-${body.info.customer.toLowerCase()}`;
-
-    const nimbusUrl =
-      process.env.ENV === 'prd'
-        ? `https://nimbus-${body.info.customer.toLowerCase()}.dadosfera.ai`
-        : `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera`;
-
+    const nimbusUrl = this._getNimbusUrl(body);
     const { data } = await axios.delete(
       `${nimbusUrl}/api/catalog/table-metadata/${id}`,
     );
@@ -143,16 +81,7 @@ class CatalogService {
   }
 
   async getOneColumnMetadata(body, params) {
-    const customer =
-      body.info.customer.toLowerCase() === 'dadosfera'
-        ? ``
-        : `-${body.info.customer.toLowerCase()}`;
-
-    const nimbusUrl =
-      process.env.ENV === 'prd'
-        ? `https://nimbus-${body.info.customer.toLowerCase()}.dadosfera.ai`
-        : `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera`;
-
+    const nimbusUrl = this._getNimbusUrl(body);
     const { data } = await axios.get(
       `${nimbusUrl}/api/catalog/column-metadata/`,
       { params: params },
@@ -161,16 +90,7 @@ class CatalogService {
   }
 
   async deleteOneColumnMetadata(id, body) {
-    const customer =
-      body.info.customer.toLowerCase() === 'dadosfera'
-        ? ``
-        : `-${body.info.customer.toLowerCase()}`;
-
-    const nimbusUrl =
-      process.env.ENV === 'prd'
-        ? `https://nimbus-${body.info.customer.toLowerCase()}.dadosfera.ai`
-        : `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera`;
-
+    const nimbusUrl = this._getNimbusUrl(body);
     const { data } = await axios.delete(
       `${nimbusUrl}/api/catalog/column-metadata/${id}/`,
     );
@@ -178,16 +98,7 @@ class CatalogService {
   }
 
   async getOneDataPreview(body, params) {
-    const customer =
-      body.info.customer.toLowerCase() === 'dadosfera'
-        ? ``
-        : `-${body.info.customer.toLowerCase()}`;
-
-    const nimbusUrl =
-      process.env.ENV === 'prd'
-        ? `https://nimbus-${body.info.customer.toLowerCase()}.dadosfera.ai`
-        : `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera`;
-
+    const nimbusUrl = this._getNimbusUrl(body);
     const { data } = await axios.get(`${nimbusUrl}/api/catalog/data-preview/`, {
       params: params,
     });
@@ -195,31 +106,13 @@ class CatalogService {
   }
 
   async getDataStatus(body) {
-    const customer =
-      body.info.customer.toLowerCase() === 'dadosfera'
-        ? ``
-        : `-${body.info.customer.toLowerCase()}`;
-
-    const nimbusUrl =
-      process.env.ENV === 'prd'
-        ? `https://nimbus-${body.info.customer.toLowerCase()}.dadosfera.ai`
-        : `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera`;
-
+    const nimbusUrl = this._getNimbusUrl(body);
     const { data } = await axios.get(`${nimbusUrl}/api/catalog/data-status/`);
     return data;
   }
 
   async createDataStatus(body) {
-    const customer =
-      body.info.customer.toLowerCase() === 'dadosfera'
-        ? ``
-        : `-${body.info.customer.toLowerCase()}`;
-
-    const nimbusUrl =
-      process.env.ENV === 'prd'
-        ? `https://nimbus-${body.info.customer.toLowerCase()}.dadosfera.ai`
-        : `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera`;
-
+    const nimbusUrl = this._getNimbusUrl(body);
     const { data } = await axios.post(
       `${nimbusUrl}/api/catalog/data-status/`,
       body,
@@ -228,16 +121,7 @@ class CatalogService {
   }
 
   async getDataDescription(body) {
-    const customer =
-      body.info.customer.toLowerCase() === 'dadosfera'
-        ? ``
-        : `-${body.info.customer.toLowerCase()}`;
-
-    const nimbusUrl =
-      process.env.ENV === 'prd'
-        ? `https://nimbus-${body.info.customer.toLowerCase()}.dadosfera.ai`
-        : `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera`;
-
+    const nimbusUrl = this._getNimbusUrl(body);
     const { data } = await axios.get(
       `${nimbusUrl}/api/catalog/data-description/`,
     );
@@ -245,16 +129,7 @@ class CatalogService {
   }
 
   async createDataDescription(body) {
-    const customer =
-      body.info.customer.toLowerCase() === 'dadosfera'
-        ? ``
-        : `-${body.info.customer.toLowerCase()}`;
-
-    const nimbusUrl =
-      process.env.ENV === 'prd'
-        ? `https://nimbus-${body.info.customer.toLowerCase()}.dadosfera.ai`
-        : `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera`;
-
+    const nimbusUrl = this._getNimbusUrl(body);
     const { data } = await axios.post(
       `${nimbusUrl}/api/catalog/data-description/`,
       body,
@@ -263,31 +138,13 @@ class CatalogService {
   }
 
   async getDataDocs(body) {
-    const customer =
-      body.info.customer.toLowerCase() === 'dadosfera'
-        ? ``
-        : `-${body.info.customer.toLowerCase()}`;
-
-    const nimbusUrl =
-      process.env.ENV === 'prd'
-        ? `https://nimbus-${body.info.customer.toLowerCase()}.dadosfera.ai`
-        : `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera`;
-
+    const nimbusUrl = this._getNimbusUrl(body);
     const { data } = await axios.get(`${nimbusUrl}/api/catalog/data-docs/`);
     return data;
   }
 
   async createDataDocs(body) {
-    const customer =
-      body.info.customer.toLowerCase() === 'dadosfera'
-        ? ``
-        : `-${body.info.customer.toLowerCase()}`;
-
-    const nimbusUrl =
-      process.env.ENV === 'prd'
-        ? `https://nimbus-${body.info.customer.toLowerCase()}.dadosfera.ai`
-        : `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera`;
-
+    const nimbusUrl = this._getNimbusUrl(body);
     const { data } = await axios.post(
       `${nimbusUrl}/api/catalog/data-docs/`,
       body,
@@ -296,31 +153,13 @@ class CatalogService {
   }
 
   async getDataRating(body) {
-    const customer =
-      body.info.customer.toLowerCase() === 'dadosfera'
-        ? ``
-        : `-${body.info.customer.toLowerCase()}`;
-
-    const nimbusUrl =
-      process.env.ENV === 'prd'
-        ? `https://nimbus-${body.info.customer.toLowerCase()}.dadosfera.ai`
-        : `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera`;
-
+    const nimbusUrl = this._getNimbusUrl(body);
     const { data } = await axios.get(`${nimbusUrl}/api/catalog/data-rating/`);
     return data;
   }
 
   async createDataRating(body) {
-    const customer =
-      body.info.customer.toLowerCase() === 'dadosfera'
-        ? ``
-        : `-${body.info.customer.toLowerCase()}`;
-
-    const nimbusUrl =
-      process.env.ENV === 'prd'
-        ? `https://nimbus-${body.info.customer.toLowerCase()}.dadosfera.ai`
-        : `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera`;
-
+    const nimbusUrl = this._getNimbusUrl(body);
     const { data } = await axios.post(
       `${nimbusUrl}/api/catalog/data-rating/`,
       body,
@@ -329,16 +168,7 @@ class CatalogService {
   }
 
   async getSummaryRating(id, body) {
-    const customer =
-      body.info.customer.toLowerCase() === 'dadosfera'
-        ? ``
-        : `-${body.info.customer.toLowerCase()}`;
-
-    const nimbusUrl =
-      process.env.ENV === 'prd'
-        ? `https://nimbus-${body.info.customer.toLowerCase()}.dadosfera.ai`
-        : `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera`;
-
+    const nimbusUrl = this._getNimbusUrl(body);
     const { data } = await axios.get(
       `${nimbusUrl}/api/catalog/summary-rating/${id}`,
     );
@@ -346,31 +176,13 @@ class CatalogService {
   }
 
   async getDataComment(body) {
-    const customer =
-      body.info.customer.toLowerCase() === 'dadosfera'
-        ? ``
-        : `-${body.info.customer.toLowerCase()}`;
-
-    const nimbusUrl =
-      process.env.ENV === 'prd'
-        ? `https://nimbus-${body.info.customer.toLowerCase()}.dadosfera.ai`
-        : `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera`;
-
+    const nimbusUrl = this._getNimbusUrl(body);
     const { data } = await axios.get(`${nimbusUrl}/api/catalog/data-comment/`);
     return data;
   }
 
   async createDataComment(body) {
-    const customer =
-      body.info.customer.toLowerCase() === 'dadosfera'
-        ? ``
-        : `-${body.info.customer.toLowerCase()}`;
-
-    const nimbusUrl =
-      process.env.ENV === 'prd'
-        ? `https://nimbus-${body.info.customer.toLowerCase()}.dadosfera.ai`
-        : `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera`;
-
+    const nimbusUrl = this._getNimbusUrl(body);
     const { data } = await axios.post(
       `${nimbusUrl}/api/catalog/data-comment/`,
       body,
@@ -379,16 +191,7 @@ class CatalogService {
   }
 
   async getDataReview(body, params) {
-    const customer =
-      body.info.customer.toLowerCase() === 'dadosfera'
-        ? ``
-        : `-${body.info.customer.toLowerCase()}`;
-
-    const nimbusUrl =
-      process.env.ENV === 'prd'
-        ? `https://nimbus-${body.info.customer.toLowerCase()}.dadosfera.ai`
-        : `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera`;
-
+    const nimbusUrl = this._getNimbusUrl(body);
     const { data } = await axios.get(`${nimbusUrl}/api/catalog/data-review/`, {
       params: params,
     });
@@ -396,46 +199,19 @@ class CatalogService {
   }
 
   async createTags(body) {
-    const customer =
-      body.info.customer.toLowerCase() === 'dadosfera'
-        ? ``
-        : `-${body.info.customer.toLowerCase()}`;
-
-    const nimbusUrl =
-      process.env.ENV === 'prd'
-        ? `https://nimbus-${body.info.customer.toLowerCase()}.dadosfera.ai`
-        : `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera`;
-
+    const nimbusUrl = this._getNimbusUrl(body);
     const { data } = await axios.post(`${nimbusUrl}/api/catalog/tags/`, body);
     return data;
   }
 
   async findAllTags(body) {
-    const customer =
-      body.info.customer.toLowerCase() === 'dadosfera'
-        ? ``
-        : `-${body.info.customer.toLowerCase()}`;
-
-    const nimbusUrl =
-      process.env.ENV === 'prd'
-        ? `https://nimbus-${body.info.customer.toLowerCase()}.dadosfera.ai`
-        : `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera`;
-
+    const nimbusUrl = this._getNimbusUrl(body);
     const { data } = await axios.get(`${nimbusUrl}/api/catalog/tags/`, body);
     return data;
   }
 
   async findAllTableTags(body) {
-    const customer =
-      body.info.customer.toLowerCase() === 'dadosfera'
-        ? ``
-        : `-${body.info.customer.toLowerCase()}`;
-
-    const nimbusUrl =
-      process.env.ENV === 'prd'
-        ? `https://nimbus-${body.info.customer.toLowerCase()}.dadosfera.ai`
-        : `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera`;
-
+    const nimbusUrl = this._getNimbusUrl(body);
     const { data } = await axios.get(
       `${nimbusUrl}/api/catalog/table-tags/`,
       body,
@@ -444,31 +220,13 @@ class CatalogService {
   }
 
   async deleteTags(id, body) {
-    const customer =
-      body.info.customer.toLowerCase() === 'dadosfera'
-        ? ``
-        : `-${body.info.customer.toLowerCase()}`;
-
-    const nimbusUrl =
-      process.env.ENV === 'prd'
-        ? `https://nimbus-${body.info.customer.toLowerCase()}.dadosfera.ai`
-        : `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera`;
-
+    const nimbusUrl = this._getNimbusUrl(body);
     const { data } = await axios.delete(`${nimbusUrl}/api/catalog/tags/${id}`);
     return data;
   }
 
   async createTableTags(body) {
-    const customer =
-      body.info.customer.toLowerCase() === 'dadosfera'
-        ? ``
-        : `-${body.info.customer.toLowerCase()}`;
-
-    const nimbusUrl =
-      process.env.ENV === 'prd'
-        ? `https://nimbus-${body.info.customer.toLowerCase()}.dadosfera.ai`
-        : `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera`;
-
+    const nimbusUrl = this._getNimbusUrl(body);
     const { data } = await axios.post(
       `${nimbusUrl}/api/catalog/table-tags/`,
       body,
@@ -477,16 +235,7 @@ class CatalogService {
   }
 
   async deleteTableTags(id, body) {
-    const customer =
-      body.info.customer.toLowerCase() === 'dadosfera'
-        ? ``
-        : `-${body.info.customer.toLowerCase()}`;
-
-    const nimbusUrl =
-      process.env.ENV === 'prd'
-        ? `https://nimbus-${body.info.customer.toLowerCase()}.dadosfera.ai`
-        : `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera`;
-
+    const nimbusUrl = this._getNimbusUrl(body);
     const { data } = await axios.delete(
       `${nimbusUrl}/api/catalog/table-tags/${id}`,
     );
@@ -494,16 +243,7 @@ class CatalogService {
   }
 
   async getTableRules(body) {
-    const customer =
-      body.info.customer.toLowerCase() === 'dadosfera'
-        ? ``
-        : `-${body.info.customer.toLowerCase()}`;
-
-    const nimbusUrl =
-      process.env.ENV === 'prd'
-        ? `https://nimbus-${body.info.customer.toLowerCase()}.dadosfera.ai`
-        : `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera`;
-
+    const nimbusUrl = this._getNimbusUrl(body);
     const { data } = await axios.get(
       `${nimbusUrl}/api/catalog/table-rules/`,
       body,
@@ -512,16 +252,7 @@ class CatalogService {
   }
 
   async deleteTableRules(id, body) {
-    const customer =
-      body.info.customer.toLowerCase() === 'dadosfera'
-        ? ``
-        : `-${body.info.customer.toLowerCase()}`;
-
-    const nimbusUrl =
-      process.env.ENV === 'prd'
-        ? `https://nimbus-${body.info.customer.toLowerCase()}.dadosfera.ai`
-        : `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera`;
-
+    const nimbusUrl = this._getNimbusUrl(body);
     const { data } = await axios.delete(
       `${nimbusUrl}/api/catalog/table-rules/${id}`,
     );

src/modules/inputs/inputs.service.ts

@@ -1,6 +1,5 @@
 import { Body, HttpException, HttpStatus, Injectable } from '@nestjs/common';
 import { Timeout } from '@nestjs/schedule';
-import { InputNewCreateRequest } from '@victorradael/protospack';
 import { InputsClientService } from 'src/clients/inputs/client.service';
 import { IIdRequest, Info } from 'src/clients/inputs/interfaces';
 
@@ -8,11 +7,27 @@ import { IIdRequest, Info } from 'src/clients/inputs/interfaces';
 export class InputsService {
   constructor(private inputClient: InputsClientService) {}
 
-  async create(@Body() data: InputNewCreateRequest) {
+  async create(@Body() data) {
     try {
-      const createInputResponse = await this.inputClient.create(data);
-
-      return createInputResponse;
+      if (
+        data.plugin == 'csv' ||
+        data.plugin == 'json' ||
+        data.plugin == 'parquet'
+      ) {
+        const { info, ...input } = data;
+        const inputPayload = this.generateInputS3Payload(input);
+        const createInputResponse = await this.inputClient.createS3Inputs({
+          input: inputPayload,
+          info,
+        });
+        return createInputResponse;
+      } else {
+        const createInputResponse: any = await this.inputClient.create(data);
+        if (createInputResponse?.input?.input_jdbc) {
+          return { input: createInputResponse?.input?.input_jdbc };
+        }
+        return createInputResponse;
+      }
     } catch (err) {
       throw new HttpException(err.message, HttpStatus.NOT_FOUND);
     }
@@ -84,4 +99,29 @@ export class InputsService {
       throw new HttpException(err.message, HttpStatus.NOT_FOUND);
     }
   }
+
+  generateInputS3Payload(payload) {
+    const { credentials, plugin } = payload;
+    if (!credentials) return payload;
+
+    const {
+      client_aws_access_key_id,
+      client_aws_secret_access_key,
+      file_format_params,
+      format_file_params,
+      client_bucket,
+      file_to_extract,
+    } = credentials;
+    const formatedPayload = {
+      plugin,
+      source_bucket: client_bucket,
+      source_prefix: file_to_extract,
+      auth_parameters: {
+        aws_access_key_id: client_aws_access_key_id,
+        aws_secret_access_key: client_aws_secret_access_key,
+      },
+      file_format_params: file_format_params || format_file_params,
+    };
+    return formatedPayload;
+  }
 }

src/modules/pipelines/pipelines.service.ts

@@ -7,13 +7,20 @@ import { objectCamelToSnake } from 'src/utils/CaseConverter';
 export class PipelinesService {
   constructor(private pipelineClient: PipelinesClientService) {}
 
+  adjustPayload(payload) {
+    payload.input = payload.input?.input_s3 || payload.input?.input_jdbc;
+  }
+
   async create(createPipelineDto) {
     try {
       const createPipelineResponse = await this.pipelineClient.create(
         createPipelineDto,
       );
 
-      return objectCamelToSnake(createPipelineResponse);
+      const pipeline = objectCamelToSnake(createPipelineResponse);
+      this.adjustPayload(pipeline.pipeline);
+
+      return pipeline;
     } catch (err) {
       console.log(err);
       throw new HttpException(err.message, HttpStatus.NOT_FOUND);
@@ -23,7 +30,11 @@ export class PipelinesService {
   async findOne(data: IIdRequest) {
     try {
       const findOnePipelineResponse = await this.pipelineClient.findOne(data);
-      return objectCamelToSnake(findOnePipelineResponse);
+
+      const pipeline = objectCamelToSnake(findOnePipelineResponse);
+      this.adjustPayload(pipeline.pipeline);
+
+      return pipeline;
     } catch (err) {
       throw new HttpException(err.message, HttpStatus.NOT_FOUND);
     }
@@ -33,7 +44,11 @@ export class PipelinesService {
     try {
       const findAllPipelineResponse = await this.pipelineClient.findAll(data);
 
-      return objectCamelToSnake(findAllPipelineResponse);
+      const pipelines = objectCamelToSnake(findAllPipelineResponse);
+      pipelines.forEach((pipeline) => {
+        this.adjustPayload(pipeline);
+      });
+      return { pipelines };
     } catch (err) {
       throw new HttpException(err.message, HttpStatus.NOT_FOUND);
     }
@@ -47,7 +62,10 @@ export class PipelinesService {
         ...data,
       });
 
-      return objectCamelToSnake(updatePipelineResponse);
+      const pipeline = objectCamelToSnake(updatePipelineResponse);
+      this.adjustPayload(pipeline);
+
+      return pipeline;
     } catch (err) {
       throw new HttpException(err.message, HttpStatus.NOT_FOUND);
     }

src/utils/ErrorBuilder.ts

@@ -0,0 +1,106 @@
+import { HttpStatus, HttpException } from '@nestjs/common';
+
+import ErrorCodes from './errorCodes';
+
+function Builder({ statusCode, message, error, code }) {
+  return new HttpException({ statusCode, message, error, code }, statusCode);
+}
+
+export default function ErrorBuilder(code: string) {
+  console.log(code);
+
+  switch (code) {
+    case ErrorCodes.AUTH.WRONG_CREDENTIALS:
+      return Builder({
+        statusCode: HttpStatus.UNAUTHORIZED,
+        error: 'Não autenticado',
+        message: 'Usuário ou senha incorretos',
+        code,
+      });
+
+    case ErrorCodes.AUTH.WRONG_PASSWORD_CONFIRMATION:
+      return Builder({
+        statusCode: HttpStatus.UNAUTHORIZED,
+        error: 'Senha incorreta',
+        message: 'Confirmação de senha incorreta',
+        code,
+      });
+
+    case ErrorCodes.AUTH.TOTP_NOT_ENABLED:
+      return Builder({
+        statusCode: HttpStatus.PRECONDITION_FAILED,
+        error: 'Não permitido',
+        message: 'A autenticação multifator não está habilitada',
+        code,
+      });
+
+    case ErrorCodes.AUTH.TOTP_ALREADY_ENABLED:
+      return Builder({
+        statusCode: HttpStatus.PRECONDITION_FAILED,
+        error: 'Não permitido',
+        message: 'A autenticação multifator já está habilitada',
+        code,
+      });
+
+    case ErrorCodes.AUTH.TOTP_ALREADY_DISABLED:
+      return Builder({
+        statusCode: HttpStatus.PRECONDITION_FAILED,
+        error: 'Não permitido',
+        message: 'A autenticação multifator já está desabilitada',
+        code,
+      });
+
+    case ErrorCodes.AUTH.TOTP_REQUIRED:
+      return Builder({
+        statusCode: HttpStatus.UNAUTHORIZED,
+        error: 'Não autenticado',
+        message: 'Informe o token de autenticação multifator',
+        code,
+      });
+
+    case ErrorCodes.AUTH.CODE_MISMATCH:
+    case ErrorCodes.AUTH.CODE_ALREADY_USED:
+      return Builder({
+        statusCode: HttpStatus.UNAUTHORIZED,
+        error: 'Não autenticado',
+        message: 'Token de autenticação multifator inválido',
+        code,
+      });
+
+    case ErrorCodes.RATE_LIMIT:
+      return Builder({
+        statusCode: HttpStatus.TOO_MANY_REQUESTS,
+        error: 'Limite excedido',
+        message:
+          'Você tentou realizar essa operação muitas vezes. Tente novamente mais tarde',
+        code,
+      });
+
+    case ErrorCodes.AUTH.UNAUTHORIZED:
+      return Builder({
+        statusCode: HttpStatus.UNAUTHORIZED,
+        error: 'Não autenticado',
+        message: 'É necessário estar logado para realizar essa operação',
+        code,
+      });
+
+    case ErrorCodes.AUTH.FORBIDDEN:
+      return Builder({
+        statusCode: HttpStatus.FORBIDDEN,
+        error: 'Não autorizado',
+        message:
+          'Você não tem permissões suficientes para realizar essa operação',
+        code,
+      });
+
+    case ErrorCodes.UNKNOWN:
+    default:
+      return Builder({
+        statusCode: HttpStatus.INTERNAL_SERVER_ERROR,
+        error: 'Desconhecido',
+        message:
+          'Erro desconhecido. Tente novamente ou entre em contato com o suporte',
+        code: ErrorCodes.UNKNOWN,
+      });
+  }
+}

src/utils/errorCodes.ts

@@ -0,0 +1,20 @@
+export const Auth = {
+  UNAUTHORIZED: 'AUTH.UNAUTHORIZED',
+  FORBIDDEN: 'AUTH.FORBIDDEN',
+  WRONG_CREDENTIALS: 'AUTH.WRONG_CREDENTIALS',
+  WRONG_PASSWORD_CONFIRMATION: 'AUTH.WRONG_PASSWORD_CONFIRMATION',
+  TOTP_NOT_ENABLED: 'AUTH.TOTP_NOT_ENABLED',
+  TOTP_ALREADY_ENABLED: 'AUTH.TOTP_ALREADY_ENABLED',
+  TOTP_ALREADY_DISABLED: 'AUTH.TOTP_ALREADY_DISABLED',
+  TOTP_REQUIRED: 'AUTH.TOTP_REQUIRED',
+  CODE_MISMATCH: 'AUTH.CODE_MISMATCH',
+  CODE_ALREADY_USED: 'AUTH.CODE_ALREADY_USED',
+};
+
+const ErrorCodes = {
+  UNKNOWN: 'UNKNOWN',
+  RATE_LIMIT: 'RATE_LIMIT',
+  AUTH: Auth,
+};
+
+export default ErrorCodes;