store type in expected for faster execution

ujjwalguptaofficial · Dec 7, 2019 · 59cdbf5 · 59cdbf5
1 parent f90ad0f
commit 59cdbf5
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 7 deletions.
diff --git a/dist/fort.js b/dist/fort.js
diff --git a/dist/fort.js.map b/dist/fort.js.map
diff --git a/src/handlers/route_handler.ts b/src/handlers/route_handler.ts
@@ -3,6 +3,7 @@ import { GenericShield, GenericGuard } from "../generics";
 import { isNull } from "../utils";
 import { RouteInfo } from "../models";
 import { IRouteInfo } from "../interfaces";
+import { getDataType } from "../helpers";
 
 const routerCollection: {
     [controllerName: string]: RouteInfo
@@ -183,6 +184,12 @@ export class RouteHandler {
     }
 
     static addExpected(type: string, className: string, workerName: string, expectedValue: any) {
+
+        for (const prop in expectedValue) {
+            const propValue = expectedValue[prop];
+            expectedValue[prop] = getDataType(propValue);
+        }
+
         const isQuery = type === 'query';
         const pattern = workerName.toLowerCase();
         const router = routerCollection[className];

diff --git a/src/helpers/compar_expected_and_remove_unnecessary.ts b/src/helpers/compar_expected_and_remove_unnecessary.ts
@@ -4,8 +4,7 @@ import { DATA_TYPE } from "../enums/data_type";
 export const compareExpectedAndRemoveUnnecessary = (expected, actual, isQuery) => {
     const result = {};
     for (const prop in expected) {
-        const expectedType = getDataType(expected[prop]);
-        if (isQuery === true && expectedType === DATA_TYPE.Number) {
+        if (isQuery === true && expected[prop] === DATA_TYPE.Number) {
             result[prop] = Number(actual[prop]);
             if (isNaN(result[prop]) === true) {
                 return null;
@@ -14,7 +13,7 @@ export const compareExpectedAndRemoveUnnecessary = (expected, actual, isQuery) =
         else {
             result[prop] = actual[prop];
         }
-        if (expectedType !== getDataType(result[prop])) {
+        if (expected[prop] !== getDataType(result[prop])) {
             return null;
         }
     }