fix:修复通过日期字段查询模型实例 --bug=148529573 【CMDB】模型通过日期字段查询报错

Author: elizabevil

pkg/filter/operator.go

@@ -702,6 +702,11 @@ func (o DatetimeLessOp) ToMgo(field string, value interface{}) (map[string]inter
 		return nil, errors.New("field is empty")
 	}
 
+	if util.IsDate(value) {
+		return mapstr.MapStr{
+			field: map[string]interface{}{common.BKDBLTE: value},
+		}, nil
+	}
 	v, err := util.ConvToTime(value)
 	if err != nil {
 		return nil, fmt.Errorf("convert value to time failed, err: %v", err)
@@ -744,14 +749,20 @@ func (o DatetimeLessOrEqualOp) ToMgo(field string, value interface{}) (map[strin
 		return nil, errors.New("field is empty")
 	}
 
+	if util.IsDate(value) {
+		return mapstr.MapStr{
+			field: map[string]interface{}{common.BKDBLTE: value},
+		}, nil
+	}
 	v, err := util.ConvToTime(value)
 	if err != nil {
 		return nil, fmt.Errorf("convert value to time failed, err: %v", err)
 	}
 
 	return mapstr.MapStr{
-		field: map[string]interface{}{common.BKDBLTE: v},
+		field: map[string]interface{}{common.BKDBLT: v},
 	}, nil
+
 }
 
 // Match checks if the first data matches the second data by this operator
@@ -787,13 +798,18 @@ func (o DatetimeGreaterOp) ToMgo(field string, value interface{}) (map[string]in
 		return nil, errors.New("field is empty")
 	}
 
+	if util.IsDate(value) {
+		return mapstr.MapStr{
+			field: map[string]interface{}{common.BKDBLTE: value},
+		}, nil
+	}
 	v, err := util.ConvToTime(value)
 	if err != nil {
 		return nil, fmt.Errorf("convert value to time failed, err: %v", err)
 	}
 
 	return mapstr.MapStr{
-		field: map[string]interface{}{common.BKDBGT: v},
+		field: map[string]interface{}{common.BKDBLT: v},
 	}, nil
 }
 
@@ -829,13 +845,18 @@ func (o DatetimeGreaterOrEqualOp) ToMgo(field string, value interface{}) (map[st
 		return nil, errors.New("field is empty")
 	}
 
+	if util.IsDate(value) {
+		return mapstr.MapStr{
+			field: map[string]interface{}{common.BKDBLTE: value},
+		}, nil
+	}
 	v, err := util.ConvToTime(value)
 	if err != nil {
 		return nil, fmt.Errorf("convert value to time failed, err: %v", err)
 	}
 
 	return mapstr.MapStr{
-		field: map[string]interface{}{common.BKDBGTE: v},
+		field: map[string]interface{}{common.BKDBLT: v},
 	}, nil
 }
 

src/common/util/struti.go

@@ -75,7 +75,10 @@ func IsDate(sInput interface{}) bool {
 		if len(val) == 0 {
 			return false
 		}
-		return dateRegexp.MatchString(val)
+		if _, err := time.Parse(time.DateOnly, val); err == nil {
+			return true
+		}
+		return false
 	default:
 		return false
 	}

src/common/valid/valid.go

@@ -96,6 +96,10 @@ func ValidateDatetimeType(value interface{}) error {
 		return nil
 	}
 
+	if util.IsDate(value) {
+		return nil
+	}
+
 	// string type with time format is supported
 	if _, ok := util.IsTime(value); ok {
 		return nil

src/common/valid/valid_test.go

@@ -18,6 +18,7 @@ package valid
 
 import (
 	"testing"
+	"time"
 
 	"configcenter/src/common"
 )
@@ -47,3 +48,26 @@ func TestIsInnerObject(t *testing.T) {
 		})
 	}
 }
+
+func TestValidateDatetimeType(t *testing.T) {
+	type args struct {
+		timeStr any
+	}
+	now := time.Now()
+	tests := []struct {
+		name string
+		args args
+	}{
+		{"", args{"2024-00-00"}}, //should err
+		{"", args{now.Format(time.DateOnly)}},
+		{"", args{now.Format(time.DateTime)}},
+		{"", args{now.Format(time.RFC3339)}},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if err := ValidateDatetimeType(tt.args.timeStr); err != nil {
+				t.Errorf("ValidateDatetimeType() = %v:%v", tt.args, err)
+			}
+		})
+	}
+}