From 0f7ddbb22a1b5a0a4575ee88c45d139d00f1fec9 Mon Sep 17 00:00:00 2001
From: Vyacheslav Tumanov <me@slavatumanov.me>
Date: Mon, 6 Nov 2023 17:48:13 +0500
Subject: [PATCH 1/5] UBERF-4195: fix query after applying viewOptions

Signed-off-by: Vyacheslav Tumanov <me@slavatumanov.me>
---
 plugins/view-resources/src/components/list/List.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/view-resources/src/components/list/List.svelte b/plugins/view-resources/src/components/list/List.svelte
index aecf8464369..2089f708fb6 100644
--- a/plugins/view-resources/src/components/list/List.svelte
+++ b/plugins/view-resources/src/components/list/List.svelte
@@ -59,7 +59,7 @@
 
   let resultQuery: DocumentQuery<Doc> = query
   $: getResultQuery(query, viewOptionsConfig, viewOptions).then((p) => {
-    resultQuery = { ...query, ...p }
+    resultQuery = { ...p, ...query }
   })
 
   $: queryNoLookup = noLookup(resultQuery)

From d80ad60003cd023ded442d7bb7392445eac589e1 Mon Sep 17 00:00:00 2001
From: Vyacheslav Tumanov <me@slavatumanov.me>
Date: Tue, 7 Nov 2023 21:47:19 +0500
Subject: [PATCH 2/5] UBERF-4195: function for merging queries

Signed-off-by: Vyacheslav Tumanov <me@slavatumanov.me>
---
 packages/core/src/utils.ts                    | 37 ++++++++++++++++++-
 .../src/components/TypesView.svelte           |  6 +--
 .../src/components/kanban/KanbanView.svelte   |  3 +-
 .../src/components/list/List.svelte           | 13 ++++++-
 4 files changed, 52 insertions(+), 7 deletions(-)

diff --git a/packages/core/src/utils.ts b/packages/core/src/utils.ts
index 6f6923327d1..b07de1bb8f2 100644
--- a/packages/core/src/utils.ts
+++ b/packages/core/src/utils.ts
@@ -16,7 +16,7 @@
 import { Account, AnyAttribute, Class, Doc, DocData, DocIndexState, IndexKind, Obj, Ref, Space } from './classes'
 import core from './component'
 import { Hierarchy } from './hierarchy'
-import { FindResult } from './storage'
+import { DocumentQuery, FindResult } from './storage'
 
 function toHex (value: number, chars: number): string {
   const result = value.toString(16)
@@ -331,3 +331,38 @@ export class RateLimitter {
     await await Promise.race(this.processingQueue.values())
   }
 }
+
+export function mergeQueries<T extends Doc> (query1: DocumentQuery<T>, query2: DocumentQuery<T>): DocumentQuery<T> {
+  const q = { ...query1 }
+  for (const k in query2) {
+    if (
+      typeof query2[k] === 'object' &&
+      typeof query1[k] === 'object' &&
+      Object.keys(query2[k]).every((t) => t.startsWith('$')) &&
+      Object.keys(query1[k]).every((t) => t.startsWith('$'))
+    ) {
+      for (const x in query2[k]) {
+        if (x === '$in') {
+          q[k][x] =
+            query1[k][x].length - query2[k][x].length < 0
+              ? query2[k][x].filter((c: any) => query1[k][x].includes(c))
+              : query1[k][x].filter((c: any) => query2[k][x].includes(c))
+          continue
+        }
+        if (x === '$nin') {
+          q[k][x] = [...query1[k][x], ...query2[k][x]]
+          continue
+        }
+        if (x === '$lt') {
+          q[k][x] = query1[k][x] < query2[k][x] ? query1[k][x] : query2[k][x]
+          continue
+        }
+        if (x === '$gt') {
+          q[k][x] = query1[k][x] > query2[k][x] ? query1[k][x] : query2[k][x]
+        }
+      }
+    }
+    if (!Object.keys(query1).includes(k)) Object.assign(q[k], query2[k])
+  }
+  return q
+}
diff --git a/plugins/task-resources/src/components/TypesView.svelte b/plugins/task-resources/src/components/TypesView.svelte
index 13c337f4b6c..20caea131d5 100644
--- a/plugins/task-resources/src/components/TypesView.svelte
+++ b/plugins/task-resources/src/components/TypesView.svelte
@@ -13,7 +13,7 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { Class, Doc, DocumentQuery, Ref, Space, WithLookup } from '@hcengineering/core'
+  import { Class, Doc, DocumentQuery, mergeQueries, Ref, Space, WithLookup } from '@hcengineering/core'
   import { IntlString, getEmbeddedLabel } from '@hcengineering/platform'
   import { createQuery } from '@hcengineering/presentation'
   import { Project, ProjectType, ProjectTypeCategory } from '@hcengineering/task'
