Fixed validation of class inheritance in queries (#7789)

* Fixed validation of class inheritance in queries Signed-off-by: Victor Ilyushchenko <[email protected]> * added mixin check Co-authored-by: Denis Bykhov <[email protected]> Signed-off-by: Victor Ilyushchenko <[email protected]> --------- Signed-off-by: Victor Ilyushchenko <[email protected]> Co-authored-by: Denis Bykhov <[email protected]>
hcengineering · Jan 27, 2025 · 83a912d · 83a912d
1 parent e950ee4
commit 83a912d
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/packages/core/src/query.ts b/packages/core/src/query.ts
@@ -156,7 +156,11 @@ export function matchQuery<T extends Doc> (
   hierarchy: Hierarchy,
   skipLookup: boolean = false
 ): Doc[] {
-  let result = docs
+  const baseClass = hierarchy.getBaseClass(clazz)
+  let result = docs.filter((r) => hierarchy.isDerived(r._class, baseClass))
+  if (baseClass !== clazz) {
+    result = docs.filter((r) => hierarchy.hasMixin(r, clazz))
+  }
   for (const key in query) {
     if (skipLookup && key.startsWith('$lookup.')) {
       continue