@@ -18,7 +18,7 @@ type Query struct {
1818Offset int
1919Limit int
2020Sorts []Sort
21- Filters []* Filter
21+ Filters [][] * Filter
2222
2323delimiterIN string
2424delimiterOR string
@@ -219,9 +219,11 @@ func (q *Query) AddSortBy(by string, desc bool) *Query {
219219// HaveFilter returns true if request contains some filter
220220func (q * Query ) HaveFilter (name string ) bool {
221221
222- for _ , v := range q .Filters {
223- if v .Name == name {
224- return true
222+ for _ , filters := range q .Filters {
223+ for _ , v := range filters {
224+ if v .Name == name {
225+ return true
226+ }
225227}
226228}
227229
@@ -230,27 +232,31 @@ func (q *Query) HaveFilter(name string) bool {
230232
231233// AddFilter adds a filter to Query
232234func (q * Query ) AddFilter (name string , m Method , value interface {}) * Query {
233- q .Filters = append (q .Filters , & Filter {
234- Name : name ,
235- Method : m ,
236- Value : value ,
235+ q .Filters = append (q .Filters , []* Filter {
236+ {
237+ Name : name ,
238+ Method : m ,
239+ Value : value ,
240+ },
237241})
238242return q
239243}
240244
241245// RemoveFilter removes the filter by name
242246func (q * Query ) RemoveFilter (name string ) error {
243247
244- for i , v := range q .Filters {
245- if v .Name == name {
246- // safe remove element from slice
247- if i < len (q .Filters )- 1 {
248- copy (q .Filters [i :], q .Filters [i + 1 :])
249- }
250- q .Filters [len (q .Filters )- 1 ] = nil
251- q .Filters = q .Filters [:len (q .Filters )- 1 ]
248+ for key , filters := range q .Filters {
249+ for i , v := range filters {
250+ if v .Name == name {
251+ // safe remove element from slice
252+ if i < len (q .Filters [key ])- 1 {
253+ copy (q .Filters [key ][i :], q .Filters [key ][i + 1 :])
254+ }
255+ q .Filters [key ][len (q .Filters [key ])- 1 ] = nil
256+ q .Filters [key ] = q .Filters [key ][:len (q .Filters [key ])- 1 ]
252257
253- return nil
258+ return nil
259+ }
254260}
255261}
256262
@@ -289,9 +295,11 @@ func (q *Query) RemoveValidation(NameAndOrTags string) error {
289295// GetFilter returns filter by name
290296func (q * Query ) GetFilter (name string ) (* Filter , error ) {
291297
292- for _ , v := range q .Filters {
293- if v .Name == name {
294- return v , nil
298+ for _ , filters := range q .Filters {
299+ for _ , v := range filters {
300+ if v .Name == name {
301+ return v , nil
302+ }
295303}
296304}
297305
@@ -313,9 +321,11 @@ type Replacer map[string]string
313321func (q * Query ) ReplaceNames (r Replacer ) {
314322
315323for name , newname := range r {
316- for i , v := range q .Filters {
317- if v .Name == name {
318- q .Filters [i ].Name = newname
324+ for key , filters := range q .Filters {
325+ for i , v := range filters {
326+ if v .Name == name {
327+ q.Filters [key ][i ].Name = newname
328+ }
319329}
320330}
321331for i , v := range q .Fields {
@@ -340,55 +350,74 @@ func (q *Query) Where() string {
340350return ""
341351}
342352
353+ var whereList []string
354+
343355var where string
344- var OR bool = false
356+ var OR bool
345357
346- for i := 0 ; i < len (q .Filters ); i ++ {
347- filter := q .Filters [i ]
358+ for key := range q .Filters {
359+ where = ""
360+ OR = false
361+ if len (q .Filters [key ]) == 0 {
362+ continue
363+ }
364+ for i := 0 ; i < len (q .Filters [key ]); i ++ {
365+ filter := q.Filters [key ][i ]
348366
349- prefix := ""
350- suffix := ""
367+ prefix := ""
368+ suffix := ""
351369
352- if filter .Or && ! OR {
353- if i == 0 {
354- prefix = "("
370+ if filter .Or && ! OR {
371+ if i == 0 {
372+ prefix = "("
373+ } else {
374+ prefix = " AND ("
375+ }
376+ OR = true
377+ } else if filter .Or && OR {
378+ prefix = " OR "
379+ // if last element of next element not OR method
380+ if i + 1 == len (q .Filters [key ]) || (i + 1 < len (q .Filters [key ]) && ! q .Filters [key ][i + 1 ].Or ) {
381+ suffix = ")"
382+ OR = false
383+ }
355384} else {
356- prefix = " AND ("
357- }
358- OR = true
359- } else if filter .Or && OR {
360- prefix = " OR "
361- // if last element of next element not OR method
362- if i + 1 == len (q .Filters ) || (i + 1 < len (q .Filters ) && ! q .Filters [i + 1 ].Or ) {
363- suffix = ")"
364- OR = false
385+ if i > 0 {
386+ prefix = " AND "
387+ }
365388}
366- } else {
367- if i > 0 {
368- prefix = " AND "
389+
390+ if a , err := filter .Where (); err == nil {
391+ where += fmt .Sprintf ("%s%s%s" , prefix , a , suffix )
392+ } else {
393+ continue
369394}
370395}
371-
372- if a , err := filter .Where (); err == nil {
373- where += fmt .Sprintf ("%s%s%s" , prefix , a , suffix )
374- } else {
375- continue
396+ if where != "" {
397+ whereList = append (whereList , where )
376398}
399+ }
377400
401+ if len (whereList ) == 0 {
402+ return ""
378403}
379404
380- return where
405+ return strings . Join ( whereList , " AND " )
381406}
382407
383408// WHERE returns list of filters for WHERE SQL statement with `WHERE` word
384409// return example: `WHERE id > 0 AND email LIKE 'some@email.com'`
385410func (q * Query ) WHERE () string {
386-
387411if len (q .Filters ) == 0 {
388412return ""
389413}
390414
391- return " WHERE " + q .Where ()
415+ where := q .Where ()
416+ if where == "" {
417+ return ""
418+ }
419+
420+ return " WHERE " + where
392421}
393422
394423// Args returns slice of arguments for WHERE statement
@@ -400,14 +429,20 @@ func (q *Query) Args() []interface{} {
400429return args
401430}
402431
403- for i := 0 ; i < len (q .Filters ); i ++ {
404- filter := q .Filters [i ]
405-
406- if a , err := filter .Args (); err == nil {
407- args = append (args , a ... )
408- } else {
432+ for key := range q .Filters {
433+ if len (q .Filters [key ]) == 0 {
409434continue
410435}
436+
437+ for i := 0 ; i < len (q .Filters [key ]); i ++ {
438+ filter := q.Filters [key ][i ]
439+
440+ if a , err := filter .Args (); err == nil {
441+ args = append (args , a ... )
442+ } else {
443+ continue
444+ }
445+ }
411446}
412447
413448return args
@@ -503,11 +538,14 @@ func (q *Query) Parse() (err error) {
503538err = q .parseSort (values , q .validations [low ])
504539delete (requiredNames , low )
505540default :
506- if len (values ) != 1 {
541+ if len (values ) == 0 {
507542return errors .Wrap (ErrBadFormat , key )
508543}
509- if err = q .parseFilter (key , values [0 ]); err != nil {
510- return err
544+
545+ for i := 0 ; i < len (values ); i ++ {
546+ if err = q .parseFilter (key , values [i ]); err != nil {
547+ return err
548+ }
511549}
512550}
513551
@@ -576,6 +614,8 @@ func (q *Query) parseFilter(key, value string) error {
576614return errors .Wrap (ErrEmptyValue , key )
577615}
578616
617+ filters := make ([]* Filter , 0 )
618+
579619if strings .Contains (value , q .delimiterOR ) { // OR multiple filter
580620parts := strings .Split (value , q .delimiterOR )
581621for i , v := range parts {
@@ -609,7 +649,7 @@ func (q *Query) parseFilter(key, value string) error {
609649// set OR
610650filter .Or = true
611651
612- q . Filters = append (q . Filters , filter )
652+ filters = append (filters , filter )
613653}
614654} else { // Single filter
615655filter , err := newFilter (key , value , q .delimiterIN , q .validations )
@@ -623,20 +663,26 @@ func (q *Query) parseFilter(key, value string) error {
623663return errors .Wrap (err , key )
624664}
625665
626- q . Filters = append (q . Filters , filter )
666+ filters = append (filters , filter )
627667}
628668
669+ q .Filters = append (q .Filters , filters )
670+
629671return nil
630672}
631673
632674// clean the filters slice
633675func (q * Query ) cleanFilters () {
634676if len (q .Filters ) > 0 {
635- for i := range q .Filters {
636- q .Filters [i ] = nil
677+ for key := range q .Filters {
678+ for i := range q .Filters [key ] {
679+ q.Filters [key ][i ] = nil
680+ }
681+ q .Filters [key ] = nil
637682}
638683q .Filters = nil
639684}
685+ q .Filters = make ([][]* Filter , 0 )
640686}
641687
642688func (q * Query ) parseSort (value []string , validate ValidationFunc ) error {
0 commit comments