@@ -65,7 +65,7 @@
   $: spacesQ.query(task.class.Project, { type: mode as Ref<ProjectType> }, (result) => {
     spaces = result
   })
-
+  let resultQuery: DocumentQuery<Doc>
   $: query = { ...(baseQuery ?? {}), ...(viewlet?.baseQuery ?? {}), space: { $in: spaces.map((it) => it._id) } }
   $: searchQuery = search === '' ? query : { ...query, $search: search }
   $: resultQuery = searchQuery
@@ -154,7 +154,7 @@
     query={searchQuery}
     {viewOptions}
     on:change={(e) => {
-      resultQuery = { ...query, ...e.detail }
+      resultQuery = mergeQueries(query, e.detail)
     }}
   />
   <Component
diff --git a/plugins/task-resources/src/components/kanban/KanbanView.svelte b/plugins/task-resources/src/components/kanban/KanbanView.svelte
index 730d7fe049d..008d423b687 100644
--- a/plugins/task-resources/src/components/kanban/KanbanView.svelte
+++ b/plugins/task-resources/src/components/kanban/KanbanView.svelte
@@ -22,6 +22,7 @@
     DocumentUpdate,
     FindOptions,
     generateId,
+    mergeQueries,
     Ref
   } from '@hcengineering/core'
   import { Item, Kanban as KanbanUI } from '@hcengineering/kanban'
@@ -87,7 +88,7 @@
   }
 
   let resultQuery: DocumentQuery<any> = { ...query }
-  $: getResultQuery(query, viewOptionsConfig, viewOptions).then((p) => (resultQuery = { ...p, ...query }))
+  $: getResultQuery(query, viewOptionsConfig, viewOptions).then((p) => (resultQuery = mergeQueries(p, query)))
 
   const client = getClient()
   const hierarchy = client.getHierarchy()
diff --git a/plugins/view-resources/src/components/list/List.svelte b/plugins/view-resources/src/components/list/List.svelte
index 2089f708fb6..46a669682cc 100644
--- a/plugins/view-resources/src/components/list/List.svelte
+++ b/plugins/view-resources/src/components/list/List.svelte
@@ -13,7 +13,16 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import core, { Class, Doc, DocumentQuery, FindOptions, Ref, Space, RateLimitter } from '@hcengineering/core'
+  import core, {
+    Class,
+    Doc,
+    DocumentQuery,
+    FindOptions,
+    Ref,
+    Space,
+    RateLimitter,
+    mergeQueries
+  } from '@hcengineering/core'
   import { IntlString, getResource } from '@hcengineering/platform'
   import { createQuery, getClient } from '@hcengineering/presentation'
   import { AnyComponent, AnySvelteComponent } from '@hcengineering/ui'
@@ -59,7 +68,7 @@
 
   let resultQuery: DocumentQuery<Doc> = query
   $: getResultQuery(query, viewOptionsConfig, viewOptions).then((p) => {
-    resultQuery = { ...p, ...query }
+    resultQuery = mergeQueries(p, query) as DocumentQuery<Doc>
   })
 
   $: queryNoLookup = noLookup(resultQuery)

