hcengineering/platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2024-11-30 02:37:46 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Do not match elastic orde (#1871)

Browse Source 
Signed-off-by: Denis Bykhov <80476319+BykhovDenis@users.noreply.github.com>
This commit is contained in:
Denis Bykhov 2022-05-26 12:51:47 +06:00 committed by GitHub
parent 18d6feb221
commit ca3cf44c70
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
server/core/src/fulltext.ts
View File

@ -165,45 +165,7 @@ export class FullTextIndex implements WithFind {
} }
} }
const resultIds = Array.from(getResultIds(ids, _id)) const resultIds = Array.from(getResultIds(ids, _id))
return await this.getResult(ctx, _class, resultIds, mainQuery as DocumentQuery<T>, options) return await this.dbStorage.findAll(ctx, _class, { _id: { $in: resultIds }, ...mainQuery }, options)
}
private async getResult<T extends Doc>(
ctx: MeasureContext,
_class: Ref<Class<T>>,
ids: Ref<Doc>[],
mainQuery: DocumentQuery<T>,
options?: FindOptions<T>
): Promise<FindResult<T>> {
const orderMap = new Map<Ref<Doc>, number>()
for (let index = 0; index < ids.length; index++) {
orderMap.set(ids[index], index)
}
const { sort, ...otherOptions } = options ?? {}
if (options?.lookup !== undefined && options.limit !== undefined) {
const resIds = await this.dbStorage.findAll(
ctx,
_class,
{ _id: { $in: ids }, ...mainQuery },
{ projection: { _id: 1 } }
)
const total = resIds.total
resIds.sort((a, b) => (orderMap.get(a._id) ?? 0) - (orderMap.get(b._id) ?? 0))
const targetIds = resIds.slice(0, options.limit).map((p) => p._id)
const result = await this.dbStorage.findAll(ctx, _class, { _id: { $in: targetIds }, ...mainQuery }, otherOptions)
result.sort((a, b) => (orderMap.get(a._id) ?? 0) - (orderMap.get(b._id) ?? 0))
return toFindResult(result, total)
} else {
const result = await this.dbStorage.findAll(ctx, _class, { _id: { $in: ids }, ...mainQuery }, otherOptions)
const total = result.total
result.sort((a, b) => (orderMap.get(a._id) ?? 0) - (orderMap.get(b._id) ?? 0))
return toFindResult(result, total)
}
} }
private getFullTextAttributes (clazz: Ref<Class<Obj>>, parentDoc?: Doc): AnyAttribute[] { private getFullTextAttributes (clazz: Ref<Class<Obj>>, parentDoc?: Doc): AnyAttribute[] {