From 77568af7048cfdd569b9afe30dc83195d43fd21b Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Mon, 7 Aug 2023 13:14:18 +0300
Subject: [PATCH] Change filter query to store the expected shape

---
 packages/server/src/api/controllers/row/views.ts | 4 +++-
 packages/server/src/api/routes/tests/row.spec.ts | 9 ++++++++-
 packages/shared-core/src/filters.ts              | 8 ++++++--
 packages/types/src/api/web/searchFilter.ts       | 6 ++++--
 packages/types/src/documents/app/view.ts         | 7 +++----
 5 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/packages/server/src/api/controllers/row/views.ts b/packages/server/src/api/controllers/row/views.ts
index c38b7fe56e..9d6e38b1ec 100644
--- a/packages/server/src/api/controllers/row/views.ts
+++ b/packages/server/src/api/controllers/row/views.ts
@@ -6,6 +6,7 @@ import {
   SortType,
   ViewV2,
 } from "@budibase/types"
+import { dataFilters } from "@budibase/shared-core"
 import sdk from "../../../sdk"
 
 export async function searchView(ctx: UserCtx<void, SearchResponse>) {
@@ -29,11 +30,12 @@ export async function searchView(ctx: UserCtx<void, SearchResponse>) {
     undefined
 
   ctx.status = 200
+  const query = dataFilters.buildLuceneQuery(view.query || [])
   const result = await quotas.addQuery(
     () =>
       sdk.rows.search({
         tableId: view.tableId,
-        query: view.query || {},
+        query,
         fields: viewFields,
         ...getSortOptions(ctx, view),
       }),
diff --git a/packages/server/src/api/routes/tests/row.spec.ts b/packages/server/src/api/routes/tests/row.spec.ts
index b986ffb945..230aaa54cf 100644
--- a/packages/server/src/api/routes/tests/row.spec.ts
+++ b/packages/server/src/api/routes/tests/row.spec.ts
@@ -869,7 +869,14 @@ describe("/rows", () => {
         )
 
       const createViewResponse = await config.api.viewV2.create({
-        query: { equal: { age: 40 } },
+        query: [
+          {
+            operator: "equal",
+            field: "age",
+            value: "40",
+            type: FieldType.NUMBER,
+          },
+        ],
       })
 
       const response = await config.api.viewV2.search(createViewResponse.id)
diff --git a/packages/shared-core/src/filters.ts b/packages/shared-core/src/filters.ts
index 6602762160..8739db1b40 100644
--- a/packages/shared-core/src/filters.ts
+++ b/packages/shared-core/src/filters.ts
@@ -181,9 +181,13 @@ export const buildLuceneQuery = (filter: SearchFilter[]) => {
       }
       if (operator.startsWith("range") && query.range) {
         const minint =
-          SqlNumberTypeRangeMap[externalType]?.min || Number.MIN_SAFE_INTEGER
+          SqlNumberTypeRangeMap[
+            externalType as keyof typeof SqlNumberTypeRangeMap
+          ]?.min || Number.MIN_SAFE_INTEGER
         const maxint =
-          SqlNumberTypeRangeMap[externalType]?.max || Number.MAX_SAFE_INTEGER
+          SqlNumberTypeRangeMap[
+            externalType as keyof typeof SqlNumberTypeRangeMap
+          ]?.max || Number.MAX_SAFE_INTEGER
         if (!query.range[field]) {
           query.range[field] = {
             low: type === "number" ? minint : "0000-00-00T00:00:00.000Z",
diff --git a/packages/types/src/api/web/searchFilter.ts b/packages/types/src/api/web/searchFilter.ts
index 4dc00453d3..1b5948e50c 100644
--- a/packages/types/src/api/web/searchFilter.ts
+++ b/packages/types/src/api/web/searchFilter.ts
@@ -1,9 +1,11 @@
+import { FieldType } from "../../documents"
+
 export type SearchFilter = {
   operator: keyof SearchQuery
   field: string
-  type: any
+  type?: FieldType
   value: any
-  externalType: "integer" | "int" | "smallint" | "mediumint"
+  externalType?: string
 }
 
 export type SearchQuery = {
diff --git a/packages/types/src/documents/app/view.ts b/packages/types/src/documents/app/view.ts
index 3fe8b4a500..204b995337 100644
--- a/packages/types/src/documents/app/view.ts
+++ b/packages/types/src/documents/app/view.ts
@@ -1,6 +1,5 @@
-import { SortOrder, SortType } from "../../api"
-import { SearchFilters } from "../../sdk"
-import { TableSchema, UIFieldMetadata } from "./table"
+import { SearchFilter, SortOrder, SortType } from "../../api"
+import { UIFieldMetadata } from "./table"
 
 export interface View {
   name: string
@@ -20,7 +19,7 @@ export interface ViewV2 {
   name: string
   primaryDisplay?: string
   tableId: string
-  query?: SearchFilters
+  query?: SearchFilter[]
   sort?: {
     field: string
     order?: SortOrder