Compare commits

...
18 Commits
Author SHA1 Message Date
rodrigo.zamboni ef2a24a0c3 FIX: Fix runPipeline fail case return 2022-04-28 17:39:05 -03:00
Rodrigo Zamboni 8a31e11445 Merge pull request #87 from dadosfera/beta
Beta
2022-04-28 17:23:54 -03:00
Rodrigo Zamboni 2013e97e20 Merge pull request #86 from dadosfera/alpha
Alpha
2022-04-28 17:12:53 -03:00
rodrigo.zamboni dd271205ba Merge branch 'alpha' of https://github.com/dadosfera/maestro into alpha 2022-04-28 17:00:44 -03:00
rodrigo.zamboni a1f9f14897 FIX: Fixing more catalog routes params 2022-04-28 17:00:08 -03:00
Gabriel Amorim b7efa2f58d Merge pull request #85 from dadosfera/beta
Beta -> Main
2022-04-28 16:04:10 -03:00
Gabriel Amorim 395e36581d Merge pull request #84 from dadosfera/alpha
Alpha -> Beta
2022-04-28 16:03:53 -03:00
rodrigo.zamboni 97a54f9267 Merge branch 'alpha' of https://github.com/dadosfera/maestro into alpha 2022-04-28 15:56:30 -03:00
rodrigo.zamboni 00b0e00bd0 FIX: fix iframe_url and pipeline status 2022-04-28 15:55:48 -03:00
Rodrigo Zamboni 9188536161 Merge pull request #83 from dadosfera/beta
Beta
2022-04-28 14:53:16 -03:00
Rodrigo Zamboni 1ae8151184 Merge pull request #82 from dadosfera/alpha
Alpha -> Beta
2022-04-28 14:40:14 -03:00
rodrigo.zamboni 3d77980dd2 CI: deploy 2022-04-28 14:24:28 -03:00
Rodrigo Zamboni 849b979e63 Merge pull request #81 from dadosfera/feat/CatalogFixes
Feat/catalog fixes
2022-04-28 14:19:31 -03:00
rodrigo.zamboni 28580782b1 FIX: catalog routes fix 2022-04-28 14:14:03 -03:00
Rodrigo Zamboni fc784e2d6d Merge pull request #79 from dadosfera/alpha
Alpha
2022-04-28 13:22:14 -03:00
rodrigo.zamboni c997e91912 FIX: fix table-metadata find one route 2022-04-28 12:59:35 -03:00
rodrigo.zamboni 22f493d48a FIX: fixing missing id on delete routes 2022-04-28 12:12:37 -03:00
rodrigo.zamboni 035213824b FIX: fixing missing id on delete routes 2022-04-28 12:00:19 -03:00
6 changed files with 143 additions and 49 deletions
+1 -1
View File
@@ -1,4 +1,4 @@
<p align="center"> <p align="center">
<image src="./assets/maestro.svg" style="width:10rem"> <image src="./assets/maestro.svg" style="width:10rem">
<h1 align="center">Maestro</h1> <h1 align="center">Maestro</h1>
</p> </p>
+7 -7
View File
@@ -18,7 +18,7 @@
"@nestjs/microservices": "^8.4.3", "@nestjs/microservices": "^8.4.3",
"@nestjs/platform-express": "^8.4.3", "@nestjs/platform-express": "^8.4.3",
"@nestjs/swagger": "^5.2.1", "@nestjs/swagger": "^5.2.1",
"@victorradael/protospack": "^1.5.5", "@victorradael/protospack": "^1.5.9",
"axios": "^0.25.0", "axios": "^0.25.0",
"dotenv": "^14.2.0", "dotenv": "^14.2.0",
"helmet": "^5.0.2", "helmet": "^5.0.2",
@@ -2344,9 +2344,9 @@
} }
}, },
"node_modules/@victorradael/protospack": { "node_modules/@victorradael/protospack": {
"version": "1.5.5", "version": "1.5.9",
"resolved": "https://registry.npmjs.org/@victorradael/protospack/-/protospack-1.5.5.tgz", "resolved": "https://registry.npmjs.org/@victorradael/protospack/-/protospack-1.5.9.tgz",
"integrity": "sha512-5yGW/EuZDY9N56CVMXJW1IrBkkv6KpalBepu0LLQvM5Y+Pr8lwY2i1p/1rlsjHo6Gk1RODKuWSXAL870jQEAdg==", "integrity": "sha512-h96qwtRftVkZ0ftsahymnxO/bwCL8/bHvllyjTuhcLLmBj0fKG6q/nz5S9cFpq8OAEljehO+luNj388mZCF7Yg==",
"dependencies": { "dependencies": {
"rxjs": "^7.5.5" "rxjs": "^7.5.5"
} }
@@ -10904,9 +10904,9 @@
} }
}, },
"@victorradael/protospack": { "@victorradael/protospack": {
"version": "1.5.5", "version": "1.5.9",
"resolved": "https://registry.npmjs.org/@victorradael/protospack/-/protospack-1.5.5.tgz", "resolved": "https://registry.npmjs.org/@victorradael/protospack/-/protospack-1.5.9.tgz",
"integrity": "sha512-5yGW/EuZDY9N56CVMXJW1IrBkkv6KpalBepu0LLQvM5Y+Pr8lwY2i1p/1rlsjHo6Gk1RODKuWSXAL870jQEAdg==", "integrity": "sha512-h96qwtRftVkZ0ftsahymnxO/bwCL8/bHvllyjTuhcLLmBj0fKG6q/nz5S9cFpq8OAEljehO+luNj388mZCF7Yg==",
"requires": { "requires": {
"rxjs": "^7.5.5" "rxjs": "^7.5.5"
} }
+1 -1
View File
@@ -30,7 +30,7 @@
"@nestjs/microservices": "^8.4.3", "@nestjs/microservices": "^8.4.3",
"@nestjs/platform-express": "^8.4.3", "@nestjs/platform-express": "^8.4.3",
"@nestjs/swagger": "^5.2.1", "@nestjs/swagger": "^5.2.1",
"@victorradael/protospack": "^1.5.5", "@victorradael/protospack": "^1.5.9",
"axios": "^0.25.0", "axios": "^0.25.0",
"dotenv": "^14.2.0", "dotenv": "^14.2.0",
"helmet": "^5.0.2", "helmet": "^5.0.2",
+27 -13
View File
@@ -182,22 +182,31 @@ export class PipelinesClientService implements OnModuleInit {
return logsPipelineResponse; return logsPipelineResponse;
} }
async getPipelineStatus(data: IIdRequest) { async getPipelineStatus(data) {
console.log('PipelinesClientService', 'GetPipelineStatus'); console.log('PipelinesClientService', 'GetPipelineStatus');
const statusPipelineResponse = await new Promise((resolve, reject) => { const statusPipelineResponse = await new Promise((resolve, reject) => {
this.pipelineService.getPipelineStatus(data).subscribe({ this.pipelineService
next(x) { .getPipelineStatus(objectSnakeToCamel(data))
resolve(x); .subscribe({
}, next(x) {
error(err) { const statusArray = x.status.sort((a, b) => {
console.log('Observable Error'); if (Date.parse(a.updated_at) < Date.parse(b.updated_at)) {
reject(err); return 1;
}, } else {
complete() { return -1;
console.log('done'); }
}, });
}); resolve(statusArray);
},
error(err) {
console.log('Observable Error');
reject(err);
},
complete() {
console.log('done');
},
});
}) })
.then((res) => res) .then((res) => res)
.catch((err) => { .catch((err) => {
@@ -214,6 +223,11 @@ export class PipelinesClientService implements OnModuleInit {
.triggerPipeline(objectSnakeToCamel({ id, info })) .triggerPipeline(objectSnakeToCamel({ id, info }))
.subscribe({ .subscribe({
next(x) { next(x) {
if (x.status == false) {
reject(
'This pipeline is not ready yet to execute, Try again later!',
);
}
resolve(x); resolve(x);
}, },
error(err) { error(err) {
+56 -23
View File
@@ -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'; import { CatalogService } from './catalog.service';
@Controller('catalog') @Controller('catalog')
@@ -33,7 +41,7 @@ export class CatalogController {
const { id } = params; const { id } = params;
const catalogService = new CatalogService(); const catalogService = new CatalogService();
const res = await catalogService.dataAppsOne(body, id); const res = await catalogService.dataAppsOne(id, body);
return res; return res;
} }
@@ -56,64 +64,67 @@ export class CatalogController {
const catalogService = new CatalogService(); const catalogService = new CatalogService();
const res = await catalogService.getOneDashboardMetabase(body, id); const res = await catalogService.getOneDashboardMetabase(id, body);
return res; return res;
} }
@Get('table-metadata') @Get('table-metadata')
async getAllTableMetadata(@Body() body) { async getAllTableMetadata(@Body() body, @Query() query) {
console.log(`/catalog`, 'ON GET ALL TABLES METADATA ROUTE'); console.log(`/catalog`, 'ON GET ALL TABLES METADATA ROUTE');
const catalogService = new CatalogService(); const catalogService = new CatalogService();
if (!query) {
const res = await catalogService.getAllTableMetadata(body); const res = await catalogService.getAllTableMetadata(body);
return res;
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) { async deleteOneTableMetadata(@Param() params, @Body() body) {
const { id } = params; const { id } = params;
console.log(`/catalog`, 'ON DELETE ONE TABLE METADATA ROUTE'); console.log(`/catalog`, 'ON DELETE ONE TABLE METADATA ROUTE');
const catalogService = new CatalogService(); const catalogService = new CatalogService();
const res = await catalogService.deleteOneTableMetadata(body, id); const res = await catalogService.deleteOneTableMetadata(id, body);
return res; return res;
} }
@Get('column-metadata') @Get('column-metadata')
async getOneColumnMetadata(@Body() body) { async getOneColumnMetadata(@Body() body, @Query() params) {
console.log(`/catalog`, 'ON GET ONE COLUMN METADATA ROUTE'); console.log(`/catalog`, 'ON GET ONE COLUMN METADATA ROUTE');
const catalogService = new CatalogService(); const catalogService = new CatalogService();
const res = await catalogService.getOneColumnMetadata(body); const res = await catalogService.getOneColumnMetadata(body, params);
return res; return res;
} }
@Delete('column-metadata') @Delete('column-metadata/:id')
async deleteOneColumnMetadata(@Param() params, @Body() body) { async deleteOneColumnMetadata(@Param() params, @Body() body) {
console.log(`/catalog`, 'ON DELETE ONE COLUMN METADATA ROUTE'); console.log(`/catalog`, 'ON DELETE ONE COLUMN METADATA ROUTE');
const { id } = params; const { id } = params;
const catalogService = new CatalogService(); const catalogService = new CatalogService();
const res = await catalogService.deleteOneColumnMetadata(body, id); const res = await catalogService.deleteOneColumnMetadata(id, body);
return res; return res;
} }
@Get('data-preview') @Get('data-preview')
async getOneDataPreview(@Body() body) { async getOneDataPreview(@Body() body, @Query() params) {
console.log(`/catalog`, 'ON GET ONE DATAPREVIEW ROUTE'); console.log(`/catalog`, 'ON GET ONE DATAPREVIEW ROUTE');
const catalogService = new CatalogService(); const catalogService = new CatalogService();
const res = await catalogService.getOneDataPreview(body); const res = await catalogService.getOneDataPreview(body, params);
return res; return res;
} }
@@ -162,6 +173,17 @@ export class CatalogController {
return res; 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') @Get('summary-rating/:id')
async getSummaryRating(@Param() params, @Body() body) { async getSummaryRating(@Param() params, @Body() body) {
console.log(`/catalog`, 'ON GET SUMMARY RATING ROUTE'); console.log(`/catalog`, 'ON GET SUMMARY RATING ROUTE');
@@ -185,13 +207,24 @@ export class CatalogController {
return res; 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') @Get('data-review')
async getDataReview(@Body() body) { async getDataReview(@Body() body, @Query() params) {
console.log(`/catalog`, 'ON GET DATA REVIEW ROUTE'); console.log(`/catalog`, 'ON GET DATA REVIEW ROUTE');
const catalogService = new CatalogService(); const catalogService = new CatalogService();
const res = await catalogService.getDataReview(body); const res = await catalogService.getDataReview(body, params);
return res; return res;
} }
@@ -225,7 +258,7 @@ export class CatalogController {
const catalogService = new CatalogService(); const catalogService = new CatalogService();
const res = await catalogService.deleteTags(body, id); const res = await catalogService.deleteTags(id, body);
return res; return res;
} }
@@ -252,14 +285,14 @@ export class CatalogController {
return res; return res;
} }
@Delete('table-tags') @Delete('table-tags/:id')
async deleteTableTags(@Param() params, @Body() body) { async deleteTableTags(@Param() params, @Body() body) {
console.log(`/catalog`, 'ON CREATE TABLE TAGS ROUTE'); console.log(`/catalog`, 'ON CREATE TABLE TAGS ROUTE');
const { id } = params; const { id } = params;
const catalogService = new CatalogService(); const catalogService = new CatalogService();
const res = await catalogService.deleteTableTags(body, id); const res = await catalogService.deleteTableTags(id, body);
return res; return res;
} }
@@ -275,14 +308,14 @@ export class CatalogController {
return res; return res;
} }
@Delete('table-rules') @Delete('table-rules/:id')
async deleteTableRules(@Param() params, @Body() body) { async deleteTableRules(@Param() params, @Body() body) {
console.log(`/catalog`, 'ON DELETE TABLE RULES ROUTE'); console.log(`/catalog`, 'ON DELETE TABLE RULES ROUTE');
const { id } = params; const { id } = params;
const catalogService = new CatalogService(); const catalogService = new CatalogService();
const res = await catalogService.deleteTableRules(body, id); const res = await catalogService.deleteTableRules(id, body);
return res; return res;
} }
+51 -4
View File
@@ -51,7 +51,7 @@ class CatalogService {
return data; return data;
} }
async getOneDashboardMetabase(body, id) { async getOneDashboardMetabase(id, body) {
const customer = const customer =
body.info.customer.toLowerCase() === 'dadosfera' body.info.customer.toLowerCase() === 'dadosfera'
? `` ? ``
@@ -60,6 +60,11 @@ class CatalogService {
const { data } = await axios.get( const { data } = await axios.get(
`${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera/api/catalog/dashboard-metabase/${id}`, `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera/api/catalog/dashboard-metabase/${id}`,
); );
const [, path] = data.iframe_url.split('.dadosfera');
const host = `https://metabase-${body.info.customer.toLowerCase()}.dadosfera.ai`;
data.iframe_url = host + path;
return data; return data;
} }
@@ -75,6 +80,19 @@ class CatalogService {
return data; 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) { async deleteOneTableMetadata(id, body) {
const customer = const customer =
body.info.customer.toLowerCase() === 'dadosfera' body.info.customer.toLowerCase() === 'dadosfera'
@@ -87,7 +105,7 @@ class CatalogService {
return data; return data;
} }
async getOneColumnMetadata(body) { async getOneColumnMetadata(body, params) {
const customer = const customer =
body.info.customer.toLowerCase() === 'dadosfera' body.info.customer.toLowerCase() === 'dadosfera'
? `` ? ``
@@ -95,6 +113,7 @@ class CatalogService {
const { data } = await axios.get( const { data } = await axios.get(
`${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera/api/catalog/column-metadata/`, `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera/api/catalog/column-metadata/`,
{ params: params },
); );
return data; return data;
} }
@@ -111,7 +130,7 @@ class CatalogService {
return data; return data;
} }
async getOneDataPreview(body) { async getOneDataPreview(body, params) {
const customer = const customer =
body.info.customer.toLowerCase() === 'dadosfera' body.info.customer.toLowerCase() === 'dadosfera'
? `` ? ``
@@ -119,6 +138,7 @@ class CatalogService {
const { data } = await axios.get( const { data } = await axios.get(
`${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera/api/catalog/data-preview/`, `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera/api/catalog/data-preview/`,
{ params: params },
); );
return data; return data;
} }
@@ -171,6 +191,19 @@ class CatalogService {
return data; 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) { async getSummaryRating(id, body) {
const customer = const customer =
body.info.customer.toLowerCase() === 'dadosfera' body.info.customer.toLowerCase() === 'dadosfera'
@@ -194,7 +227,20 @@ class CatalogService {
return data; return data;
} }
async getDataReview(body) { 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, params) {
const customer = const customer =
body.info.customer.toLowerCase() === 'dadosfera' body.info.customer.toLowerCase() === 'dadosfera'
? `` ? ``
@@ -202,6 +248,7 @@ class CatalogService {
const { data } = await axios.get( const { data } = await axios.get(
`${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera/api/catalog/data-review/`, `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera/api/catalog/data-review/`,
{ params: params },
); );
return data; return data;
} }