UniqAI/hexabot
1
0
Fork 0
mirror of https://github.com/hexastack/hexabot synced 2025-01-23 02:47:56 +00:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

fix: add retro compatibility for find and findAndPopulate methods

Browse Source
This commit is contained in:
yassinedorbozgithub 2024-12-06 16:26:54 +01:00
parent 62e59069dd
commit d3b5070407
3 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/chat/controllers/message.controller.ts
View File

@ -55,7 +55,7 @@ import { SubscriberService } from '../services/subscriber.service';
@UseInterceptors(CsrfInterceptor) @UseInterceptors(CsrfInterceptor)
@Controller('message') @Controller('message')
export class MessageController extends BaseController< export class MessageController extends BaseController<
Message, AnyMessage,
MessageStub, MessageStub,
MessagePopulate, MessagePopulate,
MessageFull MessageFull

27
api/src/utils/generics/base-repository.ts
View File

@ -257,20 +257,28 @@ export abstract class BaseRepository<
protected findQuery( protected findQuery(
filter: TFilterQuery<T>, filter: TFilterQuery<T>,
pageQuery?: PageQueryDto<T>, // TODO: QuerySortDto<T> type need to be removed
pageQuery?: QuerySortDto<T> | PageQueryDto<T>,
projection?: ProjectionType<T>, projection?: ProjectionType<T>,
) { ) {
const { skip = 0, limit, sort = ['createdAt', 'asc'] } = pageQuery || {}; // TODO: current block need to be removed
const query = this.model.find<T>(filter, projection); if (Array.isArray(pageQuery)) {
return query const query = this.model.find<T>(filter, projection);
.skip(skip) return query.sort([pageQuery] as [string, SortOrder][]);
.limit(limit) } else {
.sort([sort] as [string, SortOrder][]); const { skip = 0, limit, sort = ['createdAt', 'asc'] } = pageQuery || {};
const query = this.model.find<T>(filter, projection);
return query
.skip(skip)
.limit(limit)
.sort([sort] as [string, SortOrder][]);
}
} }
async find( async find(
filter: TFilterQuery<T>, filter: TFilterQuery<T>,
pageQuery?: PageQueryDto<T>, // TODO: QuerySortDto<T> type need to be removed
pageQuery?: QuerySortDto<T> | PageQueryDto<T>,
projection?: ProjectionType<T>, projection?: ProjectionType<T>,
) { ) {
const query = this.findQuery(filter, pageQuery, projection); const query = this.findQuery(filter, pageQuery, projection);
@ -285,7 +293,8 @@ export abstract class BaseRepository<
async findAndPopulate( async findAndPopulate(
filters: TFilterQuery<T>, filters: TFilterQuery<T>,
pageQuery?: PageQueryDto<T>, // TODO: QuerySortDto<T> need to be removed
pageQuery?: QuerySortDto<T> | PageQueryDto<T>,
projection?: ProjectionType<T>, projection?: ProjectionType<T>,
) { ) {
this.ensureCanPopulate(); this.ensureCanPopulate();

6
api/src/utils/generics/base-service.ts
View File

@ -46,7 +46,8 @@ export abstract class BaseService<
async find( async find(
filter: TFilterQuery<T>, filter: TFilterQuery<T>,
pageQuery?: PageQueryDto<T>, // TODO: QuerySortDto<T> type need to be removed
pageQuery?: QuerySortDto<T> | PageQueryDto<T>,
projection?: ProjectionType<T>, projection?: ProjectionType<T>,
): Promise<T[]> { ): Promise<T[]> {
return await this.repository.find(filter, pageQuery, projection); return await this.repository.find(filter, pageQuery, projection);
@ -54,7 +55,8 @@ export abstract class BaseService<
async findAndPopulate( async findAndPopulate(
filters: TFilterQuery<T>, filters: TFilterQuery<T>,
pageQuery?: PageQueryDto<T>, // TODO: QuerySortDto<T> type need to be removed
pageQuery?: QuerySortDto<T> | PageQueryDto<T>,
projection?: ProjectionType<T>, projection?: ProjectionType<T>,
) { ) {
return await this.repository.findAndPopulate( return await this.repository.findAndPopulate(