varmeziyaryasin
/
niki
forked from ebhomengo/niki
1
0
Fork 0
Code Pull Requests Activity

fix(BuildFilterQuery): use regex to validate date and date time 

Signed-off-by: Reza Mobaraki <rezam578@gmail.com>
This commit is contained in:
Reza Mobaraki 2024-09-24 15:32:55 +03:30
parent e006ff5898
commit cc53a7ddc8
No known key found for this signature in database
GPG Key ID: 922CBCF25B541A6F
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/query_builder/mysql/filter.go
View File

@ -2,23 +2,20 @@ package mysqlquerybuilder
import ( import (
"fmt" "fmt"
"reflect" "regexp"
"time"
) )
const DateFormat = "2006-01-02" var datePattern = regexp.MustCompile(`^\d{4}-\d{2}-\d{2}(T\d{2}:\d{2}:\d{2}Z)?$`)
func isTimeType(value interface{}) bool { func isValidDateOrDateTime(value string) bool {
return reflect.TypeOf(value) == reflect.TypeOf(time.Time{}) return datePattern.MatchString(value)
} }
// BuildFilterQuery constructs the query and handles datetime fields
func BuildFilterQuery(filter map[string]interface{}) (filterQuery string, args []any) { func BuildFilterQuery(filter map[string]interface{}) (filterQuery string, args []any) {
for key, value := range filter { for key, value := range filter {
if isTimeType(value) { if strVal, ok := value.(string); ok && isValidDateOrDateTime(strVal) {
filterQuery += fmt.Sprintf("AND DATE(%s) = ? ", key) filterQuery += fmt.Sprintf("AND DATE(%s) = ? ", key)
dateValue := value.(time.Time).Format(DateFormat) args = append(args, strVal)
args = append(args, dateValue)
} else { } else {
filterQuery += fmt.Sprintf("AND %s = ? ", key) filterQuery += fmt.Sprintf("AND %s = ? ", key)
args = append(args, value) args = append(args, value)