FIX: fixed some merge conflicts

This commit is contained in:
rodrigo.zamboni
2022-09-05 11:30:16 -03:00
19 changed files with 619 additions and 117 deletions
+7 -7
View File
@@ -12,7 +12,7 @@
"dependencies": {
"@aws-sdk/client-secrets-manager": "^3.112.0",
"@dadosfera/dadosfera-logs": "^1.0.0-beta.3",
"@dadosfera/protospack-v2": "^3.13.0",
"@dadosfera/protospack-v2": "^3.14.10",
"@grpc/grpc-js": "^1.6.7",
"@grpc/proto-loader": "^0.6.13",
"@nestjs/common": "^8.4.7",
@@ -1726,9 +1726,9 @@
}
},
"node_modules/@dadosfera/protospack-v2": {
"version": "3.13.0",
"resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/@dadosfera/protospack-v2/-/protospack-v2-3.13.0.tgz",
"integrity": "sha512-MVTBvt+7rXpZ9uRPB6SF8z2wubMIYmB66krCIe3xqrdnLvtAkLc9mrJ20qMmQ6hkx5k+iMux/IJTL0IihLuEjA==",
"version": "3.14.10",
"resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/@dadosfera/protospack-v2/-/protospack-v2-3.14.10.tgz",
"integrity": "sha512-RP3f4Phq8dIcNjBs6d3VJmmr6H2NfP1vX0LcjGfIUCwczG177HGwZeQLWzKUWF3aIyh3gzb/nNmNmI2j/qWwFA==",
"dependencies": {
"@grpc/grpc-js": "^1.6.7",
"rxjs": "^7.5.5",
@@ -12297,9 +12297,9 @@
}
},
"@dadosfera/protospack-v2": {
"version": "3.13.0",
"resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/@dadosfera/protospack-v2/-/protospack-v2-3.13.0.tgz",
"integrity": "sha512-MVTBvt+7rXpZ9uRPB6SF8z2wubMIYmB66krCIe3xqrdnLvtAkLc9mrJ20qMmQ6hkx5k+iMux/IJTL0IihLuEjA==",
"version": "3.14.10",
"resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/@dadosfera/protospack-v2/-/protospack-v2-3.14.10.tgz",
"integrity": "sha512-RP3f4Phq8dIcNjBs6d3VJmmr6H2NfP1vX0LcjGfIUCwczG177HGwZeQLWzKUWF3aIyh3gzb/nNmNmI2j/qWwFA==",
"requires": {
"@grpc/grpc-js": "^1.6.7",
"rxjs": "^7.5.5",
+1 -1
View File
@@ -27,7 +27,7 @@
"dependencies": {
"@aws-sdk/client-secrets-manager": "^3.112.0",
"@dadosfera/dadosfera-logs": "^1.0.0-beta.3",
"@dadosfera/protospack-v2": "^3.13.0",
"@dadosfera/protospack-v2": "^3.14.10",
"@grpc/grpc-js": "^1.6.7",
"@grpc/proto-loader": "^0.6.13",
"@nestjs/common": "^8.4.7",
+2
View File
@@ -22,6 +22,7 @@ import { TransformationsModule } from './modules/transformations/transformations
import { HealthModule } from './modules/health/health.module';
import { CatalogModule } from './modules/catalog/catalog.module';
import { ConfigModule } from '@nestjs/config';
import { PipelinesV2Module } from './modules/pipelinesV2/pipelines.module';
@Module({
controllers: [],
@@ -51,6 +52,7 @@ import { ConfigModule } from '@nestjs/config';
RolesModule,
InputsModule,
OauthModule,
PipelinesV2Module,
],
})
export class AppModule {}
+61
View File
@@ -441,6 +441,67 @@ export const PERMISSIONS = {
},
},
},
NETWORK_CONFIG: {
title: {
'pt-br': 'VPN',
'en-us': 'VPN',
},
permissions: {
CREATE: {
seqid: 35,
claim: 'network_config:create',
usage: PermissionUsages.PUBLIC,
name: {
'pt-br': 'Cadastrar VPN',
'en-us': 'Create VPN',
},
},
DELETE: {
seqid: 36,
claim: 'network_config:delete',
usage: PermissionUsages.PUBLIC,
name: {
'pt-br': 'Excluir VPN',
'en-us': 'Remove VPN',
},
},
},
},
CONNECTION: {
title: {
'pt-br': 'Conexões',
'en-us': 'Connections',
},
permissions: {
CREATE: {
seqid: 37,
claim: 'connection:create',
usage: PermissionUsages.PUBLIC,
name: {
'pt-br': 'Cadastrar Conexão',
'en-us': 'Create Connection',
},
},
DELETE: {
seqid: 38,
claim: 'connection:delete',
usage: PermissionUsages.PUBLIC,
name: {
'pt-br': 'Excluir Conexão',
'en-us': 'Remove Connection',
},
},
UPDATE: {
seqid: 39,
claim: 'connection:update',
usage: PermissionUsages.INTERNAL,
name: {
'pt-br': 'Editar Conexão',
'en-us': 'Edit Connection',
},
},
},
},
};
// traverses the object searching for duplicate seqids or claims (executes at runtime)
-1
View File
@@ -20,6 +20,5 @@ export const User: (options?: { required?: boolean }) => ParameterDecorator =
if (!request.user && options?.required) {
throw new ErrorBuilder(ErrorCodes.AUTH.UNAUTHORIZED);
}
return request.user;
});
@@ -20,6 +20,7 @@ import {
DatabaseConnectionPropertiesDto,
} from '../connection/dtos/connection';
import { RequestUser } from 'src/authentication/user.decorator';
import { PackTheMetadata } from 'src/utils/ PackTheMetadata';
@Injectable()
export class ConnectionTestService {
@@ -46,17 +47,20 @@ export class ConnectionTestService {
connection_id,
} = body;
const { user_id, customer_id, customer_name } = user;
const info = { customer_name, customer_id, user_id };
const metadata = PackTheMetadata({
customer_name,
customer_id,
user_id,
});
if (connection_id) {
const con = await this.connectionsService.getConnectionDetails({
body,
info,
metadata,
});
const conPayload = JSON.parse(con.connection.properties);
const { plugin, network_config_id } = con.connection;
const { host, port, endpoint } = conPayload;
console.log(plugin);
return lastValueFrom(
this.connectionTestReadClient.ConnectionTestPing({
@@ -87,7 +91,13 @@ export class ConnectionTestService {
): Promise<ConnectionTestCredentialsRes> {
const { plugin, ...connectionBody } = body;
let { connection_id } = body;
const { customer_id, customer_name, user_id } = user;
const { customer_id, customer_name, user_id, username } = user;
const metadata = PackTheMetadata({
customer_id,
customer_name,
user_id,
username,
});
/********* CREATE CONNECTION *********/
if (!connection_id) {
@@ -117,7 +127,7 @@ export class ConnectionTestService {
if (!body.connection_id) {
await this.connectionsService.deleteConnection({
body: { id: connection_id },
info: { customer_id, customer_name, user_id },
metadata,
});
}
throw e;
@@ -125,7 +135,7 @@ export class ConnectionTestService {
if (!operation_result && !body.connection_id) {
await this.connectionsService.deleteConnection({
body: { id: connection_id },
info: { customer_id, customer_name, user_id },
metadata,
});
connection_id = null;
}
+10 -58
View File
@@ -1,4 +1,3 @@
import { Metadata } from '@grpc/grpc-js';
import {
OnModuleInit,
Inject,
@@ -39,13 +38,8 @@ export class ConnectionClientService implements OnModuleInit {
async createConnection(
body: CreateConnectionDto,
info: any,
metadata,
): Promise<ConnectionRes> {
const meta = new Metadata();
meta.add('customer_id', info.customer_id);
meta.add('customer_name', info.customer_name);
meta.add('user_id', info.user_id);
const {
connector_id,
description,
@@ -69,7 +63,7 @@ export class ConnectionClientService implements OnModuleInit {
properties: JSON.stringify(properties),
type,
},
meta,
metadata,
),
).catch((err) => {
throw new HttpException(
@@ -82,14 +76,8 @@ export class ConnectionClientService implements OnModuleInit {
async updateConnection(
id: string,
body: UpdateConnectionDto,
info,
metadata,
): Promise<ConnectionRes> {
const meta = new Metadata();
meta.add('customer_id', info.customer_id);
meta.add('customer_name', info.customer_name);
meta.add('user_id', info.user_id);
meta.add('language', info.language);
const { description, name, network_config_id, properties } = body;
return lastValueFrom(
@@ -101,7 +89,7 @@ export class ConnectionClientService implements OnModuleInit {
network_config_id,
properties: JSON.stringify(properties),
},
meta,
metadata,
),
).catch((err) => {
throw new HttpException(
@@ -111,12 +99,7 @@ export class ConnectionClientService implements OnModuleInit {
});
}
async deleteConnection({ body, info }): Promise<ConnectionRes> {
const meta = new Metadata();
meta.add('customer_id', info.customer_id);
meta.add('customer_name', info.customer_name);
meta.add('user_id', info.user_id);
async deleteConnection({ body, metadata }): Promise<ConnectionRes> {
const { id } = body;
return lastValueFrom(
@@ -124,7 +107,7 @@ export class ConnectionClientService implements OnModuleInit {
{
id,
},
meta,
metadata,
),
).catch((err) => {
throw new HttpException(
@@ -134,19 +117,13 @@ export class ConnectionClientService implements OnModuleInit {
});
}
async getAllConnection({ body, info }): Promise<ConnectionsRes> {
const meta = new Metadata();
meta.add('customer_id', info.customer_id);
meta.add('customer_name', info.customer_name);
meta.add('user_id', info.user_id);
meta.add('language', info.language);
async getAllConnection({ body, metadata }): Promise<ConnectionsRes> {
const { search, filters, size, page } = body;
return lastValueFrom(
this.connectionServiceRead.GetAllConnection(
{ search, filters: JSON.stringify(filters), size, page },
meta,
metadata,
),
).catch((err) => {
throw new HttpException(
@@ -156,39 +133,14 @@ export class ConnectionClientService implements OnModuleInit {
});
}
async getConnection({ body, info }): Promise<ConnectionRes> {
const meta = new Metadata();
meta.add('customer_id', info.customer_id);
meta.add('customer_name', info.customer_name);
meta.add('user_id', info.user_id);
meta.add('language', info.language);
const { id } = body;
return lastValueFrom(
this.connectionServiceRead.GetConnection({ id }, meta),
).catch((err) => {
throw new HttpException(
err.details,
err.code === 6 ? HttpStatus.CONFLICT : 400,
);
});
}
async getConnectionDetails({
body,
info,
metadata,
}): Promise<GetConnectionDetailsResponse> {
const meta = new Metadata();
meta.add('customer_id', info.customer_id);
meta.add('customer_name', info.customer_name);
meta.add('user_id', info.user_id);
meta.add('details', info.details);
const id = body.connection_id || body.id;
return lastValueFrom(
this.connectionServiceRead.GetConnectionDetails({ id }, meta),
this.connectionServiceRead.GetConnectionDetails({ id }, metadata),
).catch((err) => {
throw new HttpException(
err.details,
+50 -18
View File
@@ -18,7 +18,7 @@ import {
RequireAllPermissions,
} from 'src/authentication/authentication.decorator';
import { PERMISSIONS } from 'src/authentication/permissions.enum';
import { User } from 'src/authentication/user.decorator';
import { RequestUser, User } from 'src/authentication/user.decorator';
import { ValidationPipe } from '../../pipes/object-validation.pipe';
import {
ConnectionDetailsRes,
@@ -27,6 +27,7 @@ import {
UpdateConnectionDto,
} from './dtos/connection';
import { CreateConnectionDto } from './dtos/connection';
import { PackTheMetadata } from 'src/utils/ PackTheMetadata';
@ApiTags('connections')
@ApiBearerAuth()
@@ -45,57 +46,74 @@ export class ConnectionController {
@Post()
// @RequireAllPermissions(Permissions.CONNECTIONS.CREATE)
async createConnection(
@User() user,
@User() user: RequestUser,
@Body(new ValidationPipe()) body: CreateConnectionDto,
): Promise<ConnectionRes> {
this.logger.info('/connections - Create Connection');
const { user_id, customer_id, customer_name } = user;
const response: any = await this.clientService.createConnection(body, {
const { user_id, customer_id, customer_name, username } = user;
const metadata = PackTheMetadata({
user_id,
customer_id,
customer_name,
username,
});
const response: any = await this.clientService.createConnection(
body,
metadata,
);
return response;
}
@Put('/:id')
// @RequireAllPermissions(Permissions.CONNECTIONS.CREATE)
async updateConnection(
@User() user,
@User() user: RequestUser,
@Headers('Dadosfera-Lang') language: string,
@Param('id') id: string,
@Body(new ValidationPipe()) body: UpdateConnectionDto,
): Promise<ConnectionRes> {
this.logger.info('/connections - Update Connection');
const { user_id, customer_id, customer_name } = user;
const response: any = await this.clientService.updateConnection(id, body, {
const { user_id, customer_id, customer_name, username } = user;
const metadata = PackTheMetadata({
user_id,
customer_id,
customer_name,
language,
username,
});
const response: any = await this.clientService.updateConnection(
id,
body,
metadata,
);
return response;
}
@Delete('/:id')
// @RequireAllPermissions(Permissions.CONNECTIONS.CREATE)
async deleteConnection(
@User() user,
@User() user: RequestUser,
@Param('id') id: string,
): Promise<ConnectionRes> {
this.logger.info('/connections - Delete Connection');
const { user_id, customer_id, customer_name } = user;
const { user_id, customer_id, customer_name, username } = user;
const metadata = PackTheMetadata({
user_id,
customer_id,
customer_name,
username,
});
const response: any = await this.clientService.deleteConnection({
body: { id },
info: { user_id, customer_id, customer_name },
metadata,
});
return response;
@@ -104,18 +122,25 @@ export class ConnectionController {
@Get()
// @RequireAllPermissions(Permissions.CONNECTIONS.CREATE)
async getAllConnection(
@User() user,
@User() user: RequestUser,
@Headers('Dadosfera-Lang') language,
@Query() queries,
): Promise<ConnectionsRes> {
this.logger.info('/connections - Get All Connection');
const { user_id, customer_id, customer_name } = user;
const { user_id, customer_id, customer_name, username } = user;
const { search, size, page, ...filters } = queries;
const metadata = PackTheMetadata({
user_id,
customer_id,
customer_name,
language,
username,
});
const response = await this.clientService.getAllConnection({
body: { search, size, page, filters },
info: { user_id, customer_id, customer_name, language },
metadata,
});
return response;
@@ -124,17 +149,24 @@ export class ConnectionController {
@Get('/:id')
// @RequireAllPermissions(Permissions.CONNECTIONS.CREATE)
async getConnectionDetails(
@User() user,
@User() user: RequestUser,
@Param('id') id,
@Query('details') details,
): Promise<ConnectionDetailsRes> {
this.logger.info('/connections - Get Connection Details');
const { user_id, customer_id, customer_name } = user;
const { user_id, customer_id, customer_name, username } = user;
const metadata = PackTheMetadata({
user_id,
customer_id,
customer_name,
username,
details,
});
const response: any = await this.clientService.getConnectionDetails({
body: { id },
info: { user_id, customer_id, customer_name, details },
metadata,
});
if (details === 'true') {
+3 -3
View File
@@ -62,10 +62,10 @@ export class PipelinesClientService implements OnModuleInit {
return createPipelineResponse;
}
async findAll(data: IIdRequest) {
async findAll(data) {
this.logger.info('PipelinesClientService - FindAll');
const findAllPipelineResponse = await new Promise((resolve, reject) => {
this.pipelineService.FindAll(objectSnakeToCamel(data)).subscribe({
this.pipelineService.FindAll(data).subscribe({
next(x) {
resolve(x.pipelines);
},
@@ -93,7 +93,7 @@ export class PipelinesClientService implements OnModuleInit {
this.logger.info('PipelinesClientService - FindOne');
const findOnePipelineResponse = await new Promise((resolve, reject) => {
this.pipelineService.FindOne(objectSnakeToCamel(data)).subscribe({
this.pipelineService.FindOne(data).subscribe({
next(x) {
resolve(x);
},
@@ -19,6 +19,7 @@ export class PipelinesClientConfiguration {
: credentials.createSsl(),
protoPath: PipelineProtoFilePath,
loader: {
keepCase: true,
enums: String,
objects: true,
arrays: true,
+26 -21
View File
@@ -9,11 +9,11 @@ import {
Put,
} from '@nestjs/common';
import { ApiTags } from '@nestjs/swagger';
import { PipelinesClientService } from './client.service';
import { AuthenticateCondition } from 'src/authentication/authentication.decorator';
import { PERMISSIONS } from '../../authentication/permissions.enum';
import { PipelinesService } from './pipelines.service';
import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
import { RequestUser, User } from 'src/authentication/user.decorator';
@ApiTags('Pipelines')
@Controller('pipelines')
@@ -42,7 +42,7 @@ export class PipelinesController {
constructor(
@Inject(DadosferaLogger)
dadosferaLogger: DadosferaLogger,
private pipelinesClientService: PipelinesClientService,
private pipelineService: PipelinesService,
) {
this.logger = dadosferaLogger.logger;
}
@@ -60,8 +60,7 @@ export class PipelinesController {
},
);
const pipelineService = new PipelinesService(this.pipelinesClientService);
const response = await pipelineService.runPipeline({ id, info });
const response = await this.pipelineService.runPipeline({ id, info });
return response;
}
@@ -79,8 +78,7 @@ export class PipelinesController {
},
);
const pipelineService = new PipelinesService(this.pipelinesClientService);
const response = await pipelineService.getPipelineStatus(body);
const response = await this.pipelineService.getPipelineStatus(body);
return response;
}
@@ -93,8 +91,10 @@ export class PipelinesController {
{},
);
const pipelineService = new PipelinesService(this.pipelinesClientService);
const response = await pipelineService.getPipelineLogsMessages(id, details);
const response = await this.pipelineService.getPipelineLogsMessages(
id,
details,
);
return response;
}
@@ -103,21 +103,25 @@ export class PipelinesController {
async create(@Body() createPipelineDto) {
this.logger.info(process.env.DEV_URL + `/pipelines ON CREATE ROUTE`);
const pipelineService = new PipelinesService(this.pipelinesClientService);
const response = await pipelineService.create(createPipelineDto);
const response = await this.pipelineService.create(createPipelineDto);
return response;
}
@Get()
async findAll(@Body() data) {
async findAll(@User() user: RequestUser) {
this.logger.info(process.env.DEV_URL + `/pipeline ON Find All ROUTE`, {
user: data.info.user_id,
customer: data.info.customer,
user: user.user_id,
customer: user.customer_id,
});
const pipelineService = new PipelinesService(this.pipelinesClientService);
const response = await pipelineService.findAll(data);
const { customer_id, user_id, customer_name } = user;
const response = await this.pipelineService.findAll({
customer_name,
customer_id,
user_id,
});
return response;
}
@@ -127,8 +131,7 @@ export class PipelinesController {
const { id } = params;
this.logger.info(process.env.DEV_URL + `/pipeline/${id} ON Find One ROUTE`);
const pipelineService = new PipelinesService(this.pipelinesClientService);
const response = await pipelineService.findOne({ id, ...data });
const response = await this.pipelineService.findOne({ id, ...data });
return response;
}
@@ -141,8 +144,11 @@ export class PipelinesController {
this.logger.info(process.env.DEV_URL + `/pipeline/${id} ON UPDATE ROUTE`);
const pipelineService = new PipelinesService(this.pipelinesClientService);
const response = await pipelineService.update(id, updatePipelineDto, info);
const response = await this.pipelineService.update(
id,
updatePipelineDto,
info,
);
return response;
}
@@ -152,8 +158,7 @@ export class PipelinesController {
const { id } = params;
this.logger.info(process.env.DEV_URL + `/pipeline/${id} ON DELETE ROUTE`);
const pipelineService = new PipelinesService(this.pipelinesClientService);
const response = await pipelineService.remove({ id, ...data });
const response = await this.pipelineService.remove({ id, ...data });
return response;
}
+3 -1
View File
@@ -43,7 +43,9 @@ export class PipelinesService {
async findAll(data) {
try {
const findAllPipelineResponse = await this.pipelineClient.findAll(data);
const findAllPipelineResponse = await this.pipelineClient.findAll({
info: data,
});
const pipelines = objectCamelToSnake(findAllPipelineResponse);
pipelines.forEach((pipeline) => {
+36
View File
@@ -0,0 +1,36 @@
import { Info } from 'protospack/dist/lib/interfaces';
export interface ICreatePipelineDto {
input: IdRequest;
transformations: IdRequest[];
output: IdRequest;
tags: string[];
name: string;
description: string;
info: Info;
}
export interface IdRequest {
id: string;
}
export interface IIdRequest {
id: string;
info: Info;
}
export interface IUpdatePipelineRequest {
input: IdRequest;
transformations: IdRequest[];
output: IdRequest;
tags: string[];
name: string;
description: string;
id: string;
info: Info;
}
export interface IGetPipelineLogsRequest {
id: string;
details: string;
}
@@ -0,0 +1,36 @@
import {
ClientsProviderAsyncOptions,
GrpcOptions,
Transport,
} from '@nestjs/microservices';
import {
ProtoPackages,
ProtoPaths,
} from '@dadosfera/protospack-v2/dist/lib/PipelineV2';
import { credentials } from '@grpc/grpc-js';
export class PipelinesClientConfiguration {
public name = 'PipelinesClientConfiguration';
private config: GrpcOptions = {
transport: Transport.GRPC,
options: {
url: process.env.PIFACTORY_URL,
package: [ProtoPackages.ReadPackage, ProtoPackages.WritePackage],
credentials:
process.env.LOCAL_ENV || process.env.ENV === 'local'
? undefined
: credentials.createSsl(),
protoPath: [ProtoPaths.ReadFilePath, ProtoPaths.WriteFilePath],
loader: {
keepCase: true,
enums: String,
objects: true,
arrays: true,
},
},
};
providerOptions: ClientsProviderAsyncOptions = {
name: this.name,
...this.config,
};
}
@@ -0,0 +1,177 @@
import {
Body,
Controller,
Delete,
Get,
Inject,
Param,
Post,
Put,
Headers,
} from '@nestjs/common';
import { ApiTags } from '@nestjs/swagger';
import { AuthenticateCondition } from 'src/authentication/authentication.decorator';
import { PERMISSIONS } from '../../authentication/permissions.enum';
import { PipelinesService } from './pipelines.service';
import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
import { Messages } from '@dadosfera/protospack-v2/dist/lib/PipelineV2';
import { RequestUser, User } from 'src/authentication/user.decorator';
import { PackTheMetadata } from 'src/utils/ PackTheMetadata';
import { PipelinesService as OldPipelineService } from 'src/modules/pipelines/pipelines.service';
@ApiTags('Pipelines')
@Controller('pipelinesV2')
@AuthenticateCondition((req, user) => {
let action;
switch (req.method) {
case 'POST':
action = 'CREATE';
break;
case 'PUT':
action = 'UPDATE';
break;
default:
action = req.method;
}
return user.permissions.includes(
PERMISSIONS.PIPELINE.permissions[action].seqid,
);
})
export class PipelinesController {
logger: DadosferaLogger;
constructor(
@Inject(DadosferaLogger)
dadosferaLogger: DadosferaLogger,
private pipelinesClientService: PipelinesService,
private oldPipelinesService: OldPipelineService,
) {
this.logger = dadosferaLogger.logger;
}
@Post()
async create(
@Headers('Dadosfera-Lang') language,
@User() user: RequestUser,
@Body() createPipelineDto: Messages.PipelineV2CreateRequest,
) {
this.logger.info(process.env.DEV_URL + `/pipelines ON CREATE ROUTE`);
const { customer_id, customer_name, username, user_id } = user;
const metadata = PackTheMetadata({
customer_id,
customer_name,
username,
user_id,
language,
});
const response = await this.pipelinesClientService.create(
createPipelineDto,
metadata,
);
return response;
}
@Get()
async findAll(
@User() user: RequestUser,
@Headers('Dadosfera-Lang') language,
@Body() data,
) {
this.logger.info(process.env.DEV_URL + `/pipeline ON Find All ROUTE`, {
user: data.info.user_id,
customer: data.info.customer,
});
const { customer_id, customer_name, user_id, username } = user;
const metadata = PackTheMetadata({
customer_id,
customer_name,
user_id,
username,
language,
});
const response = await this.pipelinesClientService.findAll(data, metadata);
const oldResponse = await this.oldPipelinesService.findAll({
customer_name,
user_id,
customer_id,
});
return {
pipelines: [...response.pipelines, ...oldResponse.pipelines],
};
}
@Get('/:id')
async findOne(
@Headers('Dadosfera-Lang') language,
@User() user: RequestUser,
@Param('id') id,
): Promise<Messages.PipelineV2FindOneResponse> {
this.logger.info(process.env.DEV_URL + `/pipeline/${id} ON Find One ROUTE`);
const { customer_id, customer_name, user_id, username } = user;
const metadata = PackTheMetadata({
customer_id,
customer_name,
user_id,
username,
language,
});
let result: any = [];
console.log(id.split('_').length > 1);
if (id.split('_').length > 1) {
result = await this.pipelinesClientService.findOne({ id }, metadata);
Object.assign(result.pipeline, {
transformations: JSON.parse(result.pipeline.transformations),
config: {
cron: result.pipeline.config.cron,
tables: JSON.parse(result.pipeline.config.tables),
},
});
} else {
result = await this.oldPipelinesService.findOne({
id,
info: { customer_id, customer: customer_name, user_id },
});
}
return result;
}
@Put('/:id')
async update(@Body() updatePipelineDto, @Param('id') id) {
const { info } = updatePipelineDto;
delete updatePipelineDto.info;
this.logger.info(process.env.DEV_URL + `/pipeline/${id} ON UPDATE ROUTE`);
const response = await this.pipelinesClientService.update({
...updatePipelineDto,
info,
id,
});
return response;
}
@Delete(':id')
async delete(@Body() data, @Param() params) {
const { id } = params;
this.logger.info(process.env.DEV_URL + `/pipeline/${id} ON DELETE ROUTE`);
const response = await this.pipelinesClientService.remove({ id, ...data });
return response;
}
}
@@ -0,0 +1,23 @@
import { Module } from '@nestjs/common';
import { ClientsModule } from '@nestjs/microservices';
import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
import { PipelinesController } from './pipelines.controller';
import { PipelinesService } from './pipelines.service';
import { PipelinesClientConfiguration } from './pipelines-client';
import { PipelinesModule as OldPipelineModule } from 'src/modules/pipelines/pipelines.module';
const client = new PipelinesClientConfiguration();
@Module({
imports: [
ClientsModule.register([client.providerOptions]),
OldPipelineModule,
],
controllers: [PipelinesController],
providers: [PipelinesService, DadosferaLogger],
exports: [PipelinesService],
})
export class PipelinesV2Module {}
@@ -0,0 +1,144 @@
import {
BadRequestException,
Inject,
InternalServerErrorException,
OnModuleInit,
} from '@nestjs/common';
import { ClientGrpc, Payload } from '@nestjs/microservices';
import {
Messages,
WriteService,
ReadService,
ProtoServices,
} from '@dadosfera/protospack-v2/dist/lib/PipelineV2';
import { lastValueFrom } from 'rxjs';
import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
import { PipelinesClientConfiguration } from './pipelines-client';
export class PipelinesService implements OnModuleInit {
logger: DadosferaLogger;
pipelineWriteService: WriteService.PipelineV2WriteService;
pipelineReadService: ReadService.PipelineV2ReadService;
constructor(
@Inject(DadosferaLogger)
dadosferaLogger: DadosferaLogger,
@Inject(PipelinesClientConfiguration.name)
private readonly grpcClient: ClientGrpc,
) {
this.logger = dadosferaLogger.logger;
}
onModuleInit() {
this.pipelineReadService =
this.grpcClient.getService<ReadService.PipelineV2ReadService>(
ProtoServices.PipelineV2ReadService,
);
this.pipelineWriteService =
this.grpcClient.getService<WriteService.PipelineV2WriteService>(
ProtoServices.PipelineV2WriteService,
);
}
async create(
@Payload() createPipelineDto: Messages.PipelineV2CreateRequest,
metadata,
): Promise<Messages.PipelineV2CreateResponse> {
this.logger.info('PipelinesClientService - Create');
const createPipelineResponse = await lastValueFrom(
this.pipelineWriteService.PipelineV2Create(createPipelineDto, metadata),
)
.then((res) => {
this.logger.info('Done');
return res;
})
.catch((error: { details: string }) => {
if (error.details.includes('INVALID_REQUEST')) {
// eslint-disable-next-line @typescript-eslint/no-unused-vars
const [errorType, message] = error.details.split('|');
throw new BadRequestException(message);
}
throw new InternalServerErrorException(error.details);
});
return createPipelineResponse;
}
async findAll(
data: Messages.PipelineV2FindAllRequest,
metadata,
): Promise<Messages.PipelineV2FindAllResponse> {
this.logger.info('PipelinesClientService - FindAll');
const findAllPipelineResponse = await lastValueFrom(
this.pipelineReadService.PipelineV2FindAll(data, metadata),
)
.then((res) => {
this.logger.info('Done');
return res;
})
.catch((err) => {
this.logger.error(err.message);
throw new Error(err);
});
return findAllPipelineResponse;
}
async findOne(
data: Messages.PipelineV2FindOneRequest,
metadata,
): Promise<Messages.PipelineV2FindOneResponse> {
this.logger.info('PipelinesClientService - FindOne');
const findOnePipelineResponse = await lastValueFrom(
this.pipelineReadService.PipelineV2FindOne(data, metadata),
)
.then((res) => {
this.logger.info('Done');
return res;
})
.catch((err) => {
this.logger.error(err.message);
throw new Error(err);
});
return findOnePipelineResponse;
}
async update(UpdatePipelineRequest: Messages.PipelineV2UpdateRequest) {
this.logger.info('PipelinesClientService - Update');
const updatePipelineResponse = await lastValueFrom(
this.pipelineWriteService.PipelineV2Update(UpdatePipelineRequest),
)
.then((res) => {
this.logger.info('Done');
return res;
})
.catch((err) => {
this.logger.error(err.message);
throw new Error(err);
});
return updatePipelineResponse;
}
async remove(data: Messages.PipelineV2RemoveRequest) {
this.logger.info('PipelinesClientService - Remove');
const removePipelineResponse = await lastValueFrom(
this.pipelineWriteService.PipelineV2Remove(data),
)
.then((res) => {
this.logger.info('Done');
return res;
})
.catch((err) => {
this.logger.error(err.message);
throw new Error(err);
});
return removePipelineResponse;
}
}
+22
View File
@@ -0,0 +1,22 @@
import { Metadata } from '@grpc/grpc-js';
interface Info {
customer_id?: string;
customer_name?: string;
username?: string;
user_id?: string;
language?: string;
details?: string;
}
export const PackTheMetadata = (info: Info): Metadata => {
const meta = new Metadata();
meta.add('customer_id', info.customer_id);
meta.add('customer_name', info.customer_name);
meta.add('user_id', info.user_id);
meta.add('username', info.username);
meta.add('details', info.details);
meta.add('language', info.language);
return meta;
};
+1 -1
View File
File diff suppressed because one or more lines are too long