@@ -51,16 +51,15 @@ module.exports = (db) => {
5151 * @param {array } array
5252 */
5353 const splitStringAndBuildArray = ( obj , array ) => {
54- let elements = obj . split ( ',' ) ;
54+ const elements = obj . split ( ',' ) ;
5555
56- if ( elements && elements . length > 0 ) {
57- elements . forEach ( ( element ) => {
58- var fields = element . split ( '.' ) ;
59- if ( fields && fields . length > 0 ) {
60- array . push ( fields ) ;
61- }
62- } ) ;
63- }
56+ elements . forEach ( ( element ) => {
57+ const fields = element . split ( '.' ) ;
58+
59+ if ( fields && fields . length > 0 ) {
60+ array . push ( fields ) ;
61+ }
62+ } ) ;
6463 } ;
6564
6665 /**
@@ -105,26 +104,20 @@ module.exports = (db) => {
105104 const iterativeReplace = ( json ) => {
106105 Object . keys ( json ) . forEach ( ( key ) => {
107106 if ( json [ key ] !== null && typeof json [ key ] === 'object' ) {
108- // console.debug("key: ", key);
109- let op = operators [ key ] ;
110- // console.debug("operation: ", op);
107+ const op = operators [ key ] ;
111108
112109 if ( op ) {
113110 replaceKeyWithOperator ( json , key , op ) ;
114111 iterativeReplace ( json [ op ] ) ;
115112 } else {
116- // console.debug("next: ", JSON.stringify(json[key], null, 4));
117113 iterativeReplace ( json [ key ] ) ;
118114 }
119115 } else if ( key == 'model' && db [ json [ key ] ] != null ) {
120- // json['as'] = json[key].replace(/^./, char => char.toLowerCase());// /^\w/
121- json [ 'model' ] = db [ json [ key ] ] ;
116+ json . model = db [ json [ key ] ] ;
122117 } else {
123- let op = operators [ key ] ;
118+ const op = operators [ key ] ;
124119 if ( op ) replaceKeyWithOperator ( json , key , op ) ;
125120 }
126-
127- // console.debug("After Key:", key, " Query fields: ", JSON.stringify(json, null, 4))
128121 } ) ;
129122 } ;
130123
@@ -135,8 +128,7 @@ module.exports = (db) => {
135128 */
136129 const unescapeEscapedQuery = ( query ) => {
137130 const queryString = query . toString ( ) ;
138- const queryStringUnescaped = unescape ( queryString ) ;
139- return queryStringUnescaped ;
131+ return unescape ( queryString ) ;
140132 } ;
141133
142134 /**
@@ -167,18 +159,14 @@ module.exports = (db) => {
167159 * @returns {string|JSON } sequelize formatted DB query param
168160 */
169161 const parseQueryParam = ( query ) => {
170- let elements = query . split ( / : ( .+ ) / ) ;
171- // console.debug("Query param: ", JSON.stringify(elements, null, 4));
172- if ( elements && elements . length > 1 ) {
173- var param = { } ;
162+ const elements = query . split ( / : ( .+ ) / ) ;
163+
164+ if ( elements ? .length > 1 ) {
165+ const param = { } ;
174166 const elementsArray = elements [ 1 ] . split ( ',' ) ;
167+
175168 if ( elementsArray ) {
176- if ( elementsArray . length > 1 ) {
177- param [ operators [ elements [ 0 ] ] ] = elementsArray ;
178- } else {
179- param [ operators [ elements [ 0 ] ] ] = elementsArray [ 0 ] ;
180- }
181- // console.debug("Query param: ", param);
169+ param [ operators [ elements [ 0 ] ] ] = elementsArray . length > 1 ? elementsArray : elementsArray [ 0 ] ;
182170 return param ;
183171 }
184172 }
@@ -217,9 +205,9 @@ module.exports = (db) => {
217205
218206 return new Promise ( ( resolve , reject ) => {
219207 try {
220- var offset = 0 ,
221- limit = pageSizeLimit ;
222- var dbQuery = {
208+ let offset = 0 ;
209+ let limit = pageSizeLimit ;
210+ const dbQuery = {
223211 where : { } ,
224212 offset,
225213 limit
@@ -230,7 +218,7 @@ module.exports = (db) => {
230218 // Fields
231219 case 'fields' :
232220 // split the field names (attributes) and assign to an array
233- let fields = req . query . fields . split ( ',' ) ;
221+ const fields = req . query . fields . split ( ',' ) ;
234222 // assign fields array to .attributes
235223 if ( fields && fields . length > 0 ) dbQuery . attributes = fields ;
236224 break ;
0 commit comments