From 165f0881564da041cb35edf9c3e18ef351621740 Mon Sep 17 00:00:00 2001
From: Vyacheslav Tumanov <me@slavatumanov.me>
Date: Wed, 8 Nov 2023 16:49:26 +0500
Subject: [PATCH 3/5] UBERF-4195: handle the case when one of the queries
 doesn't contain predicate

Signed-off-by: Vyacheslav Tumanov <me@slavatumanov.me>
---
 packages/core/src/utils.ts | 41 +++++++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/packages/core/src/utils.ts b/packages/core/src/utils.ts
index b07de1bb8f2..174b1d23166 100644
--- a/packages/core/src/utils.ts
+++ b/packages/core/src/utils.ts
@@ -17,6 +17,7 @@ import { Account, AnyAttribute, Class, Doc, DocData, DocIndexState, IndexKind, O
 import core from './component'
 import { Hierarchy } from './hierarchy'
 import { DocumentQuery, FindResult } from './storage'
+import { isPredicate } from './predicate'
 
 function toHex (value: number, chars: number): string {
   const result = value.toString(16)
@@ -335,23 +336,28 @@ export class RateLimitter {
 export function mergeQueries<T extends Doc> (query1: DocumentQuery<T>, query2: DocumentQuery<T>): DocumentQuery<T> {
   const q = { ...query1 }
   for (const k in query2) {
-    if (
-      typeof query2[k] === 'object' &&
-      typeof query1[k] === 'object' &&
-      Object.keys(query2[k]).every((t) => t.startsWith('$')) &&
-      Object.keys(query1[k]).every((t) => t.startsWith('$'))
-    ) {
-      for (const x in query2[k]) {
-        if (x === '$in') {
-          q[k][x] =
-            query1[k][x].length - query2[k][x].length < 0
-              ? query2[k][x].filter((c: any) => query1[k][x].includes(c))
-              : query1[k][x].filter((c: any) => query2[k][x].includes(c))
-          continue
-        }
-        if (x === '$nin') {
-          q[k][x] = [...query1[k][x], ...query2[k][x]]
-          continue
+    if (!Object.keys(query1).includes(k)) {
+      Object.assign(q[k], query2[k])
+      continue
+    }
+    if (isPredicate(query2[k]) || isPredicate(query1[k])) {
+      const toIterate = isPredicate(query2[k]) ? query2[k] : query1[k]
+      for (const x in toIterate) {
+        if (['$in', '$nin'].includes(x)) {
+          const q1Arr = isPredicate(query1[k]) ? query1[k][x] : [query1[k]]
+          const q2Arr = isPredicate(query2[k]) ? query2[k][x] : [query2[k]]
+          if (x === '$in') {
+            const intersection =
+              q1Arr.length - q2Arr.length < 0
+                ? q2Arr.filter((c: any) => q1Arr.includes(c))
+                : q1Arr.filter((c: any) => q2Arr.includes(c))
+            Object.assign(q, { [k]: { $in: intersection } })
+            continue
+          }
+          if (x === '$nin') {
+            Object.assign(q, { [k]: { $nin: [...q1Arr, ...q2Arr] } })
+            continue
+          }
         }
         if (x === '$lt') {
           q[k][x] = query1[k][x] < query2[k][x] ? query1[k][x] : query2[k][x]
@@ -362,7 +368,6 @@ export function mergeQueries<T extends Doc> (query1: DocumentQuery<T>, query2: D
         }
       }
     }
-    if (!Object.keys(query1).includes(k)) Object.assign(q[k], query2[k])
   }
   return q
 }

From 9089c859da357a882199d78eb7400963091f5d95 Mon Sep 17 00:00:00 2001
From: Vyacheslav Tumanov <me@slavatumanov.me>
Date: Wed, 8 Nov 2023 17:18:03 +0500
Subject: [PATCH 4/5] UBERF-4195: additional fixes for $gt, $lt

Signed-off-by: Vyacheslav Tumanov <me@slavatumanov.me>
---
 packages/core/src/utils.ts | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/packages/core/src/utils.ts b/packages/core/src/utils.ts
index 174b1d23166..4ce7c42a08a 100644
--- a/packages/core/src/utils.ts
+++ b/packages/core/src/utils.ts
@@ -334,10 +334,10 @@ export class RateLimitter {
 }
 
 export function mergeQueries<T extends Doc> (query1: DocumentQuery<T>, query2: DocumentQuery<T>): DocumentQuery<T> {
-  const q = { ...query1 }
+  const q = Object.assign({}, query1)
   for (const k in query2) {
     if (!Object.keys(query1).includes(k)) {
-      Object.assign(q[k], query2[k])
+      Object.assign(q, { [k]: query2[k] })
       continue
     }
     if (isPredicate(query2[k]) || isPredicate(query1[k])) {
@@ -356,15 +356,17 @@ export function mergeQueries<T extends Doc> (query1: DocumentQuery<T>, query2: D
           }
           if (x === '$nin') {
             Object.assign(q, { [k]: { $nin: [...q1Arr, ...q2Arr] } })
+          }
+        } else if (['$lt', '$gt'].includes(x)) {
+          const val1 = isPredicate(query1[k]) ? query1[k][x] : query1[k]
+          const val2 = isPredicate(query2[k]) ? query2[k][x] : query2[k]
+          if (x === '$lt') {
+            Object.assign(q, { [k]: { $lt: val1 < val2 ? val1 : val2 } })
             continue
           }
-        }
-        if (x === '$lt') {
-          q[k][x] = query1[k][x] < query2[k][x] ? query1[k][x] : query2[k][x]
-          continue
-        }
-        if (x === '$gt') {
-          q[k][x] = query1[k][x] > query2[k][x] ? query1[k][x] : query2[k][x]
+          if (x === '$gt') {
+            Object.assign(q, { [k]: { $gt: val1 > val2 ? val1 : val2 } })
+          }
         }
       }
     }

From e41a790ee57444279eff00701789a57c5c0196d3 Mon Sep 17 00:00:00 2001
From: Vyacheslav Tumanov <me@slavatumanov.me>
Date: Thu, 9 Nov 2023 16:20:23 +0500
Subject: [PATCH 5/5] UBERF-4195: refactoring, writing test

Signed-off-by: Vyacheslav Tumanov <me@slavatumanov.me>
---
 packages/core/src/__tests__/memdb.test.ts | 37 ++++++++++++++++-
 packages/core/src/utils.ts                | 50 ++++++++++++++++-------
 2 files changed, 71 insertions(+), 16 deletions(-)

diff --git a/packages/core/src/__tests__/memdb.test.ts b/packages/core/src/__tests__/memdb.test.ts
index 4e3061448b7..ccdab870436 100644
--- a/packages/core/src/__tests__/memdb.test.ts
+++ b/packages/core/src/__tests__/memdb.test.ts
@@ -13,7 +13,7 @@
 // limitations under the License.
 //
 
-import { Client } from '..'
+import { Client, generateId, mergeQueries } from '..'
 import type { Class, Doc, Obj, Ref } from '../classes'
 import core from '../component'
 import { Hierarchy } from '../hierarchy'
@@ -396,4 +396,39 @@ describe('memdb', () => {
       expect(e).toEqual(new Error('createDoc cannot be used for objects inherited from AttachedDoc'))
     }
   })
+
+  it('mergeQueries', () => {
+    const id1 = generateId()
+    const id2 = generateId()
+    const q1 = {
+      space: id1,
+      unique: 'item',
+      age: { $gt: 10 }
+    } as any
+    const q2 = {
+      space: { $in: [id1, id2] },
+      age: 30
+    } as any
+    const resCompare = {
+      space: id1,
+      unique: 'item',
+      age: { $gt: 30 }
+    } as any
+    expect(mergeQueries(q1, q2)).toEqual(resCompare)
+    expect(mergeQueries(q2, q1)).toEqual(resCompare)
+
+    const q3 = {
+      space: { $nin: [id1] },
+      age: 20
+    } as any
+    const resCompare2 = {
+      space: { $ne: id1 },
+      age: []
+    } as any
+    expect(mergeQueries(q2, q3)).toEqual(resCompare2)
+    expect(mergeQueries(q3, q2)).toEqual(resCompare2)
+
+    expect(mergeQueries({ age: { $lt: 20 } } as any, { age: { $gt: 25 } } as any)).toEqual({ age: { $gt: 25 } })
+    expect(mergeQueries({ age: { $gt: 25 } } as any, { age: { $lt: 20 } } as any)).toEqual({ age: { $lt: 20 } })
+  })
 })
diff --git a/packages/core/src/utils.ts b/packages/core/src/utils.ts
index 4ce7c42a08a..c419a48972c 100644
--- a/packages/core/src/utils.ts
+++ b/packages/core/src/utils.ts
@@ -340,24 +340,11 @@ export function mergeQueries<T extends Doc> (query1: DocumentQuery<T>, query2: D
       Object.assign(q, { [k]: query2[k] })
       continue
     }
+    Object.assign(q, { [k]: getInNiN(query1[k], query2[k]) })
     if (isPredicate(query2[k]) || isPredicate(query1[k])) {
       const toIterate = isPredicate(query2[k]) ? query2[k] : query1[k]
       for (const x in toIterate) {
-        if (['$in', '$nin'].includes(x)) {
-          const q1Arr = isPredicate(query1[k]) ? query1[k][x] : [query1[k]]
-          const q2Arr = isPredicate(query2[k]) ? query2[k][x] : [query2[k]]
-          if (x === '$in') {
-            const intersection =
-              q1Arr.length - q2Arr.length < 0
-                ? q2Arr.filter((c: any) => q1Arr.includes(c))
-                : q1Arr.filter((c: any) => q2Arr.includes(c))
-            Object.assign(q, { [k]: { $in: intersection } })
-            continue
-          }
-          if (x === '$nin') {
-            Object.assign(q, { [k]: { $nin: [...q1Arr, ...q2Arr] } })
-          }
-        } else if (['$lt', '$gt'].includes(x)) {
+        if (['$lt', '$gt'].includes(x)) {
           const val1 = isPredicate(query1[k]) ? query1[k][x] : query1[k]
           const val2 = isPredicate(query2[k]) ? query2[k][x] : query2[k]
           if (x === '$lt') {
@@ -373,3 +360,36 @@ export function mergeQueries<T extends Doc> (query1: DocumentQuery<T>, query2: D
   }
   return q
 }
+
+function getInNiN (query1: any, query2: any): Object {
+  const aIn =
+    (typeof query1 === 'object' && '$in' in query1 ? query1.$in : undefined) ??
+    (typeof query1 !== 'object' && query1 !== undefined ? [query1] : [])
+  const aNIn =
+    (typeof query1 === 'object' && '$nin' in query1 ? query1.$nin : undefined) ??
+    (typeof query1 === 'object' && query1.$ne !== undefined ? [query1.$ne] : [])
+  const bIn =
+    (typeof query2 === 'object' && '$in' in query2 ? query2.$in : undefined) ??
+    (typeof query2 !== 'object' && query2 !== undefined ? [query2] : [])
+  const bNIn =
+    (typeof query2 === 'object' && '$nin' in query2 ? query2.$nin : undefined) ??
+    (typeof query2 === 'object' && query2.$ne !== undefined ? [query2.$ne] : [])
+  const finalIn =
+    aIn.length - bIn.length < 0 ? bIn.filter((c: any) => aIn.includes(c)) : aIn.filter((c: any) => bIn.includes(c))
+  const finalNin = Array.from(new Set([...aNIn, ...bNIn]))
+  if (finalIn.length === 1 && finalNin.length === 0) {
+    return aIn[0]
+  }
+  if (finalIn.length === 0 && finalNin.length === 1) {
+    return { $ne: finalNin[0] }
+  }
+  const res: any = {}
+  if (finalIn.length > 0) {
+    res.$in = finalIn
+  }
+  if (finalNin.length > 0) {
+    res.$nin = finalNin
+  }
+  if (aIn.length === 1 && bIn.length === 1) return []
+  return res
+}