amirho/nest
1
0
Fork 0
mirror of https://github.com/nestjs/nest.git synced 2026-02-21 23:11:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(): fix rxjs breaking changes

Browse Source
This commit is contained in:
Kamil Myśliwiec
2021-05-17 14:04:31 +02:00
parent 00e9421a3b
commit 18f66e8299
18 changed files with 142 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
integration/microservices/src/kafka/kafka.controller.ts
View File

@@ -2,13 +2,13 @@ import {
Body,
Controller,
HttpCode,
OnModuleDestroy,
OnModuleInit,
Post,
OnModuleDestroy,
} from '@nestjs/common';
import { Logger } from '@nestjs/common/services/logger.service';
import { Client, ClientKafka, Transport } from '@nestjs/microservices';
import { Observable } from 'rxjs';
import { lastValueFrom, Observable } from 'rxjs';
import { BusinessDto } from './dtos/business.dto';
import { UserDto } from './dtos/user.dto';
@@ -57,14 +57,14 @@ export class KafkaController implements OnModuleInit, OnModuleDestroy {
async mathSumSyncKafkaMessage(
@Body() data: number[],
): Promise<Observable<any>> {
const result = await this.client
.send('math.sum.sync.kafka.message', {
const result = await lastValueFrom(
this.client.send('math.sum.sync.kafka.message', {
key: '1',
value: {
numbers: data,
},
})
.toPromise();
}),
);
return result;
}
@@ -74,13 +74,13 @@ export class KafkaController implements OnModuleInit, OnModuleDestroy {
async mathSumSyncWithoutKey(
@Body() data: number[],
): Promise<Observable<any>> {
const result = await this.client
.send('math.sum.sync.without.key', {
const result = await lastValueFrom(
this.client.send('math.sum.sync.without.key', {
value: {
numbers: data,
},
})
.toPromise();
}),
);
return result;
}
@@ -90,11 +90,11 @@ export class KafkaController implements OnModuleInit, OnModuleDestroy {
async mathSumSyncPlainObject(
@Body() data: number[],
): Promise<Observable<any>> {
const result = await this.client
.send('math.sum.sync.plain.object', {
const result = await lastValueFrom(
this.client.send('math.sum.sync.plain.object', {
numbers: data,
})
.toPromise();
}),
);
return result;
}
@@ -102,9 +102,9 @@ export class KafkaController implements OnModuleInit, OnModuleDestroy {
@Post('mathSumSyncArray')
@HttpCode(200)
async mathSumSyncArray(@Body() data: number[]): Promise<Observable<any>> {
const result = await this.client
.send('math.sum.sync.array', data)
.toPromise();
const result = await lastValueFrom(
this.client.send('math.sum.sync.array', data),
);
return result;
}
@@ -112,18 +112,18 @@ export class KafkaController implements OnModuleInit, OnModuleDestroy {
@HttpCode(200)
async mathSumSyncString(@Body() data: number[]): Promise<Observable<any>> {
// this.logger.error(util.format('mathSumSyncString() data: %o', data));
const result = await this.client
.send('math.sum.sync.string', data.toString())
.toPromise();
const result = await lastValueFrom(
this.client.send('math.sum.sync.string', data.toString()),
);
return result;
}
@Post('mathSumSyncNumber')
@HttpCode(200)
async mathSumSyncNumber(@Body() data: number[]): Promise<Observable<any>> {
const result = await this.client
.send('math.sum.sync.number', data[0])
.toPromise();
const result = await lastValueFrom(
this.client.send('math.sum.sync.number', data[0]),
);
return result;
}
@@ -137,14 +137,14 @@ export class KafkaController implements OnModuleInit, OnModuleDestroy {
@Post('/user')
@HttpCode(200)
async createUser(@Body() user: UserDto): Promise<Observable<any>> {
const result = await this.client
.send('user.create', {
const result = await lastValueFrom(
this.client.send('user.create', {
key: '1',
value: {
user,
},
})
.toPromise();
}),
);
return result;
}
@@ -152,14 +152,14 @@ export class KafkaController implements OnModuleInit, OnModuleDestroy {
@Post('/business')
@HttpCode(200)
async createBusiness(@Body() business: BusinessDto) {
const result = await this.client
.send('business.create', {
const result = await lastValueFrom(
this.client.send('business.create', {
key: '1',
value: {
business,
},
})
.toPromise();
}),
);
return result;
}
}

17
integration/microservices/src/mqtt/mqtt.controller.ts
View File

@@ -6,7 +6,7 @@ import {
MessagePattern,
Transport,
} from '@nestjs/microservices';
import { from, Observable, of } from 'rxjs';
import { from, lastValueFrom, Observable, of } from 'rxjs';
import { scan } from 'rxjs/operators';
@Controller()
@@ -31,10 +31,11 @@ export class MqttController {
@Post('stream')
@HttpCode(200)
async stream(@Body() data: number[]) {
const result = await this.client
.send<number>({ cmd: 'streaming' }, data)
.pipe(scan((a, b) => a + b, 0))
.toPromise();
const result = lastValueFrom(
await this.client
.send<number>({ cmd: 'streaming' }, data)
.pipe(scan((a, b) => a + b, 0)),
);
return result;
}
@@ -43,9 +44,9 @@ export class MqttController {
async concurrent(@Body() data: number[][]): Promise<boolean> {
const send = async (tab: number[]) => {
const expected = tab.reduce((a, b) => a + b);
const result = await this.client
.send<number>({ cmd: 'sum' }, tab)
.toPromise();
const result = await lastValueFrom(
this.client.send<number>({ cmd: 'sum' }, tab),
);
return result === expected;
};

8
integration/microservices/src/nats/nats.controller.ts
View File

@@ -10,7 +10,7 @@ import {
RpcException,
Transport,
} from '@nestjs/microservices';
import { from, Observable, of, throwError } from 'rxjs';
import { from, lastValueFrom, Observable, of, throwError } from 'rxjs';
import { catchError, scan } from 'rxjs/operators';
import { NatsService } from './nats.service';
@@ -51,9 +51,9 @@ export class NatsController {
concurrent(@Body() data: number[][]): Promise<boolean> {
const send = async (tab: number[]) => {
const expected = tab.reduce((a, b) => a + b);
const result = await this.client
.send<number>('math.sum', tab)
.toPromise();
const result = await lastValueFrom(
this.client.send<number>('math.sum', tab),
);
return result === expected;
};

8
integration/microservices/src/redis/redis.controller.ts
View File

@@ -6,7 +6,7 @@ import {
MessagePattern,
Transport,
} from '@nestjs/microservices';
import { from, Observable, of } from 'rxjs';
import { from, lastValueFrom, Observable, of } from 'rxjs';
import { scan } from 'rxjs/operators';
@Controller()
@@ -35,9 +35,9 @@ export class RedisController {
concurrent(@Body() data: number[][]): Promise<boolean> {
const send = async (tab: number[]) => {
const expected = tab.reduce((a, b) => a + b);
const result = await this.client
.send<number>({ cmd: 'sum' }, tab)
.toPromise();
const result = await lastValueFrom(
this.client.send<number>({ cmd: 'sum' }, tab),
);
return result === expected;
};

8
integration/microservices/src/rmq/rmq.controller.ts
View File

@@ -6,7 +6,7 @@ import {
MessagePattern,
Transport,
} from '@nestjs/microservices';
import { from, Observable, of } from 'rxjs';
import { from, lastValueFrom, Observable, of } from 'rxjs';
import { scan } from 'rxjs/operators';
@Controller()
@@ -46,9 +46,9 @@ export class RMQController {
concurrent(@Body() data: number[][]): Promise<boolean> {
const send = async (tab: number[]) => {
const expected = tab.reduce((a, b) => a + b);
const result = await this.client
.send<number>({ cmd: 'sum' }, tab)
.toPromise();
const result = await lastValueFrom(
this.client.send<number>({ cmd: 'sum' }, tab),
);
return result === expected;
};