Bugfix: when type is numeric value 0 should valid

SSENSE · Feb 23, 2017 · 7a45cb9 · 7a45cb9
1 parent 90eed83
commit 7a45cb9
Show file tree

Hide file tree

Showing 9 changed files with 57 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -139,7 +139,7 @@ validation: {
 
 ##### Auto formatting
 
-By default, every `numeric` and `date` inputs will be automatically transformed respectively to valid `number` and `Date` objects after validation. So you can directly use valid objects in your code.
+By default, every `numeric`, `date` and `boolean` inputs will be automatically transformed respectively to valid `number`, `Date` and `boolean` objects after validation. So you can directly use valid objects in your code.
 
 ##### Extra formatting, data transformation
 

diff --git a/js/ParamValidation.js b/js/ParamValidation.js
diff --git a/js/ParamValidation.js.map b/js/ParamValidation.js.map
diff --git a/js/RequestValidator.js b/js/RequestValidator.js
diff --git a/js/RequestValidator.js.map b/js/RequestValidator.js.map
diff --git a/js/index.js b/js/index.js
diff --git a/js/index.js.map b/js/index.js.map
diff --git a/tests/unit/RequestValidator.ts b/tests/unit/RequestValidator.ts
@@ -222,6 +222,35 @@ describe('RequestValidator', () => {
         );
     });
 
+    it('RequestValidator::validate() numeric', () => {
+        expected = undefined;
+        validator.validate(
+            {
+                route: {
+                    validation: {
+                        query: {
+                            id: {type: 'numeric', required: false}
+                        }
+                    }
+                }, query: {id: '1'}
+            },
+            null, test
+        );
+        expected = undefined;
+        validator.validate(
+            {
+                route: {
+                    validation: {
+                        query: {
+                            id: {type: 'numeric', required: false, min: 0}
+                        }
+                    }
+                }, query: {id: '0'}
+            },
+            null, test
+        );
+    });
+
     it('RequestValidator::validate() null values', () => {
         expected = undefined;
         validator.validate(

diff --git a/ts/RequestValidator.ts b/ts/RequestValidator.ts
@@ -308,8 +308,14 @@ export class RequestValidator {
 
         if (inputType === 'undefined' || typeValidation.value === null) {
             return true;
-        } else if (typeValidation.type === 'numeric' || typeValidation.type === 'number') {
-            const isNumeric = !isNaN(typeValidation.value);
+        } else if (typeValidation.type === 'numeric') {
+            const isNumeric = !(typeValidation.value.length === 0) && !isNaN(typeValidation.value) ;
+            if (isNumeric === true) {
+                typeValidation.value = parseInt(typeValidation.value, 10);
+            }
+            return isNumeric;
+        } else if (typeValidation.type === 'number') {
+            const isNumeric = !isNaN(typeValidation.value) ;
             if (isNumeric === true) {
                 typeValidation.value = parseInt(typeValidation.value, 10);
             }