wieerwill/platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2025-04-28 03:10:17 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix query create lookup (#2993)

Browse Source 
Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com>
This commit is contained in:
Denis Bykhov 2023-04-16 17:12:46 +06:00 committed by GitHub
parent 458ba29ccf
commit 6d98f9e6b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
packages/query/src/index.ts
View File

@ -116,7 +116,7 @@ export class LiveQuery extends TxProcessor implements Client {
} }
} }
private match (q: Query, doc: Doc): boolean { private match (q: Query, doc: Doc, skipLookup = false): boolean {
if (!this.getHierarchy().isDerived(doc._class, q._class)) { if (!this.getHierarchy().isDerived(doc._class, q._class)) {
// Check if it is not a mixin and not match class // Check if it is not a mixin and not match class
const mixinClass = Hierarchy.mixinClass(doc) const mixinClass = Hierarchy.mixinClass(doc)
@ -127,6 +127,7 @@ export class LiveQuery extends TxProcessor implements Client {
const query = q.query const query = q.query
for (const key in query) { for (const key in query) {
if (key === '$search') continue if (key === '$search') continue
if (skipLookup && key.startsWith('$lookup')) continue
const value = (query as any)[key] const value = (query as any)[key]
const result = findProperty([doc], key, value) const result = findProperty([doc], key, value)
if (result.length === 0) { if (result.length === 0) {
@ -743,38 +744,45 @@ export class LiveQuery extends TxProcessor implements Client {
} }
private async handleDocAdd (q: Query, doc: Doc, handleLookup = true): Promise<void> { private async handleDocAdd (q: Query, doc: Doc, handleLookup = true): Promise<void> {
if (this.match(q, doc)) { if (this.match(q, doc, q.options?.lookup !== undefined)) {
let needPush = true
if (q.result instanceof Promise) { if (q.result instanceof Promise) {
q.result = await q.result q.result = await q.result
} }
if (q.options?.lookup !== undefined && handleLookup) { if (q.options?.lookup !== undefined && handleLookup) {
await this.lookup(q._class, doc, q.options.lookup) await this.lookup(q._class, doc, q.options.lookup)
const matched = this.match(q, doc)
if (!matched) needPush = false
} }
// We could already have document inside results, if query is created during processing of document create transaction and not yet handled on client. if (needPush) {
const pos = q.result.findIndex((p) => p._id === doc._id) // We could already have document inside results, if query is created during processing of document create transaction and not yet handled on client.
if (pos >= 0) { const pos = q.result.findIndex((p) => p._id === doc._id)
// No need to update, document already in results. if (pos >= 0) {
return // No need to update, document already in results.
needPush = false
}
} }
if (needPush) {
// If query contains search we must check use fulltext
if (q.query.$search != null && q.query.$search.length > 0) {
const match = await this.client.findOne(q._class, { $search: q.query.$search, _id: doc._id }, q.options)
if (match === undefined) return
}
// If query contains search we must check use fulltext q.result.push(doc)
if (q.query.$search != null && q.query.$search.length > 0) { q.total++
const match = await this.client.findOne(q._class, { $search: q.query.$search, _id: doc._id }, q.options)
if (match === undefined) return
}
q.result.push(doc)
q.total++
if (q.options?.sort !== undefined) { if (q.options?.sort !== undefined) {
await resultSort(q.result, q.options?.sort, q._class, this.getHierarchy(), this.client.getModel()) await resultSort(q.result, q.options?.sort, q._class, this.getHierarchy(), this.client.getModel())
} }
if (q.options?.limit !== undefined && q.result.length > q.options.limit) { if (q.options?.limit !== undefined && q.result.length > q.options.limit) {
if (q.result.pop()?._id !== doc._id) { if (q.result.pop()?._id !== doc._id) {
await this.callback(q)
}
} else {
await this.callback(q) await this.callback(q)
} }
} else {
await this.callback(q)
} }
} }