ORCT-45 - between clause handle incorrect syntax, tests

app/lib/database/QueryBuilder.js

@@ -38,13 +38,16 @@ const handleBetween = (fieldName, pairsList) => {
         pairsList = [pairsList]
     }
     return pairsList.map((p) => {
-        const value = p.split(',');
-        const [left, right] = adjustValuesToSql(value);
-        if (value[0] && value[1]) {
+        const range = p.split(',');
+        if (range.length !== 2) {
+            throw 'between clause is incorrectly formatted';
+        }
+        const [left, right] = adjustValuesToSql(range);
+        if (range[0] && range[1]) {
             return `${fieldName} BETWEEN ${left} AND ${right}`;
-        } else if (value[0]) {
+        } else if (range[0]) {
             return `${fieldName} >= ${left}`;
-        } else if (value[1]) {
+        } else if (range[1]) {
             return `${fieldName} <= ${right}`;
         }
     }).join(' OR ');
@@ -129,14 +132,13 @@ class QueryBuilder {
         const viewName = pageToViewName[params.page]
         const viewGen = views[viewName]
 
-        const a = `WITH ${viewName} AS (
+        return `WITH ${viewName} AS (
                     ${viewGen(params)})
                 SELECT *
                 FROM ${viewName}
                 ${QueryBuilder.filteringPart(params)}
                 ${orderingPart(params)}
                 ${dataSubsetQueryPart(params)};`;
-        return a;
     }
 
     static buildInsertOrUpdate(params) {

app/lib/database/index.js

@@ -13,7 +13,9 @@
  */
 
 const databaseService = require('./DatabaseService');
-
+const QueryBuilder = require('./QueryBuilder')
 module.exports = {
-    databaseService
-}
+    databaseService,
+    QueryBuilder,
+};
+

test/database/utilities/QueryBuilder.test.js

@@ -14,6 +14,10 @@
 const QueryBuilder = require('../../../app/lib/database/QueryBuilder');
 const views = require('../../../app/lib/database/views');
 const expect = require('chai').expect;
+const database = require('../../../app/lib/database');
+const { assert } = require('chai');
+const { databaseService } = database;
+
 
 module.exports = () => {
     describe('DatabaseSuite', () => {
@@ -34,6 +38,84 @@ module.exports = () => {
                 expect(result).to.not.be.null;
                 expect(result).to.not.be.equal(expectedOutcome);
             });
+
+            it('check query syntax for filtering params for periods view - 1', async () => {
+
+                const filteringParams = {
+                    page: 'periods',
+                    'rows-on-site': '50',
+                    site: '1',
+                    sorting: '-name',
+                    'name-match': ['%c%,%a', '%C%C'],
+                    'beam-match': 'p-p',
+                };
+
+                assert.doesNotThrow( async () => {
+                    const q = QueryBuilder.buildSelect(filteringParams);
+                    await databaseService.pgExec(q);
+                });
+
+            });
+
+            it('check query syntax for filtering params for periods view - 2', async () => {
+
+                const filteringParams = {
+                    page: 'periods',
+                    'rows-on-site': '2',
+                    site: '2',
+                    sorting: '-name',
+                    'name-match': '%c%',
+                    'beam-match': 'p-p,Pb-Pb',
+                    'year-exclude': ['2024', '2025,1999'],
+                    'year-between': ['2022,', '2222,2555', ',2055']
+                };
+
+                assert.doesNotThrow( async () => {
+                    const q = QueryBuilder.buildSelect(filteringParams);
+                    await databaseService.pgExec(q);
+                });
+            });
+
+
+            it('check query syntax for filtering params for periods view - 3 (strangely formatted params)', async () => {
+
+                const filteringParams = {
+                    page: 'periods',
+                    'rows-on-site': '2',
+                    site: '2',
+                    sorting: '-name',
+                    'name-match': '%c%',
+                    'name-exclude': ['%cccASDF%,', '%asdf,,,%asdf'],
+                    'beam-match': 'p-p,Pb-Pb',
+                    'year-exclude': ['2024', '2025'],
+                    'year-between': ['2022,', ',2555']
+
+                };
+
+                assert.doesNotThrow( async () => {
+                    const q = QueryBuilder.buildSelect(filteringParams);
+                    await databaseService.pgExec(q);
+                });
+            });
+
+            it('check INCORRECT between clause in filtering params for periods view - 4', async () => {
+
+                const filteringParams = {
+                    page: 'periods',
+                    'rows-on-site': '2',
+                    site: '2',
+                    sorting: '-name',
+                    'year-between': [',,2022,'],
+                };
+
+                assert.throws(() => {
+                    const q = QueryBuilder.buildSelect(filteringParams);
+                });
+            });
+
+
+
         });
     });
 };
+