FIX: Get All Pipelines

This commit is contained in:
Victor Radael
2022-09-04 19:36:42 -03:00
parent f5ec6661ff
commit 2248dbe5a3
10 changed files with 72 additions and 49 deletions
+4 -4
View File
@@ -16,10 +16,10 @@ export class ConnectionClientConfiguration {
ConnectionManager.ProtoPackages.WritePackage,
ConnectionManager.ProtoPackages.ReadPackage,
],
credentials:
process.env.LOCAL_ENV || process.env.ENV === 'local'
? undefined
: credentials.createSsl(),
// credentials:
// process.env.LOCAL_ENV || process.env.ENV === 'local'
// ? undefined
// : credentials.createSsl(),
protoPath: [
ConnectionManager.ProtoPaths.WriteFilePath,
ConnectionManager.ProtoPaths.ReadFilePath,
+4 -4
View File
@@ -16,10 +16,10 @@ export class ConnectorClientConfiguration {
ConnectorManager.ProtoPackages.WritePackage,
ConnectorManager.ProtoPackages.ReadPackage,
],
credentials:
process.env.LOCAL_ENV || process.env.ENV === 'local'
? undefined
: credentials.createSsl(),
// credentials:
// process.env.LOCAL_ENV || process.env.ENV === 'local'
// ? undefined
// : credentials.createSsl(),
protoPath: [
ConnectorManager.ProtoPaths.WriteFilePath,
ConnectorManager.ProtoPaths.ReadFilePath,
@@ -17,8 +17,8 @@ export class NetworkConfigGrpcClient {
NetworkConfig.ProtoPackages.ReadPackage,
NetworkConfig.ProtoPackages.WritePackage,
],
credentials:
process.env.ENV === 'local' ? undefined : credentials.createSsl(),
// credentials:
// process.env.ENV === 'local' ? undefined : credentials.createSsl(),
protoPath: [
NetworkConfig.ProtoPaths.ReadFilePath,
NetworkConfig.ProtoPaths.WriteFilePath,
+1 -1
View File
@@ -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);
},
+4 -4
View File
@@ -13,10 +13,10 @@ export class PipelinesClientConfiguration {
options: {
url: process.env.PIFACTORY_URL,
package: PipelinePackages,
credentials:
process.env.LOCAL_ENV || process.env.ENV === 'local'
? undefined
: credentials.createSsl(),
// credentials:
// process.env.LOCAL_ENV || process.env.ENV === 'local'
// ? undefined
// : credentials.createSsl(),
protoPath: PipelineProtoFilePath,
loader: {
keepCase: true,
+17 -19
View File
@@ -9,7 +9,6 @@ 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';
@@ -43,7 +42,7 @@ export class PipelinesController {
constructor(
@Inject(DadosferaLogger)
dadosferaLogger: DadosferaLogger,
private pipelinesClientService: PipelinesClientService,
private pipelineService: PipelinesService,
) {
this.logger = dadosferaLogger.logger;
}
@@ -61,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;
}
@@ -80,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;
}
@@ -94,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;
}
@@ -104,14 +103,13 @@ 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(@User() user: RequestUser, @Body() data) {
async findAll(@User() user: RequestUser) {
this.logger.info(process.env.DEV_URL + `/pipeline ON Find All ROUTE`, {
user: user.user_id,
customer: user.customer_id,
@@ -119,8 +117,7 @@ export class PipelinesController {
const { customer_id, user_id, customer_name } = user;
const pipelineService = new PipelinesService(this.pipelinesClientService);
const response = await pipelineService.findAll({
const response = await this.pipelineService.findAll({
customer_name,
customer_id,
user_id,
@@ -134,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;
}
@@ -148,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;
}
@@ -159,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;
}
+4 -4
View File
@@ -16,10 +16,10 @@ export class PipelinesClientConfiguration {
options: {
url: process.env.PIFACTORY_URL,
package: [ProtoPackages.ReadPackage, ProtoPackages.WritePackage],
credentials:
process.env.LOCAL_ENV || process.env.ENV === 'local'
? undefined
: credentials.createSsl(),
// credentials:
// process.env.LOCAL_ENV || process.env.ENV === 'local'
// ? undefined
// : credentials.createSsl(),
protoPath: [ProtoPaths.ReadFilePath, ProtoPaths.WriteFilePath],
loader: {
keepCase: true,
@@ -17,6 +17,8 @@ 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) => {
@@ -45,6 +47,7 @@ export class PipelinesController {
@Inject(DadosferaLogger)
dadosferaLogger: DadosferaLogger,
private pipelinesClientService: PipelinesService,
private oldPipelinesService: OldPipelineService,
) {
this.logger = dadosferaLogger.logger;
}
@@ -94,8 +97,15 @@ export class PipelinesController {
});
const response = await this.pipelinesClientService.findAll(data, metadata);
const oldResponse = await this.oldPipelinesService.findAll({
customer_name,
user_id,
customer_id,
});
return response;
return {
pipelines: [...response.pipelines, ...oldResponse.pipelines],
};
}
@Get('/:id')
@@ -116,16 +126,26 @@ export class PipelinesController {
language,
});
const result = await this.pipelinesClientService.findOne({ id }, metadata);
let result: any = [];
Object.assign(result.pipeline, {
transformations: JSON.parse(result.pipeline.transformations),
config: {
cron: result.pipeline.config.cron,
tables: JSON.parse(result.pipeline.config.tables),
},
});
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;
}
+6 -1
View File
@@ -7,10 +7,15 @@ 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])],
imports: [
ClientsModule.register([client.providerOptions]),
OldPipelineModule,
],
controllers: [PipelinesController],
providers: [PipelinesService, DadosferaLogger],
exports: [PipelinesService],