Increase test coverage

folio-org · Nov 7, 2023 · 3d0a0b6 · 3d0a0b6
1 parent 606eb12
commit 3d0a0b6
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 2 deletions.
diff --git a/src/QueryBuilder/QueryBuilder/helpers/query.js b/src/QueryBuilder/QueryBuilder/helpers/query.js
@@ -130,15 +130,14 @@ const getSourceFields = (field) => ({
   },
 }[field]);
 
-const getFormattedSourceField = async ({ item, intl, booleanOptions, fieldOptions, getParamsSource }) => {
+const getFormattedSourceField = async ({ item, intl, booleanOptions, fieldOptions, getParamsSource, boolean }) => {
   const [field, query] = Object.entries(item)[0];
   const mongoOperator = Object.keys(query)[0];
   const mongoValue = query[mongoOperator];
 
   const { operator, value } = getSourceFields(mongoOperator)(mongoValue);
 
   if (operator && value) {
-    const boolean = BOOLEAN_OPERATORS.AND;
     const fieldItem = fieldOptions.find(f => f.value === field);
     const { dataType, values, source } = fieldItem;
     const hasSourceOrValues = values || source;
@@ -169,6 +168,8 @@ const getFormattedSourceField = async ({ item, intl, booleanOptions, fieldOption
       value: { current: formattedValue || value, source, options: values },
     };
   }
+
+  return null;
 };
 
 export const mongoQueryToSource = async ({
@@ -190,6 +191,7 @@ export const mongoQueryToSource = async ({
     for (const item of initialValues[key]) {
       const formattedItem = await getFormattedSourceField({
         item,
+        boolean: key,
         ...sharedArgs,
       });
 
@@ -201,6 +203,7 @@ export const mongoQueryToSource = async ({
 
   const singleItem = await getFormattedSourceField({
     item: initialValues,
+    boolean: '',
     ...sharedArgs,
   });
 

diff --git a/src/QueryBuilder/QueryBuilder/helpers/query.test.js b/src/QueryBuilder/QueryBuilder/helpers/query.test.js
@@ -16,6 +16,13 @@ describe('mongoQueryToSource()', () => {
     expect(result).toEqual([]);
   });
 
+  const singleSource = [{
+    boolean: { options: [{ label: 'AND', value: '' }], current: '' },
+    field: { options: fieldOptions, current: 'user_first_name', dataType: 'stringType' },
+    operator: { options: expect.any(Array), current: OPERATORS.EQUAL, dataType: 'stringType' },
+    value: { current: 'value', options: undefined, source: undefined },
+  }];
+
   const source = [
     {
       boolean: { options: booleanOptions, current: '$and' },
@@ -132,6 +139,17 @@ describe('mongoQueryToSource()', () => {
     })));
   });
 
+  it('should convert single query without operators to source format', async () => {
+    const result = await mongoQueryToSource({
+      initialValues: { user_first_name: { $eq: 'value' } },
+      booleanOptions: [{ label: 'AND', value: '' }],
+      fieldOptions,
+      intl: { formatMessage: jest.fn() },
+    });
+
+    expect(result).toEqual(singleSource);
+  });
+
   it('should convert from source to simple query format', () => {
     const initial = {
       $and: [
@@ -152,4 +170,12 @@ describe('mongoQueryToSource()', () => {
 
     expect(result).toEqual(initial);
   });
+
+  it('should convert from SINGLE source to simple query format', () => {
+    const initial = { user_first_name: { $eq: 'value' } };
+
+    const result = sourceToMongoQuery(singleSource);
+
+    expect(result).toEqual(initial);
+  });
 });