From d7f1d683a174e3d2364c47b6e1312583b125cc89 Mon Sep 17 00:00:00 2001 From: Raju Udava <86527202+dstala@users.noreply.github.com> Date: Sat, 11 Feb 2023 18:06:15 +0530 Subject: [PATCH] test: handling of rating null values as 0 Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> --- .../tests/unit/rest/tests/filter.test.ts | 26 ++++++++++++------- tests/playwright/tests/filters.spec.ts | 11 +++++--- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/packages/nocodb/tests/unit/rest/tests/filter.test.ts b/packages/nocodb/tests/unit/rest/tests/filter.test.ts index 3c83a22d04..1a4267a743 100644 --- a/packages/nocodb/tests/unit/rest/tests/filter.test.ts +++ b/packages/nocodb/tests/unit/rest/tests/filter.test.ts @@ -96,19 +96,25 @@ async function retrieveRecordsAndValidate( ); break; case 'lt': - expectedRecords = unfilteredRecords.filter( - (record) => - (toFloat ? parseFloat(record[title]) : record[title]) < - (toFloat ? parseFloat(filter.value) : filter.value) && - record[title] !== null + expectedRecords = unfilteredRecords.filter((record) => + title === 'Rating' + ? (toFloat ? parseFloat(record[title]) : record[title]) < + (toFloat ? parseFloat(filter.value) : filter.value) || + record[title] === null + : (toFloat ? parseFloat(record[title]) : record[title]) < + (toFloat ? parseFloat(filter.value) : filter.value) && + record[title] !== null ); break; case 'lte': - expectedRecords = unfilteredRecords.filter( - (record) => - (toFloat ? parseFloat(record[title]) : record[title]) <= - (toFloat ? parseFloat(filter.value) : filter.value) && - record[title] !== null + expectedRecords = unfilteredRecords.filter((record) => + title === 'Rating' + ? (toFloat ? parseFloat(record[title]) : record[title]) <= + (toFloat ? parseFloat(filter.value) : filter.value) || + record[title] === null + : (toFloat ? parseFloat(record[title]) : record[title]) <= + (toFloat ? parseFloat(filter.value) : filter.value) && + record[title] !== null ); break; case 'anyof': diff --git a/tests/playwright/tests/filters.spec.ts b/tests/playwright/tests/filters.spec.ts index 76ed73105e..4b5bc8b9a1 100644 --- a/tests/playwright/tests/filters.spec.ts +++ b/tests/playwright/tests/filters.spec.ts @@ -144,13 +144,18 @@ test.describe('Filter Tests: Numerical', () => { { op: '<', value: isLikeString, - rowCount: records.list.filter(r => r[dataType] < parseFloat(isLikeStringDerived) && r[dataType] != null).length, + rowCount: + dataType === 'Rating' + ? records.list.filter(r => r[dataType] < parseFloat(isLikeStringDerived)).length + : records.list.filter(r => r[dataType] < parseFloat(isLikeStringDerived) && r[dataType] != null).length, }, { op: '<=', value: isLikeString, - rowCount: records.list.filter(r => r[dataType] <= parseFloat(isLikeStringDerived) && r[dataType] != null) - .length, + rowCount: + dataType === 'Rating' + ? records.list.filter(r => r[dataType] <= parseFloat(isLikeStringDerived)).length + : records.list.filter(r => r[dataType] <= parseFloat(isLikeStringDerived) && r[dataType] != null).length, }, ];