gitea_admin/maestro
1
0
Fork 0
mirror of https://github.com/dadosfera/maestro.git synced 2026-11-14 05:39:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Duc Client Refactor

Browse Source
This commit is contained in:
Victor Radael
2022-08-12 12:13:04 -03:00
parent afc187d01a
commit 7a1b5c7dbf
16 changed files with 56 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/auth/auth.module.ts
+2 -9
View File
@@ -6,17 +6,10 @@ import { AuthController } from './auth.controller';
import { AuthClientService } from './auth.service';
import { DucClient } from '../../clients/duc/client.config';
const ducClient = new DucClient();
const client = new DucClient();
@Module({
imports: [
ClientsModule.register([
{
name: 'DUC_PACKAGE',
...ducClient.config(),
},
]),
],
imports: [ClientsModule.register([client.providerOptions])],
controllers: [AuthController],
providers: [AuthClientService, DadosferaLogger],
exports: [AuthClientService],
src/modules/auth/auth.service.ts
+2 -1
View File
@@ -17,6 +17,7 @@ import {
AuthVerifyResetPasswordCodeRequest,
AuthConfirmResetPasswordRequest,
} from '@dadosfera/protospack-v2/dist/lib/Duc/interfaces/messages';
import { DucClient } from 'src/clients/duc/client.config';
@Injectable()
export class AuthClientService implements OnModuleInit {
@@ -26,7 +27,7 @@ export class AuthClientService implements OnModuleInit {
constructor(
@Inject(DadosferaLogger)
dadosferaLogger: DadosferaLogger,
@Inject('DUC_PACKAGE') private readonly grpcClient: ClientGrpc,
@Inject(DucClient.name) private readonly grpcClient: ClientGrpc,
) {
this.logger = dadosferaLogger.logger;
}
src/modules/permissions/permissions.controller.spec.ts
+2 -9
View File
@@ -5,7 +5,7 @@ import { PermissionsController } from './permissions.controller';
import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
import { PermissionsService } from './permissions.service';
const ducClient = new DucClient();
const client = new DucClient();
const logger = {
info: (...args) => args,
error: (...args) => args,
@@ -15,14 +15,7 @@ describe('PermissionsController', () => {
beforeEach(async () => {
const module: TestingModule = await Test.createTestingModule({
imports: [
ClientsModule.register([
{
name: 'DUC_PACKAGE',
...ducClient.config(),
},
]),
],
imports: [ClientsModule.register([client.providerOptions])],
controllers: [PermissionsController],
providers: [
{
src/modules/permissions/permissions.module.ts
+2 -9
View File
@@ -7,17 +7,10 @@ import { PermissionsService } from './permissions.service';
import { DucClient } from '../../clients/duc/client.config';
import { PermissionsController } from './permissions.controller';
const ducClient = new DucClient();
const client = new DucClient();
@Module({
imports: [
ClientsModule.register([
{
name: 'DUC_PACKAGE',
...ducClient.config(),
},
]),
],
imports: [ClientsModule.register([client.providerOptions])],
providers: [PermissionsService, DadosferaLogger],
controllers: [PermissionsController],
exports: [PermissionsService],
src/modules/permissions/permissions.service.ts
+2 -1
View File
@@ -20,6 +20,7 @@ import {
import ErrorBuilder from '../../utils/ErrorBuilder';
import { PermissionGroupPermission, PermissionGroup } from './dto/entities';
import { LanguageEnum } from 'src/utils/languages.enum';
import { DucClient } from 'src/clients/duc/client.config';
@Injectable()
export class PermissionsService
@@ -31,7 +32,7 @@ export class PermissionsService
constructor(
@Inject(DadosferaLogger)
dadosferaLogger: DadosferaLogger,
@Inject('DUC_PACKAGE') private readonly grpcClient: ClientGrpc,
@Inject(DucClient.name) private readonly grpcClient: ClientGrpc,
) {
this.logger = dadosferaLogger.logger;
}
src/modules/roles/roles.controller.spec.ts
+2 -7
View File
@@ -6,7 +6,7 @@ import { RolesService } from './roles.service';
import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
import { PermissionsModule } from '../permissions/permissions.module';
const ducClient = new DucClient();
const client = new DucClient();
const logger = {
info: (...args) => args,
@@ -18,12 +18,7 @@ describe('RolesController', () => {
beforeEach(async () => {
const module: TestingModule = await Test.createTestingModule({
imports: [
ClientsModule.register([
{
name: 'DUC_PACKAGE',
...ducClient.config(),
},
]),
ClientsModule.register([client.providerOptions]),
PermissionsModule,
],
controllers: [RolesController],
src/modules/roles/roles.module.ts
+2 -7
View File
@@ -6,16 +6,11 @@ import { RolesService } from './roles.service';
import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
import { PermissionsModule } from '../permissions/permissions.module';
const ducClient = new DucClient();
const client = new DucClient();
@Module({
imports: [
ClientsModule.register([
{
name: 'DUC_PACKAGE',
...ducClient.config(),
},
]),
ClientsModule.register([client.providerOptions]),
PermissionsModule,
],
controllers: [RolesController],
src/modules/roles/roles.service.spec.ts
+2 -7
View File
@@ -6,7 +6,7 @@ import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
import { DucClient } from 'src/clients/duc/client.config';
import { PermissionsModule } from '../permissions/permissions.module';
const ducClient = new DucClient();
const client = new DucClient();
const logger = {
info: (...args) => args,
@@ -18,12 +18,7 @@ describe('RolesService', () => {
beforeEach(async () => {
const module: TestingModule = await Test.createTestingModule({
imports: [
ClientsModule.register([
{
name: 'DUC_PACKAGE',
...ducClient.config(),
},
]),
ClientsModule.register([client.providerOptions]),
PermissionsModule,
],
controllers: [RolesController],
src/modules/roles/roles.service.ts
+2 -1
View File
@@ -19,6 +19,7 @@ import { lastValueFrom } from 'rxjs';
import { PermissionsService } from '../permissions/permissions.service';
import { LanguageEnum } from 'src/utils/languages.enum';
import { RequestUser } from 'src/authentication/user.decorator';
import { DucClient } from 'src/clients/duc/client.config';
interface GetRolesPermissionsName {
id: string;
@@ -37,7 +38,7 @@ export class RolesService {
constructor(
@Inject(DadosferaLogger)
dadosferaLogger: DadosferaLogger,
@Inject('DUC_PACKAGE') private readonly grpcClient: ClientGrpc,
@Inject(DucClient.name) private readonly grpcClient: ClientGrpc,
private permissionsService: PermissionsService,
) {
this.logger = dadosferaLogger.logger;
src/modules/termsOfUse/termsOfUse.module.ts
+2 -9
View File
@@ -6,17 +6,10 @@ import { TermsOfUseController } from './termsOfUse.controller';
import { TermsOfUseClientService } from './termsOfUse.service';
import { DucClient } from '../../clients/duc/client.config';
const ducClient = new DucClient();
const client = new DucClient();
@Module({
imports: [
ClientsModule.register([
{
name: 'DUC_PACKAGE',
...ducClient.config(),
},
]),
],
imports: [ClientsModule.register([client.providerOptions])],
controllers: [TermsOfUseController],
providers: [TermsOfUseClientService, DadosferaLogger],
exports: [TermsOfUseClientService],
src/modules/termsOfUse/termsOfUse.service.ts
+2 -1
View File
@@ -9,6 +9,7 @@ import {
TermsOfUseGetTokenRequest,
TermsOfUseAcceptRequest,
} from '@dadosfera/protospack-v2/dist/lib/Duc/interfaces/messages';
import { DucClient } from 'src/clients/duc/client.config';
@Injectable()
export class TermsOfUseClientService implements OnModuleInit {
@@ -18,7 +19,7 @@ export class TermsOfUseClientService implements OnModuleInit {
constructor(
@Inject(DadosferaLogger)
dadosferaLogger: DadosferaLogger,
@Inject('DUC_PACKAGE') private readonly grpcClient: ClientGrpc,
@Inject(DucClient.name) private readonly grpcClient: ClientGrpc,
) {
this.logger = dadosferaLogger.logger;
}
src/modules/users/users.controller.spec.ts
+2 -7
View File
@@ -7,7 +7,7 @@ import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
import { RolesModule } from '../roles/roles.module';
import { PermissionsModule } from '../permissions/permissions.module';
const ducClient = new DucClient();
const client = new DucClient();
const logger = {
info: (...args) => args,
@@ -19,12 +19,7 @@ describe('UsersController', () => {
beforeEach(async () => {
const module: TestingModule = await Test.createTestingModule({
imports: [
ClientsModule.register([
{
name: 'DUC_PACKAGE',
...ducClient.config(),
},
]),
ClientsModule.register([client.providerOptions]),
RolesModule,
PermissionsModule,
],
src/modules/users/users.module.ts
+2 -7
View File
@@ -7,16 +7,11 @@ import { DucClient } from 'src/clients/duc/client.config';
import { RolesModule } from '../roles/roles.module';
import { PermissionsModule } from '../permissions/permissions.module';
const ducClient = new DucClient();
const client = new DucClient();
@Module({
imports: [
ClientsModule.register([
{
name: 'DUC_PACKAGE',
...ducClient.config(),
},
]),
ClientsModule.register([client.providerOptions]),
RolesModule,
PermissionsModule,
],
src/modules/users/users.service.spec.ts
+2 -7
View File
@@ -7,7 +7,7 @@ import { DucClient } from 'src/clients/duc/client.config';
import { RolesModule } from '../roles/roles.module';
import { PermissionsModule } from '../permissions/permissions.module';
const ducClient = new DucClient();
const client = new DucClient();
const logger = {
info: (...args) => args,
@@ -19,12 +19,7 @@ describe('UsersService', () => {
beforeEach(async () => {
const module: TestingModule = await Test.createTestingModule({
imports: [
ClientsModule.register([
{
name: 'DUC_PACKAGE',
...ducClient.config(),
},
]),
ClientsModule.register([client.providerOptions]),
RolesModule,
PermissionsModule,
],
src/modules/users/users.service.ts
+2 -1
View File
@@ -23,6 +23,7 @@ import { HIERARCHIES } from './hierarchies';
import { LanguageEnum } from 'src/utils/languages.enum';
import { UserByCustomer } from '@dadosfera/protospack-v2/dist/lib/Duc/interfaces/entities';
import { EnrichErrorCode } from 'src/utils/ErrorBuilder';
import { DucClient } from 'src/clients/duc/client.config';
@Injectable()
export class UsersService implements OnModuleInit {
@@ -33,7 +34,7 @@ export class UsersService implements OnModuleInit {
constructor(
@Inject(DadosferaLogger)
dadosferaLogger: DadosferaLogger,
@Inject('DUC_PACKAGE') private readonly grpcClient: ClientGrpc,
@Inject(DucClient.name) private readonly grpcClient: ClientGrpc,
private rolesService: RolesService,
) {
this.logger = dadosferaLogger.logger;