REFACTOR: Att Functions to work with info given by auth

This commit is contained in:
rodrigo.zamboni
2022-03-30 11:32:59 -03:00
parent 761a00c6a6
commit e513689f4a
6 changed files with 82 additions and 54 deletions
+9 -6
View File
@@ -1,7 +1,10 @@
import { OnModuleInit, Inject } from '@nestjs/common';
import { ClientGrpc } from '@nestjs/microservices';
import { InputService } from '@victorradael/protospack';
import { objectSnakeToCamel } from 'src/utils/CaseConverter';
import {
objectCamelToSnake,
objectSnakeToCamel,
} from 'src/utils/CaseConverter';
import {
ICreateInputRequest,
IIdRequest,
@@ -26,7 +29,7 @@ export class InputsClientService implements OnModuleInit {
const createInputResponse = await new Promise((resolve, reject) => {
this.inputService.Create(objectSnakeToCamel(createInputDto)).subscribe({
next(x) {
resolve(x);
resolve(objectCamelToSnake(x));
},
error(err) {
console.log('Observable Error');
@@ -51,7 +54,7 @@ export class InputsClientService implements OnModuleInit {
const findOneInputResponse = await new Promise((resolve, reject) => {
this.inputService.FindOne(objectSnakeToCamel(data)).subscribe({
next(x) {
resolve(x);
resolve(objectCamelToSnake(x));
},
error(err) {
console.log('Observable Error');
@@ -76,7 +79,7 @@ export class InputsClientService implements OnModuleInit {
const findAllInputResponse = await new Promise((resolve, reject) => {
this.inputService.FindAll(objectSnakeToCamel(data)).subscribe({
next(x) {
resolve(x);
resolve(objectCamelToSnake(x));
},
error(err) {
console.log('Observable Error');
@@ -100,7 +103,7 @@ export class InputsClientService implements OnModuleInit {
const updateInputResponse = await new Promise((resolve, reject) => {
this.inputService.Update(objectSnakeToCamel(updateInputDTO)).subscribe({
next(x) {
resolve(x);
resolve(objectCamelToSnake(x));
},
error(err) {
console.log('Observable Error');
@@ -125,7 +128,7 @@ export class InputsClientService implements OnModuleInit {
const removeInputResponse = await new Promise((resolve, reject) => {
this.inputService.Remove(objectSnakeToCamel(idRequest)).subscribe({
next(x) {
resolve(x);
resolve(objectCamelToSnake(x));
},
error(err) {
console.log('Observable Error');
+1 -1
View File
@@ -135,7 +135,7 @@ export class OutputsClientService implements OnModuleInit {
const removeOutputResponse = await new Promise((resolve, reject) => {
this.outputService.Remove(objectSnakeToCamel(data)).subscribe({
next(x) {
resolve(x);
resolve(objectCamelToSnake(x));
},
error(err) {
console.log('Observable Error');
+40 -31
View File
@@ -1,10 +1,15 @@
import { Inject, OnModuleInit } from '@nestjs/common';
import { ClientGrpc, Payload } from '@nestjs/microservices';
import { PipelinesServiceInterface } from '@victorradael/protospack';
import {
objectCamelToSnake,
objectSnakeToCamel,
} from 'src/utils/CaseConverter';
import {
ICreatePipelineDto,
IdRequest,
IGetPipelineLogsRequest,
IIdRequest,
IUpdatePipelineRequest,
} from './interfaces';
@@ -23,18 +28,20 @@ export class PipelinesClientService implements OnModuleInit {
console.log('PipelinesClientService', 'Create');
const createPipelineResponse = await new Promise((resolve, reject) => {
this.pipelineService.create(createPipelineDto).subscribe({
next(x) {
resolve(x);
},
error(err) {
console.log('Observable Error');
reject(err);
},
complete() {
console.log('done');
},
});
this.pipelineService
.create(objectSnakeToCamel(createPipelineDto))
.subscribe({
next(x) {
resolve(x);
},
error(err) {
console.log('Observable Error');
reject(err);
},
complete() {
console.log('done');
},
});
})
.then((res) => res)
.catch((err) => {
@@ -44,11 +51,11 @@ export class PipelinesClientService implements OnModuleInit {
return createPipelineResponse;
}
async findAll() {
async findAll(data: IIdRequest) {
console.log('PipelinesClientService', 'FindAll');
const findAllPipelineResponse = await new Promise((resolve, reject) => {
this.pipelineService.findAll({}).subscribe({
this.pipelineService.findAll(objectSnakeToCamel(data)).subscribe({
next(x) {
resolve(x);
},
@@ -69,11 +76,11 @@ export class PipelinesClientService implements OnModuleInit {
return findAllPipelineResponse;
}
async findOne({ id }: IdRequest) {
async findOne(data: IIdRequest) {
console.log('PipelinesClientService', 'FindOne');
const findOnePipelineResponse = await new Promise((resolve, reject) => {
this.pipelineService.findOne({ id }).subscribe({
this.pipelineService.findOne(objectSnakeToCamel(data)).subscribe({
next(x) {
resolve(x);
},
@@ -98,18 +105,20 @@ export class PipelinesClientService implements OnModuleInit {
console.log('PipelinesClientService', 'Update');
const updatePipelineResponse = await new Promise((resolve, reject) => {
this.pipelineService.update(UpdatePipelineRequest).subscribe({
next(x) {
resolve(x);
},
error(err) {
console.log('Observable Error');
reject(err);
},
complete() {
console.log('done');
},
});
this.pipelineService
.update(objectSnakeToCamel(UpdatePipelineRequest))
.subscribe({
next(x) {
resolve(x);
},
error(err) {
console.log('Observable Error');
reject(err);
},
complete() {
console.log('done');
},
});
})
.then((res) => res)
.catch((err) => {
@@ -119,13 +128,13 @@ export class PipelinesClientService implements OnModuleInit {
return updatePipelineResponse;
}
async remove({ id }: IdRequest) {
async remove(data: IIdRequest) {
console.log('PipelinesClientService', 'Remove');
const removePipelineResponse = await new Promise((resolve, reject) => {
this.pipelineService.remove({ id }).subscribe({
this.pipelineService.remove(objectSnakeToCamel(data)).subscribe({
next(x) {
resolve(x);
resolve(objectCamelToSnake(x));
},
error(err) {
console.log('Observable Error');
+12
View File
@@ -5,12 +5,23 @@ export interface ICreatePipelineDto {
tags: string[];
name: string;
description: string;
info: Info;
}
export interface Info {
customer_id: sting;
user_id: string;
}
export interface IdRequest {
id: string;
}
export interface IIdRequest {
id: string;
info: Info;
}
export interface IUpdatePipelineRequest {
input: IdRequest;
transformations: IdRequest[];
@@ -19,6 +30,7 @@ export interface IUpdatePipelineRequest {
name: string;
description: string;
id: string;
info: Info;
}
export interface IGetPipelineLogsRequest {
+11 -9
View File
@@ -7,7 +7,6 @@ import {
Post,
Put,
} from '@nestjs/common';
import { Payload } from '@nestjs/microservices';
import { PipelinesClientService } from 'src/clients/pipelines/client.service';
import { PipelinesService } from './pipelines.service';
@@ -54,44 +53,47 @@ export class PipelinesController {
}
@Get()
async findAll() {
async findAll(@Body() data) {
console.log(process.env.DEV_URL + `/pipeline`, 'ON Find All ROUTE');
const pipelineService = new PipelinesService(this.pipelinesClientService);
const response = await pipelineService.findAll();
const response = await pipelineService.findAll(data);
return response;
}
@Get('/:id')
async findOne(@Param() params) {
async findOne(@Body() data, @Param() params) {
const { id } = params;
console.log(process.env.DEV_URL + `/pipeline/${id}`, 'ON Find One ROUTE');
const pipelineService = new PipelinesService(this.pipelinesClientService);
const response = await pipelineService.findOne(id);
const response = await pipelineService.findOne({ id, ...data });
return response;
}
@Put(':id')
async update(@Payload() updatePipelineDto, @Param() params) {
async update(@Body() updatePipelineDto, @Param() params) {
const { id } = params;
const { info } = updatePipelineDto;
delete updatePipelineDto.info;
console.log(process.env.DEV_URL + `/pipeline/${id}`, 'ON UPDATE ROUTE');
const pipelineService = new PipelinesService(this.pipelinesClientService);
const response = await pipelineService.update(id, updatePipelineDto);
const response = await pipelineService.update(id, updatePipelineDto, info);
return response;
}
@Delete(':id')
async delete(@Param() params) {
async delete(@Body() data, @Param() params) {
const { id } = params;
console.log(process.env.DEV_URL + `/pipeline/${id}`, 'ON DELETE ROUTE');
const pipelineService = new PipelinesService(this.pipelinesClientService);
const response = await pipelineService.remove(id);
const response = await pipelineService.remove({ id, ...data });
return response;
}
+9 -7
View File
@@ -1,5 +1,6 @@
import { HttpException, HttpStatus, Injectable } from '@nestjs/common';
import { PipelinesClientService } from 'src/clients/pipelines/client.service';
import { IIdRequest, Info } from 'src/clients/pipelines/interfaces';
import { objectCamelToSnake } from 'src/utils/CaseConverter';
@Injectable()
@@ -19,18 +20,18 @@ export class PipelinesService {
}
}
async findOne(id: string) {
async findOne(data: IIdRequest) {
try {
const findOnePipelineResponse = await this.pipelineClient.findOne({ id });
const findOnePipelineResponse = await this.pipelineClient.findOne(data);
return objectCamelToSnake(findOnePipelineResponse);
} catch (err) {
throw new HttpException(err.message, HttpStatus.NOT_FOUND);
}
}
async findAll() {
async findAll(data) {
try {
const findAllPipelineResponse = await this.pipelineClient.findAll();
const findAllPipelineResponse = await this.pipelineClient.findAll(data);
return objectCamelToSnake(findAllPipelineResponse);
} catch (err) {
@@ -38,10 +39,11 @@ export class PipelinesService {
}
}
async update(id: string, data) {
async update(id: string, data, info: Info) {
try {
const updatePipelineResponse = await this.pipelineClient.update({
id,
info,
...data,
});
@@ -51,9 +53,9 @@ export class PipelinesService {
}
}
async remove(id: string) {
async remove(data: IIdRequest) {
try {
const removePipelineResponse = await this.pipelineClient.remove({ id });
const removePipelineResponse = await this.pipelineClient.remove(data);
return removePipelineResponse;
} catch (err) {