Merge pull request #81 from dadosfera/feat/CatalogFixes

Feat/catalog fixes

.ebextensions/imdsv2.config

@@ -0,0 +1,7 @@
+Resources:
+  AWSEBAutoScalingLaunchConfiguration:
+    Properties:
+      MetadataOptions:
+        HttpEndpoint: enabled
+        HttpPutResponseHopLimit: 2
+        HttpTokens: required

package.json

@@ -33,7 +33,6 @@
     "@victorradael/protospack": "^1.5.5",
     "axios": "^0.25.0",
     "dotenv": "^14.2.0",
-    "grpc": "^1.24.11",
     "helmet": "^5.0.2",
     "jsonwebtoken": "^8.5.1",
     "jwk-to-pem": "^2.0.5",

src/clients/inputs/client.service.ts

@@ -1,16 +1,16 @@
 import { OnModuleInit, Inject } from '@nestjs/common';
 import { ClientGrpc } from '@nestjs/microservices';
-import { InputService } from '@victorradael/protospack';
+import {
+  InputNewCreateRequest,
+  InputService,
+  TestConnectionGetColumnsRequest,
+  TestConnectionRequest,
+} from '@victorradael/protospack';
 import {
   objectCamelToSnake,
   objectSnakeToCamel,
 } from 'src/utils/CaseConverter';
