Make between config to be flexible

Author: ppiyush13

src/buildWhereClause.js

@@ -50,8 +50,30 @@ const builder = {
         }
     },
 
+    transformBetweenConfig(config) {
+        const {start, end, value} = config;
+        if(start && end) {
+            return config;
+        }
+        const createBetweenCfg = (start, end) => {
+            return {
+                field: config.field,
+                start, end,
+            };
+        }
+        if(value) {
+            if(value.start && value.end) {
+                return createBetweenCfg(value.start, value.end);
+            }
+            if(Array.isArray(value) && value.length === 2 && !start && !end ) {
+                return createBetweenCfg(value[0], value[1]);
+            }
+        }
+        return config;
+    },
+
     between(config, isNot) {
-        const transformedConfigs = mapObjValues(config, quotifyValue, ['before', 'after']);
+        const transformedConfigs = mapObjValues(this.transformBetweenConfig(config), quotifyValue, ['start', 'end']);
         return templateUtil.applyTemplate(templates.between, transformedConfigs, isNot);
     },
 

src/template/templates.js

@@ -1,6 +1,6 @@
 export default {
-    between({field, before, after, notOperator}) {
-        return `${field} ${notOperator} BETWEEN ${before} AND ${after}`;
+    between({field, start, end, notOperator}) {
+        return `${field} ${notOperator} BETWEEN ${start} AND ${end}`;
     },
 
     is({field, value, notOperator}) {

src/test/buildWhereClause.test.js

@@ -174,14 +174,14 @@ describe('testing buildWhereClause module', () => {
                                     {
                                         operator: 'notBetween',
                                         field: 'b',
-                                        before: 15,
-                                        after: 19,
+                                        start: 15,
+                                        end: 19,
                                     },
                                     {
                                         operator: 'BETWEEN',
                                         field: 'c',
-                                        before: '1', 
-                                        after: '2',
+                                        start: '1', 
+                                        end: '2',
                                     }
                                 ]
                             }
@@ -255,8 +255,8 @@ describe('testing buildWhereClause module', () => {
         [
             {
                 field: 'A',
-                before: '2',
-                after: '5'
+                start: '2',
+                end: '5'
             },
             `
                 A BETWEEN '2' AND '5' 
@@ -265,8 +265,29 @@ describe('testing buildWhereClause module', () => {
         [
             {
                 field: 'A',
-                before: 2,
-                after: 5
+                start: 2,
+                end: 5
+            },
+            `
+                A BETWEEN 2 AND 5 
+            `
+        ],
+        [
+            {
+                field: 'A',
+                value: [2, 5],
+            },
+            `
+                A BETWEEN 2 AND 5 
+            `
+        ],
+        [
+            {
+                field: 'A',
+                value: {
+                    start: 2,
+                    end: 5,
+                },
             },
             `
                 A BETWEEN 2 AND 5