test: add tests for nested object search (#45)

* test: add tests for nested object search * fix: import error
thundermiracle · Jun 4, 2022 · 68bc0c5 · 68bc0c5
1 parent fbfd1f5
commit 68bc0c5
Show file tree

Hide file tree

Showing 10 changed files with 90 additions and 15 deletions.
diff --git a/__test__/filters/equal.test.ts b/__test__/filters/equal.test.ts
@@ -18,6 +18,20 @@ const searchDataArray = {
 };
 
 describe('test caseSensitive flag', () => {
+  test('return false if key is incorrect', () => {
+    const result = equal(
+      {
+        key: 'notExist',
+        value: 'Ben',
+        type: SearchType.EQ,
+      },
+      true,
+      searchDataString,
+    );
+
+    expect(result).toBe(false);
+  });
+
   test('caseSensitive=true(same string, different alphabet case) -> false', () => {
     const result = equal(
       {

diff --git a/__test__/filters/greater.test.ts b/__test__/filters/greater.test.ts
@@ -14,6 +14,20 @@ const searchDataArray = {
 };
 
 describe('test caseSensitive flag', () => {
+  test('return false if key is incorrect', () => {
+    const result = greater(
+      {
+        key: 'notExist',
+        value: 'Ben',
+        type: SearchType.GT,
+      },
+      true,
+      searchDataString,
+    );
+
+    expect(result).toBe(false);
+  });
+
   test('caseSensitive=true(different alphabet case, compare to lowercase) -> false', () => {
     const result = greater(
       {

diff --git a/__test__/filters/like.test.ts b/__test__/filters/like.test.ts
@@ -10,6 +10,20 @@ const searchDataArray = {
 };
 
 describe('test caseSensitive flag', () => {
+  test('return false if key is incorrect', () => {
+    const result = like(
+      {
+        key: 'notExist',
+        value: 'Ben',
+        type: SearchType.LK,
+      },
+      true,
+      searchDataString,
+    );
+
+    expect(result).toBe(false);
+  });
+
   test('caseSensitive=true(partial same, different alphabet case) -> false', () => {
     const result = like(
       {

diff --git a/__test__/lib/utils.getObjValue.test.ts b/__test__/lib/utils.getObjValue.test.ts
@@ -0,0 +1,28 @@
+import { getObjValue } from '../../src/lib/utils';
+import type { DataObjectWithNull } from '../../src/lib/types';
+
+const data: DataObjectWithNull = {
+  name: 'John',
+  address: null,
+  father: {
+    name: 'Jack',
+    age: 50,
+  },
+};
+
+test('key is not exist', () => {
+  expect(getObjValue(data, 'notExist')).toBeUndefined();
+  expect(getObjValue(data, ['father', 'notExist'])).toBeUndefined();
+});
+
+test('key is string', () => {
+  expect(getObjValue(data, 'name')).toBe('John');
+  expect(getObjValue(data, 'address')).toBeNull();
+  expect(getObjValue(data, 'father.name')).toBe('Jack');
+});
+
+test('key is string[]', () => {
+  expect(getObjValue(data, ['name'])).toBe('John');
+  expect(getObjValue(data, ['address'])).toBeNull();
+  expect(getObjValue(data, ['father', 'name'])).toBe('Jack');
+});
diff --git a/src/filters/equal.ts b/src/filters/equal.ts
@@ -13,7 +13,10 @@ const equal = (
   caseSensitive: boolean,
   data: DataObject,
 ): boolean => {
-  const targetValue = getObjValue(data, key) || '';
+  const targetValue = getObjValue(data, key);
+  if (targetValue == null) {
+    return false;
+  }
 
   if (typeof targetValue === 'number') {
     return targetValue === Number(value);

diff --git a/src/filters/greater.ts b/src/filters/greater.ts
@@ -13,7 +13,10 @@ const greater = (
   caseSensitive: boolean,
   data: DataObject,
 ): boolean => {
-  const targetValue = getObjValue(data, key) || '';
+  const targetValue = getObjValue(data, key);
+  if (targetValue == null) {
+    return false;
+  }
 
   // disable like search if targetValue is array
   if (Array.isArray(targetValue)) {

diff --git a/src/filters/like.ts b/src/filters/like.ts
@@ -14,7 +14,10 @@ const like = (
   data: DataObject,
 ): boolean => {
   const { key, value } = searchCondition;
-  const targetValue = getObjValue(data, key) || '';
+  const targetValue = getObjValue(data, key);
+  if (targetValue == null) {
+    return false;
+  }
 
   // disable like search if targetValue is array
   if (Array.isArray(targetValue)) {

diff --git a/src/lib/types.ts b/src/lib/types.ts
@@ -21,18 +21,13 @@ export interface SearchConditionMultiple {
 
 export type DataObjectValues = string | number | (string | number)[];
 export interface DataObject {
-  [key: string]: DataObjectValues;
+  [key: string]: DataObjectValues | DataObject;
 }
 
-export type DataObjectWithNullValues =
-  | string
-  | number
-  | (string | number)[]
-  | undefined
-  | null;
+export type DataObjectWithNullValues = DataObjectValues | null;
 
 export interface DataObjectWithNull {
-  [key: string]: DataObjectWithNullValues;
+  [key: string]: DataObjectWithNullValues | DataObjectWithNull;
 }
 
 export type Predicator = (data: DataObject) => boolean;
diff --git a/src/lib/utils.ts b/src/lib/utils.ts
@@ -38,7 +38,10 @@ function getObjValue(
   data: DataObjectWithNull,
   key: string | string[],
 ): DataObjectValues | undefined {
-  return path<DataObjectValues>(typeof key === 'string' ? [key] : key, data);
+  return path<DataObjectValues>(
+    typeof key === 'string' ? key.split('.') : key,
+    data,
+  );
 }
 
 export {
@@ -52,6 +55,5 @@ export {
   anyPass,
   drop,
   take,
-  path,
   getObjValue,
 };
diff --git a/src/prefilters/targetValueNull.ts b/src/prefilters/targetValueNull.ts
@@ -1,10 +1,9 @@
-import { curry, getObjValue, path } from '../lib/utils';
+import { curry, getObjValue } from '../lib/utils';
 import {
   DataObjectWithNull,
   Predicator,
   SearchCondition,
   DataObject,
-  DataObjectWithNullValues,
 } from '../lib/types';
 
 /**