-import {
-  ICreateInputRequest,
-  IIdRequest,
-  ITestConnectionRequest,
-  UpdateInputRequest,
-} from './interfaces';
+import { IIdRequest, UpdateInputRequest } from './interfaces';
 
 export class InputsClientService implements OnModuleInit {
   private inputService: InputService;
@@ -23,22 +23,24 @@ export class InputsClientService implements OnModuleInit {
       this.grpcClient.getService<InputService>('InputService');
   }
 
-  async create(createInputDto: ICreateInputRequest) {
+  async create(createInputDto: InputNewCreateRequest) {
     console.log('InputClientService', 'Create');
 
     const createInputResponse = await new Promise((resolve, reject) => {
-      this.inputService.Create(objectSnakeToCamel(createInputDto)).subscribe({
-        next(x) {
-          resolve(objectCamelToSnake(x));
-        },
-        error(err) {
-          console.log('Observable Error');
-          reject(err);
-        },
-        complete() {
-          console.log('done');
-        },
-      });
+      this.inputService
+        .NewCreate(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) => {
@@ -147,10 +149,10 @@ export class InputsClientService implements OnModuleInit {
     return removeInputResponse;
   }
 
-  async testConnection(data: ITestConnectionRequest) {
+  async testConnection(data: TestConnectionRequest) {
     console.log('InputClientService', 'TestConnection');
     const testConnectionResponse = await new Promise((resolve, reject) => {
-      this.inputService.TestConnection(objectSnakeToCamel(data)).subscribe({
+      this.inputService.NewTestConnection(objectSnakeToCamel(data)).subscribe({
         next(x) {
           resolve(objectCamelToSnake(x));
         },
@@ -170,4 +172,28 @@ export class InputsClientService implements OnModuleInit {
 
     return testConnectionResponse;
   }
+
+  async getColumns(data: TestConnectionGetColumnsRequest) {
+    console.log('InputClientService', 'TestConnection/Get-Columns');
+    const getColumnsResponse = await new Promise((resolve, reject) => {
+      this.inputService.GetColumns(objectSnakeToCamel(data)).subscribe({
+        next(x) {
+          resolve(objectCamelToSnake(x));
+        },
+        error(err) {
+          console.log('Observable Error');
+          reject(err);
+        },
+        complete() {
+          console.log('done');
+        },
+      });
+    })
+      .then((res) => res)
+      .catch((err) => {
+        throw new Error(err);
+      });
+
+    return getColumnsResponse;
+  }
 }

src/modules/catalog/catalog.controller.ts

@@ -1,4 +1,12 @@
-import { Body, Controller, Delete, Get, Param, Post } from '@nestjs/common';
+import {
+  Body,
+  Controller,
+  Delete,
+  Get,
+  Param,
+  Post,
+  Query,
+} from '@nestjs/common';
 import { CatalogService } from './catalog.service';
 
 @Controller('catalog')
@@ -33,7 +41,7 @@ export class CatalogController {
     const { id } = params;
     const catalogService = new CatalogService();
 
-    const res = await catalogService.dataAppsOne(body, id);
+    const res = await catalogService.dataAppsOne(id, body);
 
     return res;
   }
@@ -56,30 +64,33 @@ export class CatalogController {
 
     const catalogService = new CatalogService();
 
-    const res = await catalogService.getOneDashboardMetabase(body, id);
+    const res = await catalogService.getOneDashboardMetabase(id, body);
 
     return res;
   }
 
   @Get('table-metadata')
-  async getAllTableMetadata(@Body() body) {
+  async getAllTableMetadata(@Body() body, @Query() query) {
     console.log(`/catalog`, 'ON GET ALL TABLES METADATA ROUTE');
 
     const catalogService = new CatalogService();
-
-    const res = await catalogService.getAllTableMetadata(body);
-
-    return res;
+    if (!query) {
+      const res = await catalogService.getAllTableMetadata(body);
+      return res;
+    } else {
+      const res = await catalogService.getOneTableMetadata(body, query);
+      return res;
+    }
   }
 
-  @Delete('table-metadata')
+  @Delete('table-metadata/:id')
   async deleteOneTableMetadata(@Param() params, @Body() body) {
     const { id } = params;
     console.log(`/catalog`, 'ON DELETE ONE TABLE METADATA ROUTE');
 
     const catalogService = new CatalogService();
 
-    const res = await catalogService.deleteOneTableMetadata(body, id);
+    const res = await catalogService.deleteOneTableMetadata(id, body);
 
     return res;
   }
@@ -95,14 +106,14 @@ export class CatalogController {
     return res;
   }
 
-  @Delete('column-metadata')
+  @Delete('column-metadata/:id')
   async deleteOneColumnMetadata(@Param() params, @Body() body) {
     console.log(`/catalog`, 'ON DELETE ONE COLUMN METADATA ROUTE');
     const { id } = params;
 
     const catalogService = new CatalogService();
 
-    const res = await catalogService.deleteOneColumnMetadata(body, id);
+    const res = await catalogService.deleteOneColumnMetadata(id, body);
 
     return res;
   }
@@ -162,6 +173,17 @@ export class CatalogController {
     return res;
   }
 
+  @Post('data-rating')
+  async createDataRating(@Body() body) {
+    console.log(`/catalog`, 'ON GET DATA RATING ROUTE');
+
+    const catalogService = new CatalogService();
+
+    const res = await catalogService.createDataRating(body);
+
+    return res;
+  }
+
   @Get('summary-rating/:id')
   async getSummaryRating(@Param() params, @Body() body) {
     console.log(`/catalog`, 'ON GET SUMMARY RATING ROUTE');
@@ -185,6 +207,17 @@ export class CatalogController {
     return res;
   }
 
+  @Post('data-comment')
+  async createDataComment(@Body() body) {
+    console.log(`/catalog`, 'ON GET DATA COMMENT ROUTE');
+
+    const catalogService = new CatalogService();
+
+    const res = await catalogService.createDataComment(body);
+
+    return res;
+  }
+
   @Get('data-review')
   async getDataReview(@Body() body) {
     console.log(`/catalog`, 'ON GET DATA REVIEW ROUTE');
@@ -225,7 +258,7 @@ export class CatalogController {
 
     const catalogService = new CatalogService();
 
-    const res = await catalogService.deleteTags(body, id);
+    const res = await catalogService.deleteTags(id, body);
 
     return res;
   }
@@ -252,14 +285,14 @@ export class CatalogController {
     return res;
   }
 
-  @Delete('table-tags')
+  @Delete('table-tags/:id')
   async deleteTableTags(@Param() params, @Body() body) {
     console.log(`/catalog`, 'ON CREATE TABLE TAGS ROUTE');
     const { id } = params;
 
     const catalogService = new CatalogService();
 
-    const res = await catalogService.deleteTableTags(body, id);
+    const res = await catalogService.deleteTableTags(id, body);
 
     return res;
   }
@@ -275,14 +308,14 @@ export class CatalogController {
     return res;
   }
 
-  @Delete('table-rules')
+  @Delete('table-rules/:id')
   async deleteTableRules(@Param() params, @Body() body) {
     console.log(`/catalog`, 'ON DELETE TABLE RULES ROUTE');
     const { id } = params;
 
     const catalogService = new CatalogService();
 
-    const res = await catalogService.deleteTableRules(body, id);
+    const res = await catalogService.deleteTableRules(id, body);
 
     return res;
   }

src/modules/catalog/catalog.service.ts

@@ -51,7 +51,7 @@ class CatalogService {
     return data;
   }
 
-  async getOneDashboardMetabase(body, id) {
+  async getOneDashboardMetabase(id, body) {
     const customer =
       body.info.customer.toLowerCase() === 'dadosfera'
         ? ``
@@ -75,6 +75,19 @@ class CatalogService {
     return data;
   }
 
+  async getOneTableMetadata(body, params) {
+    const customer =
+      body.info.customer.toLowerCase() === 'dadosfera'
+        ? ``
+        : `-${body.info.customer.toLowerCase()}`;
+
+    const { data } = await axios.get(
+      `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera/api/catalog/table-metadata/`,
+      { params: params },
+    );
+    return data;
+  }
+
   async deleteOneTableMetadata(id, body) {
     const customer =
       body.info.customer.toLowerCase() === 'dadosfera'
@@ -171,6 +184,19 @@ class CatalogService {
     return data;
   }
 
+  async createDataRating(body) {
+    const customer =
+      body.info.customer.toLowerCase() === 'dadosfera'
+        ? ``
+        : `-${body.info.customer.toLowerCase()}`;
+
+    const { data } = await axios.post(
+      `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera/api/catalog/data-rating/`,
+      body,
+    );
+    return data;
+  }
+
   async getSummaryRating(id, body) {
     const customer =
       body.info.customer.toLowerCase() === 'dadosfera'
@@ -194,6 +220,19 @@ class CatalogService {
     return data;
   }
 
+  async createDataComment(body) {
+    const customer =
+      body.info.customer.toLowerCase() === 'dadosfera'
+        ? ``
+        : `-${body.info.customer.toLowerCase()}`;
+
+    const { data } = await axios.post(
+      `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera/api/catalog/data-comment/`,
+      body,
+    );
+    return data;
+  }
+
   async getDataReview(body) {
     const customer =
       body.info.customer.toLowerCase() === 'dadosfera'

src/modules/inputs/inputs.controller.ts

@@ -9,10 +9,8 @@ import {
 } from '@nestjs/common';
 import { InputsService } from './inputs.service';
 import { InputsClientService } from 'src/clients/inputs/client.service';
-import {
-  ICreateInputRequest,
-  UpdateInputRequest,
-} from 'src/clients/inputs/interfaces';
+import { UpdateInputRequest } from 'src/clients/inputs/interfaces';
+import { InputNewCreateRequest } from '@victorradael/protospack';
 
 @Controller('inputs')
 export class InputsController {
@@ -28,8 +26,21 @@ export class InputsController {
     return response;
   }
 
+  @Post('/test-connection/get-columns')
+  async getColumns(@Body() data) {
+    console.log(
+      `/test-connection/get-columns`,
+      'ON TEST CONNECTION GET COLUMNS ROUTE',
+    );
+
+    const inputService = new InputsService(this.inputsClientService);
+    const response = await inputService.getColumns(data);
+
+    return response;
+  }
+
   @Post()
-  async create(@Body() createInputDto: ICreateInputRequest) {
+  async create(@Body() createInputDto: InputNewCreateRequest) {
     console.log(`/input`, 'ON CREATE ROUTE');
 
     const inputService = new InputsService(this.inputsClientService);

src/modules/inputs/inputs.service.ts

@@ -1,16 +1,13 @@
 import { Body, HttpException, HttpStatus, Injectable } from '@nestjs/common';
+import { InputNewCreateRequest } from '@victorradael/protospack';
 import { InputsClientService } from 'src/clients/inputs/client.service';
-import {
-  ICreateInputRequest,
-  IIdRequest,
-  Info,
-} from 'src/clients/inputs/interfaces';
+import { IIdRequest, Info } from 'src/clients/inputs/interfaces';
 
 @Injectable()
 export class InputsService {
   constructor(private inputClient: InputsClientService) {}
 
-  async create(@Body() data: ICreateInputRequest) {
+  async create(@Body() data: InputNewCreateRequest) {
     try {
       const createInputResponse = await this.inputClient.create(data);
 
@@ -74,4 +71,15 @@ export class InputsService {
       throw new HttpException(err.message, HttpStatus.NOT_FOUND);
     }
   }
+
+  async getColumns(data) {
+    try {
+      const testConnectionGetColumnsResponse =
+        await this.inputClient.getColumns(data);
+
+      return testConnectionGetColumnsResponse;
+    } catch (err) {
+      throw new HttpException(err.message, HttpStatus.NOT_FOUND);
+    }
+  }
 }

src/modules/pipelines/pipelines.controller.ts

@@ -14,13 +14,13 @@ import { PipelinesService } from './pipelines.service';
 export class PipelinesController {
   constructor(private pipelinesClientService: PipelinesClientService) {}
 
-  @Get('start/:id')
+  @Post('start/:id')
   async activate(@Param() params, @Body() body) {
     const { id } = params;
     const { info } = body;
 
     console.log(
-      process.env.DEV_URL + `/transformation/start/${id}`,
+      process.env.DEV_URL + `/pipeline/start/${id}`,
       'ON START PIPELINE ROUTE',
     );