@@ -96,8 +96,6 @@ const service = {
9696 * @returns {Promise } An objection query promise
9797 */
9898 getUsers : async ( params ) => {
99- console . log ( 'params' ) ;
100- console . log ( params ) ;
10199 const query = User . query ( )
102100 . modify ( 'filterUsername' , params . username )
103101 . modify ( 'filterFirstName' , params . firstName )
@@ -197,7 +195,8 @@ const service = {
197195 return ExternalAPIStatusCode . query ( ) ;
198196 } ,
199197 _processPagination : async ( query , { page, itemsPerPage, totalItems, search, searchEnabled } ) => {
200- let isSearchAble = typeUtils . isBoolean ( searchEnabled ) ? searchEnabled : searchEnabled !== undefined ? JSON . parse ( searchEnabled ) : false ;
198+ let parsedIsSearchAble = searchEnabled !== undefined ? JSON . parse ( searchEnabled ) : false ;
199+ let isSearchAble = typeUtils . isBoolean ( searchEnabled ) ? searchEnabled : parsedIsSearchAble ;
201200 if ( isSearchAble ) {
202201 let submissionsData = await query ;
203202 let result = {
@@ -208,6 +207,7 @@ const service = {
208207 return Object . keys ( data ) . some ( ( key ) => {
209208 if ( key !== 'submissionId' && key !== 'formVersionId' && key !== 'formId' ) {
210209 if ( ! Array . isArray ( data [ key ] ) && ! typeUtils . isObject ( data [ key ] ) ) {
210+ //Search for date/time match in properties
211211 if (
212212 ! typeUtils . isBoolean ( data [ key ] ) &&
213213 ! typeUtils . isNil ( data [ key ] ) &&
@@ -217,10 +217,13 @@ const service = {
217217 result . total = result . total + 1 ;
218218 return true ;
219219 }
220+ //Search for string match in properties
220221 if ( typeUtils . isString ( data [ key ] ) && data [ key ] . toLowerCase ( ) . includes ( search . toLowerCase ( ) ) ) {
221222 result . total = result . total + 1 ;
222223 return true ;
223- } else if (
224+ }
225+ //Search to match numeric values in properties
226+ if (
224227 ( typeUtils . isNil ( data [ key ] ) || typeUtils . isBoolean ( data [ key ] ) || ( typeUtils . isNumeric ( data [ key ] ) && typeUtils . isNumeric ( search ) ) ) &&
225228 parseFloat ( data [ key ] ) === parseFloat ( search )
226229 ) {
@@ -242,6 +245,8 @@ const service = {
242245 return await query . page ( parseInt ( page ) , parseInt ( totalItems || 0 ) ) ;
243246 } else if ( itemsPerPage && parseInt ( page ) >= 0 ) {
244247 return await query . page ( parseInt ( page ) , parseInt ( itemsPerPage ) ) ;
248+ } else {
249+ return await query ;
245250 }
246251 }
247252
0 commit comments